Skip to content

Commit e5d75c9

Browse files
kmesh-botkmesh-bot
authored
Merge pull request #1421 from Flying-Tom/assert-fix
Fix: wrong arg order of testify/assert
2 parents 243c38e + 0d31bae commit e5d75c9

File tree

8 files changed

+44
-44
lines changed

8 files changed

+44
-44
lines changed

‎pkg/cache/v2/listener_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ func BenchmarkListenerFlush(b *testing.B) {
327327
cache.SetApiListener(listener.Name, listener)
328328

329329
cache.Flush()
330-
assert.Equal(t, listener.GetApiStatus(), core_v2.ApiStatus_NONE)
330+
assert.Equal(t, core_v2.ApiStatus_NONE, listener.GetApiStatus())
331331
}
332332
}
333333

@@ -398,7 +398,7 @@ func TestListenerFlushAndLookup(t *testing.T) {
398398
}
399399
cache.SetApiListener(listener.Name, listener)
400400
cache.Flush()
401-
assert.Equal(t, listener.GetApiStatus(), core_v2.ApiStatus_NONE)
401+
assert.Equal(t, core_v2.ApiStatus_NONE, listener.GetApiStatus())
402402

403403
listener_val := &listener_v2.Listener{}
404404
err := maps_v2.ListenerLookup(listener_addr, listener_val)
@@ -447,7 +447,7 @@ func TestListenerUpdateAndDeleteFlush(t *testing.T) {
447447
}
448448
cache.SetApiListener(listener.Name, listener)
449449
cache.Flush()
450-
assert.Equal(t, listener.GetApiStatus(), core_v2.ApiStatus_NONE)
450+
assert.Equal(t, core_v2.ApiStatus_NONE, listener.GetApiStatus())
451451

452452
count = test.GetMapCount(adsObj.SockConn.KmeshCgroupSockMaps.KmeshMap64, t)
453453
assert.NotEqual(t, 0, count, "eBPF map kmeshMap64 elements count should not 0")

‎pkg/controller/ads/ads_processor_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ func TestHandleCdsResponse(t *testing.T) {
7474
assert.Equal(t, wantHash, actualHash)
7575
assert.Equal(t, []string{"ut-cluster"}, p.req.ResourceNames)
7676
// send new eds subscribe to the new cluster with empty nonce
77-
assert.Equal(t, p.lastNonce.edsNonce, "")
78-
assert.Equal(t, p.Cache.ClusterCache.GetApiCluster(cluster.Name).ApiStatus, core_v2.ApiStatus_WAITING)
77+
assert.Equal(t, "", p.lastNonce.edsNonce)
78+
assert.Equal(t, core_v2.ApiStatus_WAITING, p.Cache.ClusterCache.GetApiCluster(cluster.Name).ApiStatus)
7979
})
8080

