Commit b55b9413 authored by Fotis Soldatos's avatar Fotis Soldatos
Browse files

Merge branch 'create-context-subscriber-test-suite' into 'develop' 

test(automation): add contextSubscriberTest

See merge request teraflow-h2020/controller!107
parents bd5a6d66 08afff09

src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java

+19 −18
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ public class AutomationGatewayImpl implements AutomationGateway { 
        return Uni.createFrom().item(() -> Automation.DeviceDeletionResult.newBuilder().build());

    }



    // TODO When `DeviceRoleState` domain object will be created, move this method to Serializer class and create related tests

    // TODO When `DeviceRoleState` domain object will be created, move this method to Serializer class

    // and create related tests

    private Automation.DeviceRoleState transformToDeviceRoleState(Device device, String devRoleId) {



        final var deviceRoleId = new DeviceRoleId(devRoleId, device.getDeviceId());

src/automation/src/main/java/eu/teraflow/automation/context/ContextGatewayImpl.java

+15 −17
Original line number Diff line number Diff line
@@ -19,18 +19,16 @@ package eu.teraflow.automation.context; 
import context.ContextOuterClass;

import context.MutinyContextServiceGrpc.MutinyContextServiceStub;

import eu.teraflow.automation.Serializer;

import eu.teraflow.automation.device.model.*;

import eu.teraflow.automation.device.model.Device;

import eu.teraflow.automation.device.model.DeviceEvent;

import io.quarkus.grpc.GrpcClient;

import io.smallrye.mutiny.Multi;

import io.smallrye.mutiny.Uni;

import javax.enterprise.context.ApplicationScoped;

import javax.inject.Inject;

import org.jboss.logging.Logger;



@ApplicationScoped

public class ContextGatewayImpl implements ContextGateway {

    private static final Logger LOGGER = Logger.getLogger(ContextGatewayImpl.class);



    @GrpcClient("context")

    MutinyContextServiceStub streamingDelegateContext;

src/automation/src/main/java/eu/teraflow/automation/device/DeviceGatewayImpl.java

+14 −17
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package eu.teraflow.automation.device;



import context.ContextOuterClass;

import device.DeviceService;

import eu.teraflow.automation.Serializer;

import eu.teraflow.automation.device.model.Device;
@@ -25,11 +24,9 @@ import io.quarkus.grpc.GrpcClient; 
import io.smallrye.mutiny.Uni;

import javax.enterprise.context.ApplicationScoped;

import javax.inject.Inject;

import org.jboss.logging.Logger;



@ApplicationScoped

public class DeviceGatewayImpl implements DeviceGateway {

    private static final Logger LOGGER = Logger.getLogger(DeviceGatewayImpl.class);



    @GrpcClient("device")

    DeviceService deviceDelegate;

src/automation/src/test/java/eu/teraflow/automation/AutomationFunctionalServiceTest.java

+21 −20
Original line number Diff line number Diff line
@@ -22,8 +22,11 @@ import automation.Automation; 
import context.ContextOuterClass;

import eu.teraflow.automation.context.ContextGateway;

import eu.teraflow.automation.device.DeviceGateway;

import eu.teraflow.automation.device.model.*;

import eu.teraflow.automation.device.model.ConfigActionEnum;

import eu.teraflow.automation.device.model.ConfigRule;

import eu.teraflow.automation.device.model.Device;

import eu.teraflow.automation.device.model.DeviceConfig;

import eu.teraflow.automation.device.model.DeviceOperationalStatus;

import io.quarkus.test.junit.QuarkusTest;

import io.quarkus.test.junit.mockito.InjectMock;

import io.smallrye.mutiny.Uni;
@@ -37,7 +40,7 @@ import org.junit.jupiter.api.Test; 
import org.mockito.Mockito;



@QuarkusTest

public class AutomationFunctionalServiceTest {

class AutomationFunctionalServiceTest {

    private static final Logger LOGGER = Logger.getLogger(AutomationFunctionalServiceTest.class);



    @Inject AutomationService automationService;
@@ -97,8 +100,7 @@ public class AutomationFunctionalServiceTest { 
                        deviceConfig -> {

                            LOGGER.infof("Received response %s", deviceConfig);



                            assertThat(deviceConfig.getDeviceOperationalStatus().toString())

                                    .isEqualTo(device.getDeviceOperationalStatus().toString());

                            assertThat(deviceConfig).hasToString(device.getDeviceOperationalStatus().toString());



                            assertThat(deviceConfig.getDeviceConfig().toString()).isNotNull();
@@ -163,8 +165,7 @@ public class AutomationFunctionalServiceTest { 
                        deviceConfig -> {

                            LOGGER.infof("Received response %s", deviceConfig);



                            assertThat(deviceConfig.getDeviceOperationalStatus().toString())

                                    .isEqualTo(device.getDeviceOperationalStatus().toString());

                            assertThat(deviceConfig).hasToString(device.getDeviceOperationalStatus().toString());



                            assertThat(deviceConfig.getDeviceConfig().toString()).isNotNull();

src/automation/src/test/java/eu/teraflow/automation/AutomationServiceTest.java

+20 −18
Original line number Diff line number Diff line
@@ -20,13 +20,15 @@ import static org.assertj.core.api.Assertions.assertThat; 


import automation.Automation;

import automation.AutomationService;

import context.ContextOuterClass;

import eu.teraflow.automation.model.DeviceRole;

import eu.teraflow.automation.model.DeviceRoleId;

import eu.teraflow.automation.context.ContextGateway;

import eu.teraflow.automation.device.DeviceGateway;

import eu.teraflow.automation.device.model.*;

import eu.teraflow.automation.device.model.ConfigActionEnum;

import eu.teraflow.automation.device.model.ConfigRule;

import eu.teraflow.automation.device.model.Device;

import eu.teraflow.automation.device.model.DeviceConfig;

import eu.teraflow.automation.device.model.DeviceOperationalStatus;

import eu.teraflow.automation.model.DeviceRole;

import eu.teraflow.automation.model.DeviceRoleId;

import eu.teraflow.automation.model.DeviceRoleType;

import io.quarkus.grpc.GrpcClient;

import io.quarkus.test.junit.QuarkusTest;