389 Commits

Author SHA1 Message Date
Davide D'Agostino
9de108a472 Merge pull request #203 from willfaught/master
Add Zero and NotZero assertions and requirements
2015-08-26 11:35:18 -07:00
Ernesto Jiménez
3a42060e3c Merge pull request #189 from docbobo/wrong_argument_order
AssertNumberOfCalls: wrong order of arguments
2015-08-26 19:34:56 +01:00
Davide D'Agostino
68c12689a5 Merge pull request #196 from phemmer/remove-overview
remove overview sections from documentation
2015-08-26 11:20:00 -07:00
Davide D'Agostino
91dbff64c7 Merge pull request #197 from ifraixedes/patch-1
Update README.md
2015-08-26 11:19:16 -07:00
Mat Ryer
6f1da3e279 Merge pull request #206 from sivagollapalli/issue_140
Display actual and expected values on NotEqual
2015-08-26 15:14:49 +01:00
Siva Gollapalli
b60ec447d6 Modified the error message for NotEqual 2015-08-26 19:40:56 +05:30
Siva Gollapalli
80b247df3c Display actual and expected values on NotEqual 2015-08-26 19:31:23 +05:30
Davide D'Agostino
efea42fa21 Merge pull request #205 from sivagollapalli/issue_185
FIX# EqualError error output swaps the actual and expected values
2015-08-25 14:35:07 -07:00
Siva Gollapalli
05776ad541 EqualError error output swaps the actual and expected values 2015-08-25 20:49:33 +05:30
Will Faught
8512261d41 Add Zero and NotZero assertions and requirements
Zero returns true if the value equals the value's type's zero value.

NotZero returns the opposite of Zero.
2015-08-24 15:53:36 -07:00
Mat Ryer
f552045560 Merge pull request #200 from wallclockbuilder/patch-1
Fix tiny typo
2015-08-12 09:24:24 -07:00
Mawueli Kofi Adzoe
9c13092f45 Fix tiny typo 2015-08-12 11:24:55 +00:00
Davide D'Agostino
6fe8314ce5 Merge pull request #199 from glittershark/method-not-mode
Use "method" rather than "mode" for http tests
2015-08-06 15:29:12 -07:00
Griffin Smith
81bd467d7c Use "method" rather than "mode" for http tests
Use `method` (this is what http.NewRequest and the HTTP standard in
general calls this) rather than `mode` for `"GET"`, `"POST"`, etc.
2015-08-06 17:14:15 -04:00
Ivan Fraixedes
2161431195 Update README.md
Added link to the api documentation for `require`
2015-07-28 12:31:24 +01:00
Patrick Hemmer
74bbd89240 remove overview sections from documentation 2015-07-22 15:56:30 -04:00
davelondon
6b09f60392 Update assertions.go
Fixed incorrect order of parameters to Equal
2015-07-05 10:37:27 -04:00
Boris Pruessmann
84e2423404 AssertNumberOfCalls: wrong order of arguments
The assert.Equal called had the actual and expected values mixed up.
2015-07-03 13:30:03 +02:00
Davide D'Agostino
089c7181b8 Merge pull request #186 from MCProHosting/master
Adjust NotNil error message
2015-06-20 16:27:11 -07:00
Connor Peet
6756bdecf4 Adjust NotNil error message 2015-06-21 07:39:50 +10:00
Ernesto Jiménez
ddcad49ec6 Fix typo in test function name 2015-06-15 21:31:24 +01:00
Ernesto Jiménez
abc938a12b Add test to avoid regression of issue #180 2015-06-14 19:29:18 +01:00
Andrew Burns
c769e40e8b Handle <autogenerated> files in CallerInfo()
Fixes #180
2015-06-11 14:33:49 -06:00
Ernesto Jiménez
7e4a149930 Merge pull request #177 from s-urbaniak/race
Fix data races
2015-06-05 22:45:35 +01:00
Ernesto Jiménez
6b7dca6fb8 Merge pull request #176 from paulbellamy/stacktraces
Add a basic stacktrace to the assertion output
2015-06-05 21:37:10 +01:00
Sergiusz Urbaniak
b11fb16915 mock: fix races to m.Calls/m.ExpectedCalls
Fixes races inside the mock package caused by
unsychronized reads/writes of m.Calls/m.ExpectedCalls.
2015-06-05 16:24:27 +02:00
Paul Bellamy
c0b6c3bbd7 Rename Location to Error Trace in failure output 2015-06-05 14:01:19 +01:00
Paul Bellamy
0fd7b57c23 rename assert.locationInfo -> assert.errorTrace 2015-06-05 10:14:07 +01:00
Paul Bellamy
925c3ad43b Reverse the stacktrace on assertion output (to match panic) 2015-06-05 10:13:41 +01:00
Paul Bellamy
a7a0af787a Add a basic stacktrace to the assertion output 2015-06-04 14:00:35 +01:00
Ernesto Jiménez
3c81d9b268 Merge pull request #175 from stretchr/variadic
Mocking variadic functions
2015-06-02 23:16:36 +01:00
Ernesto Jiménez
4464dda05e Add extra tests mocking variadic functions 2015-06-02 20:23:13 +01:00
Ernesto Jiménez
d6265bda1a Add test mocking variadic function 2015-06-02 19:59:43 +01:00
Ernesto Jiménez
93a84c883d Merge pull request #147 from multiplay/master
Fix race condition with ExpectedCalls
2015-06-02 14:37:00 +01:00
Lee Packham
9768526b70 Fix race condition with ExpectedCalls
There is race condition caused when a method being tested calls a mocked
method within a go routine. For example, caching might be done a go
routine and that caching might be mocked.

