233 Commits

Author SHA1 Message Date
Davide D'Agostino
59fc8e570c Revert "Remove sprintf equality check"
This reverts commit 842aeb8181a59ae6d0fac42eaef90ca01ba59c53.
2015-04-16 16:28:52 -07:00
Tyler Bunnell
4f9c9aeeaa Don't handle func comparisons 2015-04-16 11:41:42 -06:00
Tyler Bunnell
842aeb8181 Remove sprintf equality check
Fix #143
2015-04-16 10:41:30 -06:00
Mat Ryer
e4ec8152c1 Merge pull request #137 from sul3n3t/forward-equalvalues
Forwards EqualValues assertion
2015-02-18 14:18:46 -08:00
Justin Cummins
d5621338a3 Forwards EqualValues assertion 2015-02-18 14:08:46 -08:00
Tyler
efa3c4c364 Merge pull request #131 from parkr/patch-1
assert: fix syntax error in http assertion comments
2015-02-10 18:53:42 -07:00
Parker Moore
9cce94c41a assert: fix syntax error in http assertion comments 2015-02-10 17:17:43 -08:00
Tyler
6cfa05f71d Merge pull request #130 from pquerna/add_assert_equal_values
Add assert.EqualValues, which attempts to convert types to test equality
2015-02-10 18:00:25 -07:00
Paul Querna
e73f5c7e39 Add assert.EqualValues, which attempts to convert types to test equality. Fixes #129 2015-02-10 16:56:43 -08:00
Tyler
43d0eed245 Merge pull request #128 from icecrime/equality_without_conversions
Exclude `ConvertibleTo` from equality test
2015-02-10 14:21:14 -07:00
Arnaud Porterie
9bab92ede2 Exclude conversions from equality tests
`ObjectsAreEqual` using `ConvertibleTo` causes the `ObjectsAreEqual`
function to be asymmetrical and producing incorrect assertions.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-06 16:08:28 -08:00
nelsam
33a31e5dbe Merge pull request #121 from stretchr/suite_getters
Add getters for *assert.Assertions and *require.Assertions
2015-01-22 11:43:47 -07:00
nelsam
fe50b6aa5a Merge pull request #122 from stretchr/issues/120
Fixed regexp messages.  Resolves #120.
2015-01-22 11:42:56 -07:00
Samuel Nelson
ff9ded0d23 Fixed regexp messages. Resolves #120. 2015-01-19 12:45:07 -07:00
Samuel Nelson
354307edce Add getters for *assert.Assertions and *require.Assertions 2015-01-19 12:15:53 -07:00
Tyler
e897f97d66 Merge pull request #93 from dlclark/master
Fixed regexp error messages to include input values to aide debugging
2015-01-13 10:39:58 -07:00
nelsam
2160c81a96 Merge pull request #109 from anupcshan/master
Use mockedObj.Method(args) instead of mockedObj.Mock.Method(args).
2015-01-10 12:35:18 -07:00
nelsam
8bb32e75f4 Merge pull request #113 from andreas/require-assertions
Add require.Assertions like assert.Assertions
2015-01-10 12:32:59 -07:00
nelsam
945825c690 Update README.md 2015-01-10 12:25:02 -07:00
Samuel Nelson
02a8ab057b Reverse ConvertibleTo check to avoid panic
in `ObjectsAreEqual`, `expectedValue.Convert(actualType)` was being called when
`actualType.ConvertibleTo(reflect.TypeOf(expected))` was true.  This was a problem
for situations such as when expected was an int and actual was a string, since
ints are `ConvertibleTo` strings, but the reverse is not true.

