215 Commits

Author SHA1 Message Date
Samuel Nelson
4ecf7fc077 Allow custom test name formats
When using suites, test names were just the raw suite method name, but that's often not
detailed enough to know what the problem is.  This commit adds the ability to pass a custom
name format using certain formatting marks (sort of similar to templating strings) to
include the name of the function that called Run or NamedRun, the name of the suite's type,
and/or the name of the method.
2015-01-10 14:59:21 -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
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
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
Tyler
f5d202d78a Merge pull request #86 from victorkryukov/regexp
Implement Regexp and NotRegexp
2014-09-14 19:59:58 -06:00
Victor Kryukov
8b09ac0ee8 Implement HTTP(Success|Error|Redirect) and HTTPBody(Not)Contains 2014-09-14 11:54:12 -06:00
Victor Kryukov
b64f0d0b59 Implement Regexp and NotRegexp 2014-09-13 13:13:42 -06:00
Tyler
a2e5515d4d Merge pull request #85 from stretchr/joshrendek-patch-1
Joshrendek patch 1
2014-09-09 20:38:23 -06:00
Tyler Bunnell
4cf7cb9078 Update readme, make it more clear to use httptest
Fix #64
2014-09-09 20:37:24 -06:00
Tyler
15dabc1a45 Merge pull request #73 from comogo/includes
Allow Contains and NotContains to check slices and arrays
2014-09-09 20:31:58 -06:00
Tyler
679eba27b1 Merge pull request #78 from evanphx/patch-1
Include sentence about using mockery
2014-09-09 08:10:43 -06:00
Tyler
b8d551e7d1 Merge pull request #76 from victorkryukov/master
Increase testify/assert test coverage from 86.6% to 97.1%, fix bugs.
2014-09-09 08:10:22 -06:00
Tyler
c910098884 Merge pull request #80 from capoferro/patch-1
Fix grammer on assert.Len()
2014-09-04 20:00:59 -06:00
Josiah Kiehl (formerly @bluepojo)
27b1e9d9f2 Fix grammer on assert.Len()
🐹
2014-09-04 15:55:45 -07:00
Evan Phoenix
3ec36163bc Include sentence about using mockery 2014-09-02 17:03:21 -07:00
Victor
0f9ba46361 Minor doc string update 2014-08-28 13:05:46 -07:00
Victor Kryukov
5461242ffd Increase assert test coverage from 86.6% to 97.1%, fixed bugs.
Extend tests for NotEqual, Len and add tests for Condition, InEpsilon.
Add tests for Assertion.Condition, Assertion.InEpsilon, Assertion.InDelta
Fix a bug for Assertion.InDelta, Assertion.InEpsilon having incorrect signature.
2014-08-28 12:56:51 -07:00
Mateus Lorandi dos Santos
ab1fdba54e Allow Contains and NotContains to check slices and arrays 2014-08-21 11:13:02 -03:00
Mat Ryer
653e88ba55 Merge pull request #74 from obeattie/master
Print the expected and actual items of an Equal call on separate lines
2014-08-17 13:22:06 -06:00
Oliver Beattie
3c808d3dab Print the expected and actual items of an Equal call on separate lines
Makes for much easier comparison visually
2014-08-17 17:57:22 +01:00
Oliver Beattie
8fb35d6c24 Fix up TestSuiteLogging in verbose mode 2014-08-17 17:34:01 +01:00
Mat Ryer
da775f0337 Merge pull request #67 from anupcshan/master
Fix issue #55 - Serialize calls to Mock.Called.
2014-07-31 14:47:41 -06:00