From 2ca25e3faccf8c9d767e25a8295ce9ad56e575d3 Mon Sep 17 00:00:00 2001 From: Alexander Pantyukhin Date: Thu, 5 Mar 2020 10:16:40 +0400 Subject: [PATCH] fix for assertions --- assert/assertion_order_test.go | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/assert/assertion_order_test.go b/assert/assertion_order_test.go index e60c85c..daf9bea 100644 --- a/assert/assertion_order_test.go +++ b/assert/assertion_order_test.go @@ -131,9 +131,7 @@ func Test_compareTwoValuesDifferentValuesTypes(t *testing.T) { {v1: "float(12)", v2: float64(1)}, } { compareResult := compareTwoValues(mockT, currCase.v1, currCase.v2, []CompareType{compareLess, compareEqual, compareGreater}, "testFailMessage") - if compareResult { - t.Errorf("Values %s and %s should be different kinds", currCase.v1, currCase.v2) - } + False(t, compareResult) } } @@ -152,13 +150,11 @@ func Test_compareTwoValuesNotComparableValues(t *testing.T) { {v1: make([]int, 5, 5), v2: make([]int, 5, 5)}, } { compareResult := compareTwoValues(mockT, currCase.v1, currCase.v2, []CompareType{compareLess, compareEqual, compareGreater}, "testFailMessage") - if compareResult { - t.Errorf("Values %s and %s should be not comparable", currCase.v1, currCase.v2) - } + False(t, compareResult) } } -func Test_compareTwoValuesCrrectCompareResult(t *testing.T) { +func Test_compareTwoValuesCorrectCompareResult(t *testing.T) { mockT := new(testing.T) for _, currCase := range []struct { @@ -174,9 +170,7 @@ func Test_compareTwoValuesCrrectCompareResult(t *testing.T) { {v1: 2, v2: 1, compareTypes: []CompareType{compareGreater}}, } { compareResult := compareTwoValues(mockT, currCase.v1, currCase.v2, currCase.compareTypes, "testFailMessage") - if !compareResult { - t.Errorf("Values %d and %d is not compared correctly", currCase.v1, currCase.v2) - } + True(t, compareResult) } } @@ -192,8 +186,6 @@ func Test_containsValue(t *testing.T) { {values: []CompareType{compareGreater, compareLess}, value: compareEqual, result: false}, } { compareResult := containsValue(currCase.values, currCase.value) - if compareResult != currCase.result { - t.Error("Value not in list") - } + Equal(t, currCase.result, compareResult) } }