Changing the ConvertibleTo check to `expectedValue.Type().ConvertibleTo(actualType)`
solves the issue.
2015-01-10 12:18:57 -07:00
Samuel Nelson
85138dbfa5 Move to stretchr/testify travis 2015-01-10 12:10:57 -07:00
Andreas Garnæs
49c0f07da4 Add require.Assertions like assert.Assertions. 2015-01-06 16:39:32 +00:00
Andreas Garnæs
ecf599d7db Update require package to match assert package. 2015-01-06 16:38:10 +00:00
Andreas Garnæs
8033b5cf75 Remove false documentation. 2015-01-06 16:37:26 +00:00
Tyler
2eaa4b48b8 Merge pull request #110 from cryptix/master
added tests from PR #103
2014-12-22 10:16:26 -07:00
Tyler Bunnell
3f860d8bc6 Merge branch 'neilconway-map-non-equal-panic' 2014-12-22 10:16:00 -07:00
Tyler Bunnell
d1472b75d1 fix merge conflict 2014-12-22 10:15:32 -07:00
Henry
7a9121a162 added tests from PR #103 2014-12-17 16:41:45 +01:00
Tyler
ae37dedcaa Merge pull request #106 from raphaelmeyer/master
Use valueOf to fix issue with []byte
2014-12-08 09:06:21 -07:00
nelsam
1297dc01ed Merge pull request #97 from jonhoo/ensure-teardown
Ensure TearDownTest is called after Skip
2014-12-05 12:20:33 -07:00
Raphael Meyer
43f1d3eeb3 replace imports in travis config to not break to origin 2014-11-30 09:53:17 +01:00
Raphael Meyer
dd6cea14e4 But dont change path for objx 2014-11-30 09:42:18 +01:00
Raphael Meyer
d8aebdb1b6 replaces imports to run with my travis config 2014-11-30 09:39:28 +01:00
Raphael Meyer
ab973b6801 Exclude go 1.0 from travis build 2014-11-30 09:39:02 +01:00
Raphael Meyer
807610fbf1 Use deep equal after conversion. 2014-11-30 09:22:56 +01:00
Raphael Meyer
88bce07c05 Convert actual to expected type. Fix unit tests 2014-11-29 18:51:34 +01:00
Raphael Meyer
794aba658c Use valueOf to fix issue with []byte 2014-11-29 18:23:40 +01:00
Jon Gjengset
81a69ed105 Defer suite teardown to align with test teardown 2014-11-25 19:58:50 -05:00
Jon Gjengset
576f6382c0 Add test for suite Setup/TearDown with Skip 2014-11-25 19:57:20 -05:00
Neil Conway
38aecdc957 Fix panic when comparing unequal maps.
The change in #94 resulted in using == to compare two values that might not be
comparable. Hence, this resulted in a panic for situations like:

    ObjectsAreEqual(map[int]int{5: 10}, map[int]int{10: 20})

The fix is to use reflect.DeepEqual() instead.
2014-11-24 16:11:51 -08:00
Mat Ryer
faedd6eb63 Merge pull request #94 from neilconway/object-equality-golang-1.4
Avoid relying on undefined behavior in assert.ObjectsAreEqual().
2014-11-24 12:06:32 -08:00
Mat Ryer
8ce79b9f0b Merge pull request #100 from victorkryukov/issue-99-contains-complex-types
Fix #99: Contains doesn't work for complex types
2014-11-18 15:38:11 -08:00
Victor Kryukov
d3556349dd Fix #99: Contains doesn't work for complex types 2014-11-18 15:26:31 -08:00
Jon Gjengset
c1b496c5c9 Ensure TearDownTest is called after Skip 2014-11-03 17:46:03 -05:00
Anup Chenthamarakshan
cb7b6694dc Use mockedObj.Method(args) instead of mockedObj.Mock.Method(args).
These method calls are equivalent, but the former is more concise.

Fixes #95
2014-11-02 14:19:46 -08:00
Neil Conway
49c5c6cdb1 Avoid relying on undefined behavior in assert.ObjectsAreEqual().
The previous assert.ObjectsAreEqual() implementation is broken in go 1.4beta1:

   x := uint64(3)
   log.Printf("equal? %t", assert.ObjectsAreEqual(3, x))

This prints "true" under Go 1.3 and "false" under 1.4beta1 (amd64/darwin).

The reason is that the ObjectsAreEqual() was comparing two reflect.Value values
for equality using ==, but the behavior of that operation is apparently
undefined (https://code.google.com/p/go/issues/detail?id=9034). The fix is to do
the type conversion and then do the comparison between two interface{} values.
2014-10-31 16:02:32 -07:00
Douglas Clark
25dfa29b38 Fixed regexp error messages to include input values to aide debugging 2014-10-21 20:37:01 -07:00
Mat Ryer
d6577e08ec Merge pull request #91 from cam72cam/master
Fix mock.go's Int Bool and Error shortcut methods
2014-10-15 17:40:14 -06:00
Christian Mesh
5d4510b137 Fix mock.go's Int Bool and Error shortcut methods
When using testify, I saw panic: assert: arguments: Error(0) failed because object wasn't correct type: {{ad6e7d77-1745-4761-6c4b-a79ab92a4a0f e6e975ef-3637-4047-436a-018ee9d2de52 %!s(int=17) <nil> <nil> %!s(bool=false) %!s(*string=<nil>) ...
when using the Error(index) function.

This commit simply changes to using %v for printing the unexpected structure in the Bool, Int, and Error shortcut methods.
2014-10-15 14:01:54 -04:00
Tyler
de7fcff264 Merge pull request #87 from victorkryukov/http-patch
Implement HTTP(Success|Error|Redirect) and HTTPBody(Not)Contains
2014-09-14 20:00:11 -06:00