@@ -3,15 +3,14 @@ package cluster
33import (
44 "context"
55 "errors"
6- "reflect"
7- "runtime/debug"
86 "testing"
97
108 hubv1alpha1 "github.com/kubeslice/apis/pkg/controller/v1alpha1"
119 "github.com/kubeslice/kubeslice-monitoring/pkg/metrics"
1210 kubeslicev1beta1 "github.com/kubeslice/worker-operator/api/v1beta1"
1311 utilmock "github.com/kubeslice/worker-operator/pkg/mocks"
1412 "github.com/prometheus/client_golang/prometheus"
13+ "github.com/stretchr/testify/assert"
1514 "github.com/stretchr/testify/mock"
1615 batchv1 "k8s.io/api/batch/v1"
1716 corev1 "k8s.io/api/core/v1"
@@ -87,9 +86,7 @@ func TestGetOperatorClusterRole(t *testing.T) {
8786 mock .IsType (& rbacv1.ClusterRole {}),
8887 ).Return (nil )
8988 _ , err := reconciler .getOperatorClusterRole (ctx )
90- if expected .err != err {
91- t .Error ("Expected error:" , expected .err , " but got " , err )
92- }
89+ assert .ErrorIs (t , expected .err , err )
9390}
9491
9592func TestCreateDeregisterJobPositiveScenarios (t * testing.T ) {
@@ -194,9 +191,7 @@ func TestCreateDeregisterJobPositiveScenarios(t *testing.T) {
194191 mock .IsType ([]k8sclient.CreateOption (nil )),
195192 ).Return (nil )
196193 err := reconciler .createDeregisterJob (ctx , testClusterObj )
197- if expected .err != err {
198- t .Error ("Expected error:" , expected .err , " but got " , err )
199- }
194+ assert .ErrorIs (t , expected .err , err )
200195}
201196
202197func TestReconcilerFailToUpdateClusterRegistrationStatus (t * testing.T ) {
@@ -237,9 +232,7 @@ func TestReconcilerFailToUpdateClusterRegistrationStatus(t *testing.T) {
237232 ).Return (errors .New ("error updating status of deregistration on the controller" ))
238233
239234 err := reconciler .createDeregisterJob (ctx , testClusterObj )
240- if expected .errMsg != err .Error () {
241- t .Error ("Expected error:" , expected .errMsg , " but got " , err )
242- }
235+ assert .Equal (t , expected .errMsg , err .Error ())
243236}
244237
245238func TestReconcilerFailToCreateServiceAccount (t * testing.T ) {
@@ -295,9 +288,7 @@ func TestReconcilerFailToCreateServiceAccount(t *testing.T) {
295288 ).Return (errors .New ("unable to create service account" ))
296289
297290 err := reconciler .createDeregisterJob (ctx , testClusterObj )
298- if expected .errMsg != err .Error () {
299- t .Error ("Expected error:" , expected .errMsg , " but got " , err )
300- }
291+ assert .Equal (t , expected .errMsg , err .Error ())
301292}
302293
303294func TestReconcilerFailToFetchOperatorClusterRole (t * testing.T ) {
@@ -363,9 +354,7 @@ func TestReconcilerFailToFetchOperatorClusterRole(t *testing.T) {
363354 ).Return (errors .New ("unable to fetch operator clusterrole" ))
364355
365356 err := reconciler .createDeregisterJob (ctx , testClusterObj )
366- if expected .errMsg != err .Error () {
367- t .Error ("Expected error:" , expected .errMsg , " but got " , err )
368- }
357+ assert .Equal (t , expected .errMsg , err .Error ())
369358}
370359
371360func TestReconcilerFailToCreateClusterRole (t * testing.T ) {
@@ -441,9 +430,7 @@ func TestReconcilerFailToCreateClusterRole(t *testing.T) {
441430 ).Return (errors .New ("unable to create cluster role" ))
442431
443432 err := reconciler .createDeregisterJob (ctx , testClusterObj )
444- if expected .errMsg != err .Error () {
445- t .Error ("Expected error:" , expected .errMsg , " but got " , err )
446- }
433+ assert .Equal (t , expected .errMsg , err .Error ())
447434}
448435
449436func TestReconcilerFailToCreateClusterRoleBinding (t * testing.T ) {
@@ -524,9 +511,7 @@ func TestReconcilerFailToCreateClusterRoleBinding(t *testing.T) {
524511 ).Return (errors .New ("unable to create cluster rolebinding" ))
525512
526513 err := reconciler .createDeregisterJob (ctx , testClusterObj )
527- if expected .errMsg != err .Error () {
528- t .Error ("Expected error:" , expected .errMsg , " but got " , err )
529- }
514+ assert .Equal (t , expected .errMsg , err .Error ())
530515}
531516
532517func TestReconcilerFailToCreateConfigmap (t * testing.T ) {
@@ -621,9 +606,7 @@ func TestReconcilerFailToCreateConfigmap(t *testing.T) {
621606 mock .IsType ([]k8sclient.CreateOption (nil )),
622607 ).Return (errors .New ("Unable to create configmap" ))
623608 err := reconciler .createDeregisterJob (ctx , testClusterObj )
624- if expected .errMsg != err .Error () {
625- t .Error ("Expected error:" , expected .errMsg , " but got " , err )
626- }
609+ assert .Equal (t , expected .errMsg , err .Error ())
627610}
628611
629612func TestReconcilerFailToDeleteJob (t * testing.T ) {
@@ -729,9 +712,7 @@ func TestReconcilerFailToDeleteJob(t *testing.T) {
729712 ).Return (errors .New ("Unable to delete deregister job" ))
730713
731714 err := reconciler .createDeregisterJob (ctx , testClusterObj )
732- if expected .errMsg != err .Error () {
733- t .Error ("Expected error:" , expected .errMsg , " but got " , err )
734- }
715+ assert .Equal (t , expected .errMsg , err .Error ())
735716}
736717
737718func TestReconcilerFailToCreateDeregisterJob (t * testing.T ) {
@@ -842,64 +823,42 @@ func TestReconcilerFailToCreateDeregisterJob(t *testing.T) {
842823 ).Return (errors .New ("Unable to create deregister job" ))
843824
844825 err := reconciler .createDeregisterJob (ctx , testClusterObj )
845- if expected .errMsg != err .Error () {
846- t .Error ("Expected error:" , expected .errMsg , " but got " , err )
847- }
826+ assert .Equal (t , expected .errMsg , err .Error ())
848827}
849828
850829func TestGetConfigmapScriptData (t * testing.T ) {
851830 data , err := getCleanupScript ()
852- AssertNoError (t , err )
853- if len (data ) == 0 {
854- t .Fatalf ("unable to get configmap data" )
855- }
831+ assert .NoError (t , err )
832+ assert .NotZero (t , len (data ), "unable to get configmap data" )
856833}
857834
858835func TestConstructJobForClusterDeregister (t * testing.T ) {
859836 job := constructJobForClusterDeregister ()
860- AssertEqual (t , job .Name , deregisterJobName )
861- AssertEqual (t , job .Namespace , ControlPlaneNamespace )
837+ assert . Equal (t , job .Name , deregisterJobName )
838+ assert . Equal (t , job .Namespace , ControlPlaneNamespace )
862839}
863840
864841func TestConstructServiceAccount (t * testing.T ) {
865842 sa := constructServiceAccount ()
866- AssertEqual (t , sa .Name , serviceAccountName )
867- AssertEqual (t , sa .Namespace , ControlPlaneNamespace )
843+ assert . Equal (t , sa .Name , serviceAccountName )
844+ assert . Equal (t , sa .Namespace , ControlPlaneNamespace )
868845}
869846
870847func TestConstructClusterRole (t * testing.T ) {
871848 cr := constructClusterRole (testOperatorClusterRole , "random-uid" )
872- isEqual := reflect .DeepEqual (cr .Rules , testOperatorClusterRole .Rules )
873- if ! isEqual {
874- t .Fatalf ("got invalid data in clusterrole Rules: got -- %q want -- %q" , & cr .Rules [0 ], & testOperatorClusterRole .Rules [0 ])
875- }
849+ assert .Equal (t , cr .Rules , testOperatorClusterRole .Rules )
876850}
877851
878852func TestConstructClusterRoleBinding (t * testing.T ) {
879853 crb := constructClusterRoleBinding ("random-uid" )
880- AssertEqual (t , crb .Name , clusterRoleBindingName )
881- AssertEqual (t , crb .RoleRef , testClusterRoleRef )
882- AssertEqual (t , len ( crb .Subjects ) , 1 )
883- AssertEqual (t , crb .Subjects [0 ], testClusterRoleBindingSubject [0 ])
854+ assert . Equal (t , crb .Name , clusterRoleBindingName )
855+ assert . Equal (t , crb .RoleRef , testClusterRoleRef )
856+ assert . Len (t , crb .Subjects , 1 )
857+ assert . Equal (t , crb .Subjects [0 ], testClusterRoleBindingSubject [0 ])
884858}
885859
886860func TestConstructConfigMap (t * testing.T ) {
887861 data := "this is the data."
888862 cm := constructConfigMap (data )
889- AssertEqual (t , cm .Data ["kubeslice-cleanup.sh" ], data )
890- }
891-
892- func AssertEqual (t * testing.T , actual interface {}, expected interface {}) {
893- t .Helper ()
894- if actual != expected {
895- t .Log ("expected --" , expected , "actual --" , actual )
896- t .Fail ()
897- }
898- }
899-
900- func AssertNoError (t * testing.T , err error ) {
901- t .Helper ()
902- if err != nil {
903- t .Errorf ("Expected No Error but got %s, Stack:\n %s" , err , string (debug .Stack ()))
904- }
863+ assert .Equal (t , cm .Data ["kubeslice-cleanup.sh" ], data )
905864}
0 commit comments