8181
t.Run("new cluster, cluster type is not eds", func(t *testing.T) {
@@ -97,7 +97,7 @@ func TestHandleCdsResponse(t *testing.T) {
9797
err = p.handleCdsResponse(rsp)
9898
assert.NoError(t, err)
9999
dnsClusters := <-p.DnsResolverChan
100-
assert.Equal(t, len(dnsClusters), 1)
100+
assert.Equal(t, 1, len(dnsClusters))
101101
assert.Empty(t, p.Cache.edsClusterNames)
102102
wantHash := hash.Sum64String(anyCluster.String())
103103
actualHash := p.Cache.ClusterCache.GetCdsHash(cluster.GetName())
@@ -200,7 +200,7 @@ func TestHandleCdsResponse(t *testing.T) {
200200
err := p.handleCdsResponse(rsp)
201201
assert.NoError(t, err)
202202
dnsClusters := <-p.DnsResolverChan
203-
assert.Equal(t, len(dnsClusters), 1)
203+
assert.Equal(t, 1, len(dnsClusters))
204204
assert.Equal(t, p.Cache.ClusterCache.GetApiCluster(multiClusters[0].Name).ApiStatus, core_v2.ApiStatus_WAITING)
205205
assert.Equal(t, p.Cache.ClusterCache.GetApiCluster(multiClusters[1].Name).ApiStatus, core_v2.ApiStatus_WAITING)
206206
assert.Equal(t, p.Cache.ClusterCache.GetApiCluster(multiClusters[2].Name).ApiStatus, core_v2.ApiStatus_NONE)
@@ -226,7 +226,7 @@ func TestHandleCdsResponse(t *testing.T) {
226226
err = p.handleCdsResponse(rsp)
227227
assert.NoError(t, err)
228228
dnsClusters = <-p.DnsResolverChan
229-
assert.Equal(t, len(dnsClusters), 1)
229+
assert.Equal(t, 1, len(dnsClusters))
230230
assert.Equal(t, []string{"ut-cluster2", "new-ut-cluster"}, p.Cache.edsClusterNames)
231231
wantHash := hash.Sum64String(anyCluster.String())
232232
actualHash := p.Cache.ClusterCache.GetCdsHash(newCluster.GetName())
@@ -262,7 +262,7 @@ func TestHandleCdsResponse(t *testing.T) {
262262
err = p.handleCdsResponse(rsp)
263263
assert.NoError(t, err)
264264
dnsClusters := <-p.DnsResolverChan
265-
assert.Equal(t, len(dnsClusters), 0)
265+
assert.Equal(t, 0, len(dnsClusters))
266266
newCluster1 := &config_cluster_v3.Cluster{
267267
Name: "new-ut-cluster1",
268268
ClusterDiscoveryType: &config_cluster_v3.Cluster_Type{
@@ -281,7 +281,7 @@ func TestHandleCdsResponse(t *testing.T) {
281281
assert.NoError(t, err)
282282

283283
dnsClusters = <-p.DnsResolverChan
284-
assert.Equal(t, len(dnsClusters), 0)
284+
assert.Equal(t, 0, len(dnsClusters))
285285
// only cluster2 is eds typed
286286
assert.Equal(t, []string{"new-ut-cluster1"}, p.Cache.edsClusterNames)
287287
wantHash1 := hash.Sum64String(anyCluster1.String())
@@ -539,8 +539,8 @@ func TestHandleLdsResponse(t *testing.T) {
539539
actualHash := p.Cache.ListenerCache.GetLdsHash(listener.GetName())
540540
assert.Equal(t, wantHash, actualHash)
541541
assert.Equal(t, []string{"ut-rds"}, p.req.ResourceNames)
542-
assert.Equal(t, p.lastNonce.ldsNonce, "nonce")
543-
assert.Equal(t, p.req.ResponseNonce, "")
542+
assert.Equal(t, "nonce", p.lastNonce.ldsNonce)
543+
assert.Equal(t, "", p.req.ResponseNonce)
544544
})
545545

546546
t.Run("listenerCache already has resource and it has not been changed", func(t *testing.T) {

‎pkg/controller/ads/convert_filter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestNewFilterTcpProxy(t *testing.T) {
4040
}
4141
tcpProxy := newFilterTcpProxy(envoyTcpProxy)
4242
require.NotNil(t, tcpProxy)
43-
assert.Equal(t, tcpProxy.GetCluster(), "ut-cluster")
43+
assert.Equal(t, "ut-cluster", tcpProxy.GetCluster())
4444
})
4545
t.Run("ClusterSpecifier is WeightedClusters", func(t *testing.T) {
4646
weightedClusters := []*envoy_filters_tcp_proxy.TcpProxy_WeightedCluster_ClusterWeight{

‎pkg/controller/telemetry/metric_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,9 +646,9 @@ func TestBuildConnectionMetricsToPrometheus(t *testing.T) {
646646
assert.Equal(t, m.connectionMetricCache[tt.args.labels].ConnPacketLost, tt.want[2])
647647
assert.Equal(t, m.connectionMetricCache[tt.args.labels].ConnTotalRetrans, tt.want[3])
648648
if tt.id == 1 {
649-
assert.Equal(t, len(deleteConnection), 0)
649+
assert.Equal(t, 0, len(deleteConnection))
650650
} else {
651-
assert.Equal(t, len(deleteConnection), 1)
651+
assert.Equal(t, 1, len(deleteConnection))
652652
}
653653
})
654654
}

‎pkg/controller/workload/bpfcache/endpoint_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func TestEndpointSwap(t *testing.T) {
7676
}
7777

7878
eps := c.GetAllEndpointsForService(1)
79-
assert.Equal(t, len(eps), 2)
79+
assert.Equal(t, 2, len(eps))
8080

8181
assert.Equal(t, 2, len(c.endpointKeys))
8282
epKs := c.GetEndpointKeys(2)

‎pkg/controller/workload/cache/waypoint_cache_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ func TestBasic(t *testing.T) {
5252
}
5353

5454
// Waypoint service has not been processed.
55-
assert.Equal(t, len(cache.serviceToWaypoint), 1)
56-
assert.Equal(t, len(cache.workloadToWaypoint), 1)
57-
assert.Equal(t, len(cache.waypointAssociatedObjects), 1)
55+
assert.Equal(t, 1, len(cache.serviceToWaypoint))
56+
assert.Equal(t, 1, len(cache.workloadToWaypoint))
57+
assert.Equal(t, 1, len(cache.waypointAssociatedObjects))
5858

5959
if _, ok := cache.serviceToWaypoint[svc3.ResourceName()]; !ok {
6060
t.Fatalf("service %s should be included in waypoint cache", svc3.ResourceName())
@@ -67,23 +67,23 @@ func TestBasic(t *testing.T) {
6767
}
6868

6969
associated := cache.waypointAssociatedObjects[waypointHostname]
70-
assert.Equal(t, associated.isResolved(), false)
70+
assert.Equal(t, false, associated.isResolved())
7171

7272
isHostnameTypeWaypoint := func(waypoint *workloadapi.GatewayAddress) bool {
7373
return waypoint.GetHostname() != nil
7474
}
7575

76-
assert.Equal(t, isHostnameTypeWaypoint(associated.services[svc3.ResourceName()].Waypoint), true)
77-
assert.Equal(t, isHostnameTypeWaypoint(associated.workloads[wl3.ResourceName()].Waypoint), true)
76+
assert.Equal(t, true, isHostnameTypeWaypoint(associated.services[svc3.ResourceName()].Waypoint))
77+
assert.Equal(t, true, isHostnameTypeWaypoint(associated.workloads[wl3.ResourceName()].Waypoint))
7878

7979
// Create waypoint service and process.
8080
waypointsvc := common.CreateFakeService("waypoint", "10.240.10.11", "", nil)
8181
svcs, wls := cache.Refresh(waypointsvc)
82-
assert.Equal(t, len(svcs), 1)
83-
assert.Equal(t, len(wls), 1)
84-
assert.Equal(t, associated.isResolved(), true)
85-
assert.Equal(t, isHostnameTypeWaypoint(associated.services[svc3.ResourceName()].Waypoint), false)
86-
assert.Equal(t, isHostnameTypeWaypoint(associated.workloads[wl3.ResourceName()].Waypoint), false)
82+
assert.Equal(t, 1, len(svcs))
83+
assert.Equal(t, 1, len(wls))
84+
assert.Equal(t, true, associated.isResolved())
85+
assert.Equal(t, false, isHostnameTypeWaypoint(associated.services[svc3.ResourceName()].Waypoint))
86+
assert.Equal(t, false, isHostnameTypeWaypoint(associated.workloads[wl3.ResourceName()].Waypoint))
8787

8888
// Create service and workload with waypoint which has been resolved.
8989
svc4 := common.CreateFakeService("svc4", "10.240.10.4", waypointHostname, nil)
@@ -92,8 +92,8 @@ func TestBasic(t *testing.T) {
9292
cache.AddOrUpdateWorkload(wl4)
9393

9494
// svc4 and wl4 have been added to the waypoint cache and hostname of waypoint has been resolved.
95-
assert.Equal(t, isHostnameTypeWaypoint(associated.services[svc4.ResourceName()].Waypoint), false)
96-
assert.Equal(t, isHostnameTypeWaypoint(associated.workloads[wl4.ResourceName()].Waypoint), false)
95+
assert.Equal(t, false, isHostnameTypeWaypoint(associated.services[svc4.ResourceName()].Waypoint))
96+
assert.Equal(t, false, isHostnameTypeWaypoint(associated.workloads[wl4.ResourceName()].Waypoint))
9797

9898
// Delete all svcs and workloads.
9999
for _, svc := range []*workloadapi.Service{svc1, svc2, svc3, svc4, waypointsvc} {
@@ -103,7 +103,7 @@ func TestBasic(t *testing.T) {
103103
cache.DeleteWorkload(wl.ResourceName())
104104
}
105105

106-
assert.Equal(t, len(cache.serviceToWaypoint), 0)
107-
assert.Equal(t, len(cache.workloadToWaypoint), 0)
108-
assert.Equal(t, len(cache.waypointAssociatedObjects), 0)
106+
assert.Equal(t, 0, len(cache.serviceToWaypoint))
107+
assert.Equal(t, 0, len(cache.workloadToWaypoint))
108+
assert.Equal(t, 0, len(cache.waypointAssociatedObjects))
109109
}

‎pkg/controller/workload/workload_processor_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func checkServiceMap(t *testing.T, p *Processor, svcId uint32, fakeSvc *workload
272272
assert.Equal(t, endpointCount, sv.EndpointCount[priority])
273273
waypointAddr := fakeSvc.GetWaypoint().GetAddress().GetAddress()
274274
if waypointAddr != nil {
275-
assert.Equal(t, test.EqualIp(sv.WaypointAddr, waypointAddr), true)
275+
assert.Equal(t, true, test.EqualIp(sv.WaypointAddr, waypointAddr))
276276
}
277277

278278
assert.Equal(t, sv.WaypointPort, nets.ConvertPortToBigEndian(fakeSvc.Waypoint.GetHboneMtlsPort()))
@@ -306,10 +306,10 @@ func checkBackendMap(t *testing.T, p *Processor, workloadID uint32, wl *workload
306306
var bv bpfcache.BackendValue
307307
err := p.bpf.BackendLookup(&bpfcache.BackendKey{BackendUid: workloadID}, &bv)
308308
assert.NoError(t, err)
309-
assert.Equal(t, test.EqualIp(bv.Ip, wl.Addresses[0]), true)
309+
assert.Equal(t, true, test.EqualIp(bv.Ip, wl.Addresses[0]))
310310
waypointAddr := wl.GetWaypoint().GetAddress().GetAddress()
311311
if waypointAddr != nil {
312-
assert.Equal(t, test.EqualIp(bv.WaypointAddr, waypointAddr), true)
312+
assert.Equal(t, true, test.EqualIp(bv.WaypointAddr, waypointAddr))
313313
}
314314
assert.Equal(t, bv.WaypointPort, nets.ConvertPortToBigEndian(wl.GetWaypoint().GetHboneMtlsPort()))
315315
}

‎pkg/status/status_server_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -451,21 +451,21 @@ func TestServerMetricHandler(t *testing.T) {
451451
w = httptest.NewRecorder()
452452
server.accesslogHandler(w, req)
453453

454-
assert.Equal(t, server.xdsClient.WorkloadController.GetAccesslogTrigger(), false)
454+
assert.Equal(t, false, server.xdsClient.WorkloadController.GetAccesslogTrigger())
455455

456456
url = fmt.Sprintf("%s?enable=%s", patternWorkloadMetrics, "false")
457457
req = httptest.NewRequest(http.MethodPost, url, nil)
458458
w = httptest.NewRecorder()
459459
server.workloadMetricHandler(w, req)
460460

461-
assert.Equal(t, server.xdsClient.WorkloadController.GetWorklaodMetricTrigger(), false)
461+
assert.Equal(t, false, server.xdsClient.WorkloadController.GetWorklaodMetricTrigger())
462462

463463
url = fmt.Sprintf("%s?enable=%s", patternConnectionMetrics, "false")
464464
req = httptest.NewRequest(http.MethodPost, url, nil)
465465
w = httptest.NewRecorder()
466466
server.connectionMetricHandler(w, req)
467467

468-
assert.Equal(t, server.xdsClient.WorkloadController.GetConnectionMetricTrigger(), false)
468+
assert.Equal(t, false, server.xdsClient.WorkloadController.GetConnectionMetricTrigger())
469469
})
470470

471471
t.Run("when monitoring is disable, cannot enable accesslog, workload metrics and connection metrics", func(t *testing.T) {
@@ -493,28 +493,28 @@ func TestServerMetricHandler(t *testing.T) {
493493
w := httptest.NewRecorder()
494494
server.monitoringHandler(w, req)
495495

496-
assert.Equal(t, server.xdsClient.WorkloadController.GetMonitoringTrigger(), false)
496+
assert.Equal(t, false, server.xdsClient.WorkloadController.GetMonitoringTrigger())
497497

498498
url = fmt.Sprintf("%s?enable=%s", patternAccesslog, "true")
499499
req = httptest.NewRequest(http.MethodPost, url, nil)
500500
w = httptest.NewRecorder()
501501
server.accesslogHandler(w, req)
502502

503-
assert.Equal(t, server.xdsClient.WorkloadController.GetAccesslogTrigger(), false)
503+
assert.Equal(t, false, server.xdsClient.WorkloadController.GetAccesslogTrigger())
504504

505505
url = fmt.Sprintf("%s?enable=%s", patternWorkloadMetrics, "true")
506506
req = httptest.NewRequest(http.MethodPost, url, nil)
507507
w = httptest.NewRecorder()
508508
server.workloadMetricHandler(w, req)
509509

510-
assert.Equal(t, server.xdsClient.WorkloadController.GetWorklaodMetricTrigger(), false)
510+
assert.Equal(t, false, server.xdsClient.WorkloadController.GetWorklaodMetricTrigger())
511511

512512
url = fmt.Sprintf("%s?enable=%s", patternConnectionMetrics, "true")
513513
req = httptest.NewRequest(http.MethodPost, url, nil)
514514
w = httptest.NewRecorder()
515515
server.connectionMetricHandler(w, req)
516516

517-
assert.Equal(t, server.xdsClient.WorkloadController.GetConnectionMetricTrigger(), false)
517+
assert.Equal(t, false, server.xdsClient.WorkloadController.GetConnectionMetricTrigger())
518518
})
519519
}
520520

@@ -544,8 +544,8 @@ func TestServerMonitoringHandler(t *testing.T) {
544544
w := httptest.NewRecorder()
545545
server.monitoringHandler(w, req)
546546

547-
assert.Equal(t, server.xdsClient.WorkloadController.GetMonitoringTrigger(), true)
548-
assert.Equal(t, server.xdsClient.WorkloadController.GetAccesslogTrigger(), true)
547+
assert.Equal(t, true, server.xdsClient.WorkloadController.GetMonitoringTrigger())
548+
assert.Equal(t, true, server.xdsClient.WorkloadController.GetAccesslogTrigger())
549549
enableMonitoring := l.GetEnableMonitoring()
550550
assert.Equal(t, constants.ENABLED, enableMonitoring)
551551
})

0 commit comments

Comments
 (0)