refactor: rebase

Signed-off-by: 1998-felix <felix.gateru@gmail.com>

pkg/sdk/go/channels_test.go

@@ -220,23 +220,17 @@ func TestCreateChannel(t *testing.T) {
 		},
 	}
 	for _, tc := range cases {
-		authCall := auth.On("Identify", mock.Anything, &magistrala.IdentityReq{Token: tc.token}).Return(&magistrala.IdentityRes{Id: validID, DomainId: testsutil.GenerateUUID(t)}, nil)
-		authCall1 := auth.On("AddPolicies", mock.Anything, mock.Anything).Return(&magistrala.AddPoliciesRes{Added: true}, nil)
-		authCall2 := auth.On("Authorize", mock.Anything, mock.Anything).Return(&magistrala.AuthorizeRes{Authorized: true}, nil)
-		authCall3 := auth.On("DeletePolicies", mock.Anything, mock.Anything).Return(&magistrala.DeletePoliciesRes{Deleted: false}, nil)
-		repoCall := grepo.On("Save", mock.Anything, mock.Anything).Return(convertChannel(sdk.Channel{}), tc.err)
-		rChannel, err := mgsdk.CreateChannel(tc.channel, validToken)
-		assert.Equal(t, tc.err, err, fmt.Sprintf("%s: unexpected error %s", tc.desc, err))
-		if err == nil {
-			assert.NotEmpty(t, rChannel, fmt.Sprintf("%s: expected not nil on client ID", tc.desc))
-			ok := repoCall.Parent.AssertCalled(t, "Save", mock.Anything, mock.Anything)
-			assert.True(t, ok, fmt.Sprintf("Save was not called on %s", tc.desc))
-		}
-		authCall.Unset()
-		authCall1.Unset()
-		authCall2.Unset()
-		authCall3.Unset()
-		repoCall.Unset()
+		t.Run(tc.desc, func(t *testing.T) {
+			svcCall := gsvc.On("CreateGroup", mock.Anything, tc.token, channelKind, tc.createGroupReq).Return(tc.svcRes, tc.svcErr)
+			resp, err := mgsdk.CreateChannel(tc.channelReq, validToken)
+			assert.Equal(t, tc.err, err)
+			assert.Equal(t, tc.response, resp)
+			if tc.err == nil {
+				ok := svcCall.Parent.AssertCalled(t, "CreateGroup", mock.Anything, tc.token, channelKind, tc.createGroupReq)
+				assert.True(t, ok)
+			}
+			svcCall.Unset()
+		})
 	}
 }
 
@@ -807,6 +801,7 @@ func TestUpdateChannel(t *testing.T) {
 			desc:  "update channel that can't be marshalled",
 			token: validToken,
 			channelReq: sdk.Channel{
+				ID:   channel.ID,
 				Name: "test",
 				Metadata: map[string]interface{}{
 					"test": make(chan int),