diff options
Diffstat (limited to 'is/is_test.go')
| -rw-r--r-- | is/is_test.go | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/is/is_test.go b/is/is_test.go index 854fd48..a0b51cf 100644 --- a/is/is_test.go +++ b/is/is_test.go @@ -7,35 +7,35 @@ import ( "testing" "time" - . "go.xyrillian.de/gg/internal/test" + "go.xyrillian.de/gg/assert" "go.xyrillian.de/gg/is" . "go.xyrillian.de/gg/option" ) func TestComparable(t *testing.T) { - AssertEqual(t, Some("foo").IsSomeAnd(is.EqualTo("foo")), true) - AssertEqual(t, Some("bar").IsSomeAnd(is.EqualTo("foo")), false) + assert.Equal(t, Some("foo").IsSomeAnd(is.EqualTo("foo")), true) + assert.Equal(t, Some("bar").IsSomeAnd(is.EqualTo("foo")), false) - AssertEqual(t, Some("foo").IsSomeAnd(is.DifferentFrom("foo")), false) - AssertEqual(t, Some("bar").IsSomeAnd(is.DifferentFrom("foo")), true) + assert.Equal(t, Some("foo").IsSomeAnd(is.DifferentFrom("foo")), false) + assert.Equal(t, Some("bar").IsSomeAnd(is.DifferentFrom("foo")), true) } func TestOrdered(t *testing.T) { - AssertEqual(t, Some(3).IsSomeAnd(is.Above(4)), false) - AssertEqual(t, Some(4).IsSomeAnd(is.Above(4)), false) - AssertEqual(t, Some(5).IsSomeAnd(is.Above(4)), true) + assert.Equal(t, Some(3).IsSomeAnd(is.Above(4)), false) + assert.Equal(t, Some(4).IsSomeAnd(is.Above(4)), false) + assert.Equal(t, Some(5).IsSomeAnd(is.Above(4)), true) - AssertEqual(t, Some(3).IsSomeAnd(is.Below(4)), true) - AssertEqual(t, Some(4).IsSomeAnd(is.Below(4)), false) - AssertEqual(t, Some(5).IsSomeAnd(is.Below(4)), false) + assert.Equal(t, Some(3).IsSomeAnd(is.Below(4)), true) + assert.Equal(t, Some(4).IsSomeAnd(is.Below(4)), false) + assert.Equal(t, Some(5).IsSomeAnd(is.Below(4)), false) - AssertEqual(t, Some(3).IsSomeAnd(is.NotAbove(4)), true) - AssertEqual(t, Some(4).IsSomeAnd(is.NotAbove(4)), true) - AssertEqual(t, Some(5).IsSomeAnd(is.NotAbove(4)), false) + assert.Equal(t, Some(3).IsSomeAnd(is.NotAbove(4)), true) + assert.Equal(t, Some(4).IsSomeAnd(is.NotAbove(4)), true) + assert.Equal(t, Some(5).IsSomeAnd(is.NotAbove(4)), false) - AssertEqual(t, Some(3).IsSomeAnd(is.NotBelow(4)), false) - AssertEqual(t, Some(4).IsSomeAnd(is.NotBelow(4)), true) - AssertEqual(t, Some(5).IsSomeAnd(is.NotBelow(4)), true) + assert.Equal(t, Some(3).IsSomeAnd(is.NotBelow(4)), false) + assert.Equal(t, Some(4).IsSomeAnd(is.NotBelow(4)), true) + assert.Equal(t, Some(5).IsSomeAnd(is.NotBelow(4)), true) } func TestTime(t *testing.T) { @@ -43,19 +43,19 @@ func TestTime(t *testing.T) { t2 := t1.Add(time.Second) t3 := t2.Add(time.Second) - AssertEqual(t, Some(t1).IsSomeAnd(is.After(t2)), false) - AssertEqual(t, Some(t2).IsSomeAnd(is.After(t2)), false) - AssertEqual(t, Some(t3).IsSomeAnd(is.After(t2)), true) + assert.Equal(t, Some(t1).IsSomeAnd(is.After(t2)), false) + assert.Equal(t, Some(t2).IsSomeAnd(is.After(t2)), false) + assert.Equal(t, Some(t3).IsSomeAnd(is.After(t2)), true) - AssertEqual(t, Some(t1).IsSomeAnd(is.Before(t2)), true) - AssertEqual(t, Some(t2).IsSomeAnd(is.Before(t2)), false) - AssertEqual(t, Some(t3).IsSomeAnd(is.Before(t2)), false) + assert.Equal(t, Some(t1).IsSomeAnd(is.Before(t2)), true) + assert.Equal(t, Some(t2).IsSomeAnd(is.Before(t2)), false) + assert.Equal(t, Some(t3).IsSomeAnd(is.Before(t2)), false) - AssertEqual(t, Some(t1).IsSomeAnd(is.NotAfter(t2)), true) - AssertEqual(t, Some(t2).IsSomeAnd(is.NotAfter(t2)), true) - AssertEqual(t, Some(t3).IsSomeAnd(is.NotAfter(t2)), false) + assert.Equal(t, Some(t1).IsSomeAnd(is.NotAfter(t2)), true) + assert.Equal(t, Some(t2).IsSomeAnd(is.NotAfter(t2)), true) + assert.Equal(t, Some(t3).IsSomeAnd(is.NotAfter(t2)), false) - AssertEqual(t, Some(t1).IsSomeAnd(is.NotBefore(t2)), false) - AssertEqual(t, Some(t2).IsSomeAnd(is.NotBefore(t2)), true) - AssertEqual(t, Some(t3).IsSomeAnd(is.NotBefore(t2)), true) + assert.Equal(t, Some(t1).IsSomeAnd(is.NotBefore(t2)), false) + assert.Equal(t, Some(t2).IsSomeAnd(is.NotBefore(t2)), true) + assert.Equal(t, Some(t3).IsSomeAnd(is.NotBefore(t2)), true) } |