There is already a mutex protecting the lists on the Mock object -
however Return() appends to ExpectedCalls and findExpectedCall could
run at the same time.
2015-06-02 12:54:01 +01:00
Ernesto Jiménez
232e856367 Merge pull request #170 from TechnotronicOz/versioning-strategy
Updated README for versioning strategy
v1.0
2015-05-27 15:45:55 +01:00
Matt Carter
d4befe148c Updated README for versioning strategy 2015-05-21 20:36:59 -05:00
Daniel Perez
1e710e53ab Support map keys for Contains/NotContains assertion. 2015-05-13 16:07:31 +09:00
Ernesto Jiménez
dab07ac62d Merge pull request #164 from HawaiianSpork/delta_nan
Address #162: InDelta should fail when actual value is not a number.
2015-05-12 13:42:33 +01:00
Michael R. Maletich
4e2053a4af Address #162: InDelta should fail when actual value is not a number.
Comparting a float with NaN is always false so the assertion would always pass.
Added a check that either the actual or expected values are NaN.

InDelta will now fail if either the actual or expected value are NaN.
2015-05-12 11:54:42 +00:00
Ernesto Jiménez
5ab65693f4 Merge pull request #160 from stretchr/issue-159
Address #159: Meaningful panic when expecting Func
2015-05-07 13:08:08 +01:00
Ernesto Jiménez
1faea58ff8 Address #159: Meaningful panic when expecting Func
We cannot compare two Func arguments to check if they are equal using
the reflect package. This leads to the following misleading panic:

```go
handler := func(http.ResponseWriter, *http.Request) {}
muxMock.On("HandleFunc", "/", handler)
muxMock.HandleFunc("/", handler)
// panics arguing handler != handler
```

Since we cannot fix this behaviour using reflection, this patch
provides a better panic with a meaningful workaround.

```go
handler := func(http.ResponseWriter, *http.Request) {}
muxMock.On("HandleFunc", "/", handler)
// panics recommending defining the expectatin with:
//   AnythingOfType("func(http.ResponseWriter, *http.Request)")
```

Solution following the panic's instructions:

```go
handler := func(http.ResponseWriter, *http.Request) {}
muxMock.On("HandleFunc", "/",
  mock.AnythingOfType("func(http.ResponseWriter, *http.Request)"))
muxMock.HandleFunc("/", handler)
```
2015-05-06 19:35:54 +01:00
Ernesto Jiménez
8bfd855592 Add test cases mocking methods with Func arguments 2015-05-06 19:24:54 +01:00
Ernesto Jiménez
73a8112e05 Merge pull request #158 from stretchr/mock-run-handler
Allow mocking methods updating referenced structs
2015-05-04 23:00:33 +01:00
Ernesto Jiménez
a369d6f598 Allow mocking methods updating referenced structs
Some methods in Go take a pointer to a struct or a map and are supposed
to set some values in the referenced argument. Using Return is not
enough to mock such methods.

We are introducing a Run method that allows setting a Call handler to
make your mock update such referenced values.

Example usage mocking a service that finds a user in a data store and
fills the values in the provided struct:

```go
m.On("Find", 1, mock.AnythingOfType(*User))
  .Return(nil)
  .Run(func(args mock.Arguments) {
  u := args.Get(0).(*User)
  u.ID = 1
  u.Email = "mail@example.com"
})
```
2015-05-04 16:56:39 +01:00
Mat Ryer
e22aedd376 Tweaks and improvements - Fixes #154 2015-04-20 11:19:11 +01:00
Davide D'Agostino
3b361f7ebb Merge pull request #134 from lazywei/master
Add InDeltaSlice.
2015-04-18 12:10:15 -07:00
Chih-Wei Chang
8b75665fbf Add InEpsilonSlice and corresponding testing. 2015-04-18 22:40:21 +08:00
Davide D'Agostino
08c64393a9 Merge pull request #139 from sul3n3t/equalvalues-doc
Doc entry for EqualValues assertion
2015-04-17 12:10:28 -07:00
Davide D'Agostino
e9fe59ca38 Merge pull request #148 from ernesto-jimenez/master
Mock can block returns with .After and .WaitUntil
2015-04-17 12:07:20 -07:00