From 278e583bf6862d61070c43e28ebee8586880dc7e Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Mon, 15 Mar 2021 18:23:55 +0200 Subject: [PATCH] Switch expected with received --- utils/accountprofile_test.go | 16 +++++++-------- utils/apitpdata_test.go | 2 +- utils/cgrevent_test.go | 18 ++++++++-------- utils/coreutils_test.go | 16 +++++++-------- utils/dataconverter_test.go | 8 ++++---- utils/decimal_test.go | 4 ++-- utils/eventcharges_test.go | 18 ++++++++-------- utils/librates_test.go | 40 ++++++++++++++++++------------------ 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/utils/accountprofile_test.go b/utils/accountprofile_test.go index a36f1d98d..9c6e9ca8c 100644 --- a/utils/accountprofile_test.go +++ b/utils/accountprofile_test.go @@ -368,7 +368,7 @@ func TestAPAccountBalancesBackup(t *testing.T) { actBk := actPrf.AccountBalancesBackup() for key, value := range actBk { if actPrf.Balances[key].Units.Big.Cmp(value) != 0 { - t.Errorf("\ngot: <%+v>, \nwant: <%+v>", value, actPrf.Balances[key].Units.Big) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", actPrf.Balances[key].Units.Big, value) } } } @@ -404,7 +404,7 @@ func TestAPNewDefaultBalance(t *testing.T) { received := NewDefaultBalance(id) if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>,\nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -435,7 +435,7 @@ func TestAPApsSort(t *testing.T) { apS.Sort() if !reflect.DeepEqual(apS, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", ToJSON(apS), ToJSON(expected)) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", ToJSON(expected), ToJSON(apS)) } } @@ -493,7 +493,7 @@ func TestAPAccountProfiles(t *testing.T) { received := apS.AccountProfiles() if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>,\nExpected: <%+v>", ToJSON(received), ToJSON(expected)) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", ToJSON(expected), ToJSON(received)) } } @@ -550,7 +550,7 @@ func TestAPLockIDs(t *testing.T) { received := apS.LockIDs() if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -609,7 +609,7 @@ func TestAPTenantIDs(t *testing.T) { received := apS.TenantIDs() if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -640,7 +640,7 @@ func TestAPBlcsSort(t *testing.T) { blncS.Sort() if !reflect.DeepEqual(blncS, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", ToJSON(blncS), ToJSON(expected)) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", ToJSON(expected), ToJSON(blncS)) } } @@ -707,6 +707,6 @@ func TestAPBalances(t *testing.T) { received := blncS.Balances() if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>,\nExpected: <%+v>", ToJSON(received), ToJSON(expected)) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", ToJSON(expected), ToJSON(received)) } } diff --git a/utils/apitpdata_test.go b/utils/apitpdata_test.go index c373b006f..3f3d81b45 100644 --- a/utils/apitpdata_test.go +++ b/utils/apitpdata_test.go @@ -1251,6 +1251,6 @@ func TestATDUsage(t *testing.T) { _, err := args.Usage() expected := "cannot convert field: true to time.Duration" if err == nil || err.Error() != expected { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err.Error(), expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, err.Error()) } } diff --git a/utils/cgrevent_test.go b/utils/cgrevent_test.go index 669acd26b..4114ec652 100644 --- a/utils/cgrevent_test.go +++ b/utils/cgrevent_test.go @@ -446,10 +446,10 @@ func TestCGREventOptAsStringEmpty(t *testing.T) { received, err := ev.OptAsString("testString") if !reflect.DeepEqual(received, expstr) { - t.Errorf("\nReceived: %q, \nExpected: %q", received, expstr) + t.Errorf("\nExpected: %q, \nReceived: %q", expstr, received) } if err == nil || err != experr { - t.Errorf("\nReceived: %q, \nExpected: %q", err, experr) + t.Errorf("\nExpected: %q, \nReceived: %q", experr, err) } } @@ -462,12 +462,12 @@ func TestCGREventOptAsString(t *testing.T) { received, err := ev.OptAsString("testKey") if err != nil { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err, nil) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", nil, err) } expected := "13" if received != expected { - t.Errorf("\nReceived: %q, \nExpected: %q", received, expected) + t.Errorf("\nExpected: %q, \nReceived: %q", expected, received) } } @@ -479,10 +479,10 @@ func TestCGREventOptAsDurationEmpty(t *testing.T) { received, err := ev.OptAsDuration("testString") if !reflect.DeepEqual(received, expdur) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expdur) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expdur, received) } if err == nil || err != experr { - t.Errorf("\nReceived: %q, \nExpected: %q", err, experr) + t.Errorf("\nExpected: %q, \nReceived: %q", experr, err) } } @@ -495,12 +495,12 @@ func TestCGREventOptAsDuration(t *testing.T) { received, err := ev.OptAsDuration("testKey") if err != nil { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err, nil) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", nil, err) } expected := 30 * time.Nanosecond if received != expected { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -524,6 +524,6 @@ func TestCGREventAsDataProvider(t *testing.T) { received := ev.AsDataProvider() if !reflect.DeepEqual(expected, received) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } diff --git a/utils/coreutils_test.go b/utils/coreutils_test.go index f34f08fa0..6223e849b 100644 --- a/utils/coreutils_test.go +++ b/utils/coreutils_test.go @@ -1648,7 +1648,7 @@ func TestCoreUtilsBiRPCCall(t *testing.T) { err := BiRPCCall(srv, clnt, serviceMethod, args, reply) if err == nil || err != expected { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", err, expected) + t.Errorf("\nExpected: <%v>, \nReceived: <%v>", expected, err) } serviceMethod = "testv1.fail" @@ -1656,7 +1656,7 @@ func TestCoreUtilsBiRPCCall(t *testing.T) { err = BiRPCCall(srv, clnt, serviceMethod, args, reply) if err == nil || err != expected { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", err, expected) + t.Errorf("\nExpected: <%v>, \nReceived: <%v>", expected, err) } serviceMethod = "Testv1.ValidMethod" @@ -1664,7 +1664,7 @@ func TestCoreUtilsBiRPCCall(t *testing.T) { err = BiRPCCall(srv, clnt, serviceMethod, args, reply) if err != nil { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", err, nil) + t.Errorf("\nExpected: <%v>, \nReceived: <%v>", nil, err) } serviceMethod = "Testv1.MultipleParams" @@ -1673,7 +1673,7 @@ func TestCoreUtilsBiRPCCall(t *testing.T) { err = BiRPCCall(srv, clnt, serviceMethod, args, reply) if err == nil || err != expected { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", err, expected) + t.Errorf("\nExpected: <%v>, \nReceived: <%v>", expected, err) } serviceMethod = "Testv1.NoErrorReturn" @@ -1681,7 +1681,7 @@ func TestCoreUtilsBiRPCCall(t *testing.T) { expected = ErrServerError if err == nil || err != expected { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", err, expected) + t.Errorf("\nExpected: <%v>, \nReceived: <%v>", expected, err) } serviceMethod = "Testv1.FinalError" @@ -1689,7 +1689,7 @@ func TestCoreUtilsBiRPCCall(t *testing.T) { expected = ErrExists if err == nil || err != expected { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", err, expected) + t.Errorf("\nExpected: <%v>, \nReceived: <%v>", expected, err) } var c client @@ -1697,7 +1697,7 @@ func TestCoreUtilsBiRPCCall(t *testing.T) { err = BiRPCCall(srv, c, serviceMethod, args, reply) if err == nil || err != expected { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", err, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, err) } } @@ -1720,7 +1720,7 @@ func TestCoreUtilsGenerateDBItemOpts(t *testing.T) { } for key, value := range received { if expected[key] != value { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", value, expected[key]) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected[key], value) } } } diff --git a/utils/dataconverter_test.go b/utils/dataconverter_test.go index 06a3f8f1e..2494c2009 100644 --- a/utils/dataconverter_test.go +++ b/utils/dataconverter_test.go @@ -940,7 +940,7 @@ func TestDCNewRandomConverterCase2Begin(t *testing.T) { expected := "strconv.Atoi: parsing \"test\": invalid syntax" if err == nil || err.Error() != expected { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err.Error(), expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, err.Error()) } } @@ -951,7 +951,7 @@ func TestDCNewRandomConverterCase2End(t *testing.T) { expected := "strconv.Atoi: parsing \"test\": invalid syntax" if err == nil || err.Error() != expected { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err.Error(), expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, err.Error()) } } @@ -962,7 +962,7 @@ func TestDCNewRandomConverterCase1Begin(t *testing.T) { expected := "strconv.Atoi: parsing \"test\": invalid syntax" if err == nil || err.Error() != expected { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err.Error(), expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, err.Error()) } } @@ -981,6 +981,6 @@ func TestDCrCConvert(t *testing.T) { t.Error(err) } if receivedAsInt != 0 && receivedAsInt != 1 { - t.Errorf("\nReceived: <%+v>, \nExpected 0 or 1", received) + t.Errorf("\nExpected 0 or 1, \nReceived: <%+v>", received) } } diff --git a/utils/decimal_test.go b/utils/decimal_test.go index c4a7450d4..e08c6c073 100644 --- a/utils/decimal_test.go +++ b/utils/decimal_test.go @@ -161,7 +161,7 @@ func TestDecimalNewDecimalFromString(t *testing.T) { } expected := &Decimal{decimal.New(1234, 1)} if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -171,6 +171,6 @@ func TestDecimalNewDecimalFromStringFail(t *testing.T) { expected := "can't convert <" + str + "> to decimal" if err == nil || err.Error() != expected { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, err) } } diff --git a/utils/eventcharges_test.go b/utils/eventcharges_test.go index 1ace428e2..639bcdf4e 100644 --- a/utils/eventcharges_test.go +++ b/utils/eventcharges_test.go @@ -34,7 +34,7 @@ func TestECNewEventCharges(t *testing.T) { received := NewEventCharges() if !reflect.DeepEqual(expected, received) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -57,7 +57,7 @@ func TestECMergeAbstractsEmpty(t *testing.T) { received.Merge(ec1, ec2) if !reflect.DeepEqual(expected, received) { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -84,7 +84,7 @@ func TestECMergeAbstracts(t *testing.T) { received.Merge(ec1, ec2) if !reflect.DeepEqual(expected, received) { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -104,7 +104,7 @@ func TestECAsExtEventChargesEmpty(t *testing.T) { } if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -125,14 +125,14 @@ func TestECAsExtEventChargesSuccess(t *testing.T) { } received, err := ec.AsExtEventCharges() if err != nil { - t.Errorf("\nReceived: %v,\nExpected: %v", err, nil) + t.Errorf("\nExpected: %v,\nReceived: %v", nil, err) } if !reflect.DeepEqual(received, expected) { t.Errorf( - "\nReceived: <%v>,\nExpected: <%v>", - ToJSON(received), + "\nExpected: <%v>,\nReceived: <%v>", ToJSON(expected), + ToJSON(received), ) } } @@ -149,7 +149,7 @@ func TestECAsExtEventChargesFailAbstracts(t *testing.T) { _, err := ec.AsExtEventCharges() if err == nil || err.Error() != expected { - t.Errorf("\nReceived: %v,\nExpected: %v", err, expected) + t.Errorf("\nExpected: %v,\nReceived: %v", expected, err) } } @@ -165,6 +165,6 @@ func TestECAsExtEventChargesFailConcretes(t *testing.T) { _, err := ec.AsExtEventCharges() if err == nil || err.Error() != expected { - t.Errorf("\nReceived: %v,\nExpected: %v", err, expected) + t.Errorf("\nExpected: %v,\nReceived: %v", expected, err) } } diff --git a/utils/librates_test.go b/utils/librates_test.go index f7d7d69b2..db2ae9fe0 100644 --- a/utils/librates_test.go +++ b/utils/librates_test.go @@ -35,7 +35,7 @@ func TestLibratesTenantID(t *testing.T) { expected := rp.Tenant + ":" + rp.ID received := rp.TenantID() if received != expected { - t.Errorf("\nReceived: <%v>,\nExpected: <%v>", received, expected) + t.Errorf("\nExpected: <%v>,\nReceived: <%v>", expected, received) } } @@ -44,7 +44,7 @@ func TestLibratesCompilerp(t *testing.T) { rp := &RateProfile{} err := rp.Compile() if err != nil { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", err, nil) + t.Errorf("\nExpected: <%v>, \nReceived: <%v>", nil, err) } // non-empty @@ -65,7 +65,7 @@ func TestLibratesCompilerp(t *testing.T) { err = rp.Compile() if err == nil || err.Error() != expected { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", err, expected) + t.Errorf("\nExpected: <%v>, \nReceived: <%v>", expected, err) } } @@ -78,7 +78,7 @@ func TestLibratesUID(t *testing.T) { received := rt.UID() if received != expected { - t.Errorf("\nReceived: %q, \nExpected: %q", received, expected) + t.Errorf("\nExpected: %q, \nReceived: %q", expected, received) } } @@ -91,7 +91,7 @@ func TestLibratesCompilert(t *testing.T) { err := rt.Compile() if err != nil { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err, nil) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", nil, err) } } @@ -111,11 +111,11 @@ func TestLibratesRunTimes(t *testing.T) { var expected [][]time.Time if err == nil || err != ErrMaxIterationsReached { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err, ErrMaxIterationsReached) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", ErrMaxIterationsReached, err) } if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } // aTime after eTime test @@ -135,7 +135,7 @@ func TestLibratesRunTimes(t *testing.T) { } if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } // eTime before iTime test @@ -172,7 +172,7 @@ func TestLibratesRunTimes(t *testing.T) { } if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } //eTime after iTime @@ -195,7 +195,7 @@ func TestLibratesRunTimes(t *testing.T) { } if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -218,7 +218,7 @@ func TestLibratesCorrectCost(t *testing.T) { rPc.CorrectCost(nil, "") if !reflect.DeepEqual(rPc, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", rPc, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, rPc) } //CorrectCost rounds the cost @@ -232,7 +232,7 @@ func TestLibratesCorrectCost(t *testing.T) { rPc.CorrectCost(IntPointer(2), MetaRoundingUp) if !reflect.DeepEqual(rPc, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", rPc, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, rPc) } //CorrectCost assigns MaxCost to Cost when Cost > MaxCost @@ -247,7 +247,7 @@ func TestLibratesCorrectCost(t *testing.T) { rPc.CorrectCost(nil, "") if !reflect.DeepEqual(rPc, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", rPc, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, rPc) } //CorrectCost assigns MinCost to Cost when Cost < MinCost @@ -262,7 +262,7 @@ func TestLibratesCorrectCost(t *testing.T) { rPc.CorrectCost(nil, "") if !reflect.DeepEqual(rPc, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", rPc, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, rPc) } } @@ -1463,11 +1463,11 @@ func TestLibratesAsRateProfile(t *testing.T) { experr := "invalid DynamicWeight format for string " if err == nil || err.Error() != experr { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", err, experr) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", experr, err) } if received != nil { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, nil) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", nil, received) } // No changes @@ -1481,7 +1481,7 @@ func TestLibratesAsRateProfile(t *testing.T) { } if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } // assign MinCost to rp @@ -1495,7 +1495,7 @@ func TestLibratesAsRateProfile(t *testing.T) { } if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } // assign MaxCost to rp @@ -1509,7 +1509,7 @@ func TestLibratesAsRateProfile(t *testing.T) { } if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%+v>, \nExpected: <%+v>", received, expected) + t.Errorf("\nExpected: <%+v>, \nReceived: <%+v>", expected, received) } } @@ -1542,6 +1542,6 @@ func TestLibratesAsRateProfileNon0Len(t *testing.T) { } if !reflect.DeepEqual(received, expected) { - t.Errorf("\nReceived: <%v>, \nExpected: <%v>", received, expected) + t.Errorf("\nExpected: <%v>, \nReceived: <%v>", expected, received) } }