test: fix CreateAndDeleteResource for DiscoveryResourceBatchObservable device

Author: jkralik

grpc-gateway/service/createAndDeleteResource_test.go

@@ -207,7 +207,22 @@ func deleteSwitchResourceExpectedEvents(t *testing.T, deviceID, subID, correlati
 	}
 }
 
-func validateEvents(t *testing.T, subClient pb.GrpcGateway_SubscribeToEventsClient, expectedEvents map[string]*pb.Event, failOnUnexpectedEvent bool) {
+func batchDeleteSwitchChangedResourceExpected(t *testing.T, deviceID, subID, correlationID, switchID string) map[string]*pb.Event {
+
+	changed := &pb.Event{
+		SubscriptionId: subID,
+		CorrelationId:  correlationID,
+		Type: &pb.Event_ResourceChanged{
+			ResourceChanged: pbTest.MakeResourceChanged(t, deviceID, test.TestResourceSwitchesInstanceHref(switchID), "", map[interface{}]interface{}{}),
+		},
+	}
+
+	return map[string]*pb.Event{
+		pbTest.GetEventID(changed): changed,
+	}
+}
+
+func validateEvents(t *testing.T, subClient pb.GrpcGateway_SubscribeToEventsClient, expectedEvents map[string]*pb.Event) {
 	for {
 		ev, err := subClient.Recv()
 		if kitNetGrpc.IsContextDeadlineExceeded(err) {
@@ -218,10 +233,6 @@ func validateEvents(t *testing.T, subClient pb.GrpcGateway_SubscribeToEventsClie
 		eventID := pbTest.GetEventID(ev)
 		expected, ok := expectedEvents[eventID]
 		if !ok {
-			if !failOnUnexpectedEvent {
-				t.Logf("unexpected event received: %+v", ev)
-				continue
-			}
 			require.Failf(t, "unexpected event", "invalid event: %+v", ev)
 		}
 		pbTest.CmpEvent(t, expected, ev, "")
@@ -258,13 +269,20 @@ func TestCreateAndDeleteResource(t *testing.T) {
 	subClient, subID := subscribeToAllEvents(t, ctx, c, correlationID)
 	const switchID = "1"
 
+	isDiscoveryResourceBatchObservable := test.IsDiscoveryResourceBatchObservable(ctx, t, deviceID)
+
 	for i := 0; i < 5; i++ {
 		fmt.Printf("iteration %v\n", i)
 		createSwitchResource(t, ctx, c, deviceID, switchID)
 		expectedCreateEvents := createSwitchResourceExpectedEvents(t, deviceID, subID, correlationID, switchID)
-		validateEvents(t, subClient, expectedCreateEvents, true)
+		validateEvents(t, subClient, expectedCreateEvents)
 		deleteSwitchResource(t, ctx, c, deviceID, switchID)
 		expectedDeleteEvents := deleteSwitchResourceExpectedEvents(t, deviceID, subID, correlationID, switchID)
-		validateEvents(t, subClient, expectedDeleteEvents, false)
+		validateEvents(t, subClient, expectedDeleteEvents)
+
+		if isDiscoveryResourceBatchObservable {
+			expectedEvents := batchDeleteSwitchChangedResourceExpected(t, deviceID, subID, correlationID, switchID)
+			validateEvents(t, subClient, expectedEvents)
+		}
 	}
 }

test/test.go

@@ -484,6 +484,29 @@ func FindDeviceByName(ctx context.Context, name string) (deviceID string, _ erro
 	return id, nil
 }
 
+func IsDiscoveryResourceBatchObservable(ctx context.Context, t *testing.T, deviceID string) bool {
+	devClient, err := NewSDKClient()
+	require.NoError(t, err)
+	defer func() {
+		_ = devClient.Close(ctx)
+	}()
+
+	device, links, err := devClient.GetRefDevice(ctx, deviceID)
+	require.NoError(t, err)
+	err = device.Release(ctx)
+	require.NoError(t, err)
+	links = links.GetResourceLinks(resources.ResourceType)
+	if len(links) == 0 {
+		return false
+	}
+	for _, iface := range links[0].Interfaces {
+		if iface == interfaces.OC_IF_B && links[0].Policy.BitMask.Has(schema.Observable) {
+			return true
+		}
+	}
+	return false
+}
+
 func CheckResource(ctx context.Context, t *testing.T, deviceID, href, resourceType string, checkFn func(schema.ResourceLink) bool) bool {
 	devClient, err := NewSDKClient()
 	require.NoError(t, err)