Skip to content

Commit

Permalink
Almost finished tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@salvatore-coppola
salvatore-coppola committed Nov 10, 2023
1 parent 0c80fdc commit 47c1393
Show file tree
Hide file tree
Showing 6 changed files with 172 additions and 879 deletions.
140 changes: 89 additions & 51 deletions ...clipse/kura/internal/rest/cloudconnection/provider/test/CloudConnectionEndpointsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,24 @@

import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
import java.util.Scanner;
import java.util.concurrent.TimeUnit;

import org.eclipse.kura.KuraException;
import org.eclipse.kura.cloudconnection.CloudConnectionConstants;
import org.eclipse.kura.cloudconnection.factory.CloudConnectionFactory;
import org.eclipse.kura.configuration.ConfigurationService;
import org.eclipse.kura.core.testutil.requesthandler.AbstractRequestHandlerTest;
import org.eclipse.kura.core.testutil.requesthandler.MqttTransport;
import org.eclipse.kura.core.testutil.requesthandler.RestTransport;
import org.eclipse.kura.core.testutil.requesthandler.Transport;
import org.eclipse.kura.core.testutil.requesthandler.Transport.MethodSpec;
import org.eclipse.kura.core.testutil.service.ServiceUtil;
import org.eclipse.kura.internal.rest.cloudconnection.provider.dto.FactoryPidAndCloudServicePid;
import org.eclipse.kura.internal.rest.cloudconnection.provider.dto.PidAndFactoryPidAndCloudConnectionPid;
import org.eclipse.kura.internal.rest.cloudconnection.provider.dto.CloudConnectionFactoryPidAndCloudEndpointPid;
import org.eclipse.kura.internal.rest.cloudconnection.provider.dto.PidAndFactoryPidAndCloudEndpointPid;
import org.eclipse.kura.rest.configuration.api.PidAndFactoryPid;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -52,19 +56,20 @@ public class CloudConnectionEndpointsTest extends AbstractRequestHandlerTest {
private static final String REST_APP_ID = "cloudconnection/v1";

private static CloudConnectionFactory cloudConnectionFactory;
private static ConfigurationService configurationService;

private Gson gson = new Gson();

private FactoryPidAndCloudServicePid factoryPidAndCloudServicePid;
private CloudConnectionFactoryPidAndCloudEndpointPid cloudConnectionFactoryPidAndCloudEndpointPid;
private PidAndFactoryPidAndCloudEndpointPid pidAndFactoryPidAndCloudEndpointPid;
private PidAndFactoryPid pidAndFactoryPid;

private PidAndFactoryPidAndCloudConnectionPid pidAndFactoryPidAndCloudConnectionPid;

private static final String EXPECTED_GET_CLOUD_ENTRIES_RESPONSE = new Scanner(
CloudConnectionEndpointsTest.class.getResourceAsStream("/getCloudEntriesResponse.json"), "UTF-8")
private static final String EXPECTED_GET_CLOUD_COMPONENT_INSTANCES_RESPONSE = new Scanner(
CloudConnectionEndpointsTest.class.getResourceAsStream("/getCloudComponentInstancesResponse.json"), "UTF-8")
.useDelimiter("\\A").next().replace(" ", "");

private static final String EXPECTED_GET_STACK_CONFIGURATIONS_RESPONSE = new Scanner(
CloudConnectionEndpointsTest.class.getResourceAsStream("/getStackConfigurationsResponse.json"), "UTF-8")
private static final String EXPECTED_GET_STACK_COMPONENT_PIDS_RESPONSE = new Scanner(
CloudConnectionEndpointsTest.class.getResourceAsStream("/getStackComponentPidsResponse.json"), "UTF-8")
.useDelimiter("\\A").next().replace(" ", "");

private static final String EXPECTED_GET_CLOUD_COMPONENT_FACTORIES_RESPONSE = new Scanner(
Expand All @@ -84,6 +89,8 @@ public CloudConnectionEndpointsTest(Transport transport) {
@BeforeClass
public static void setup() {
try {
configurationService = ServiceUtil.trackService(ConfigurationService.class, Optional.empty()).get(30,
TimeUnit.SECONDS);
cloudConnectionFactory = ServiceUtil.trackService(CloudConnectionFactory.class, Optional.empty()).get(30,
TimeUnit.SECONDS);
cloudConnectionFactory.createConfiguration(CLOUD_ENDPOINT_INSTANCE_TEST);
Expand All @@ -93,108 +100,139 @@ public static void setup() {
}

@Test
public void shouldGetCloudEntries() {
public void shouldGetCloudComponentInstances() {

whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_GET), "/cloudEntries",
gson.toJson(this.factoryPidAndCloudServicePid));
whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_GET), "/instances");

thenRequestSucceeds();
thenResponseBodyEqualsJson(EXPECTED_GET_CLOUD_ENTRIES_RESPONSE);
thenResponseBodyEqualsJson(EXPECTED_GET_CLOUD_COMPONENT_INSTANCES_RESPONSE);
}

@Test
public void shouldGetStackConfigurations() {
givenFactoryPidAndCloudServicePid("org.eclipse.kura.cloud.CloudService",
public void shouldGetStackComponentPids() {
givenCloudConnectionFactoryPidAndCloudEndpointPid("org.eclipse.kura.cloud.CloudService",
"org.eclipse.kura.cloud.CloudService-test");

whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_GET), "/stackConfigurations",
gson.toJson(this.factoryPidAndCloudServicePid));
whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_POST), "/cloudEndpoint/stackComponentPids",
gson.toJson(this.cloudConnectionFactoryPidAndCloudEndpointPid));

thenRequestSucceeds();
thenResponseBodyEqualsJson(EXPECTED_GET_STACK_CONFIGURATIONS_RESPONSE);
thenResponseBodyEqualsJson(EXPECTED_GET_STACK_COMPONENT_PIDS_RESPONSE);
}

@Test
public void shouldCreateCloudService() {
givenFactoryPidAndCloudServicePid("org.eclipse.kura.cloud.CloudService",
"org.eclipse.kura.cloud.CloudService-1");
public void shouldCreateCloudEndpoint() {
givenCloudConnectionFactoryPidAndCloudEndpointPid("org.eclipse.kura.cloud.CloudService",
"org.eclipse.kura.cloud.CloudService-createTest");

whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_POST), "/cloudService",
gson.toJson(this.factoryPidAndCloudServicePid));
whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_POST), "/cloudEndpoint",
gson.toJson(this.cloudConnectionFactoryPidAndCloudEndpointPid));

thenRequestSucceeds();
thenResponseBodyIsEmpty();
}

@Test
public void shouldDeleteCloudService() {
givenExistingCloudService("org.eclipse.kura.cloud.CloudService-todelete");
public void shouldDeleteCloudEndpoint() {
givenExistingCloudEndpoint("org.eclipse.kura.cloud.CloudService-toDelete");
givenCloudConnectionFactoryPidAndCloudEndpointPid("org.eclipse.kura.cloud.CloudService",
"org.eclipse.kura.cloud.CloudService-createTest");

givenFactoryPidAndCloudServicePid("org.eclipse.kura.cloud.CloudService",
"org.eclipse.kura.cloud.CloudService-todelete");

whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_DELETE), "/cloudService",
gson.toJson(this.factoryPidAndCloudServicePid));
whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_DELETE, MQTT_METHOD_SPEC_DEL), "/cloudEndpoint",
gson.toJson(this.cloudConnectionFactoryPidAndCloudEndpointPid));

thenRequestSucceeds();
thenResponseBodyIsEmpty();
}

@Test
public void shouldGetCloudComponentFactories() {
whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_GET), "/cloudComponentFactories");

whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_GET), "/factories");

thenRequestSucceeds();
thenResponseBodyEqualsJson(EXPECTED_GET_CLOUD_COMPONENT_FACTORIES_RESPONSE);
}

@Test
public void shouldCreatePublisherInstance() {
givenPidAndFactoryPidAndCloudConnectionPid( //
"testPub", //
"org.eclipse.kura.cloud.publisher.CloudPublisher", //
givenPidAndFactoryPidAndCloudEndpointPid("test-pub", "org.eclipse.kura.cloud.publisher.CloudPublisher",
"org.eclipse.kura.cloud.CloudService-test");

whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_POST), "/pubInstance");
whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_POST), "/pubSub",
gson.toJson(this.pidAndFactoryPidAndCloudEndpointPid));

thenRequestSucceeds();
thenResponseBodyIsEmpty();
}

@Test
public void shouldCreateSubscriberInstance() {
givenPidAndFactoryPidAndCloudConnectionPid( //
"testSub", //
"org.eclipse.kura.cloud.publisher.CloudSubscriber", //
givenPidAndFactoryPidAndCloudEndpointPid("test-sub", "org.eclipse.kura.cloud.subscriber.CloudSubscriber",
"org.eclipse.kura.cloud.CloudService-test");

whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_POST), "/pubInstance");
whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_POST), "/pubSub",
gson.toJson(this.pidAndFactoryPidAndCloudEndpointPid));

thenRequestSucceeds();
thenResponseBodyIsEmpty();
}

@Test
public void shouldDeletePubSubInstance() {
public void shouldDeletePublisherInstance() {
givenPubSubInstance("pub-to-delete", "org.eclipse.kura.cloud.publisher.CloudPublisher",
"org.eclipse.kura.cloud.CloudService-test");
givenPid("pub-to-delete");
whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_DELETE), "/pubSub", gson.toJson(this.pidAndFactoryPid));

thenRequestSucceeds();
}

@Test
public void shouldDeleteSubscriberInstance() {
givenPubSubInstance("sub-to-delete", "org.eclipse.kura.cloud.subscriber.CloudSubscriber",
"org.eclipse.kura.cloud.CloudService-test");
givenPid("sub-to-delete");

whenRequestIsPerformed(new MethodSpec(METHOD_SPEC_DELETE), "/pubSub", gson.toJson(this.pidAndFactoryPid));

thenRequestSucceeds();
}

private void givenPidAndFactoryPidAndCloudConnectionPid(String pid, String factoryPid, String cloudConnectionPid) {
this.pidAndFactoryPidAndCloudConnectionPid = new PidAndFactoryPidAndCloudConnectionPid(pid, factoryPid,
cloudConnectionPid);
private void givenCloudConnectionFactoryPidAndCloudEndpointPid(String cloudConnectionFactoryPid,
String cloudEndpointPid) {
this.cloudConnectionFactoryPidAndCloudEndpointPid = new CloudConnectionFactoryPidAndCloudEndpointPid(
cloudConnectionFactoryPid, cloudEndpointPid);
}

private void givenExistingCloudService(String cloudServicePid) {
private void givenPidAndFactoryPidAndCloudEndpointPid(String pid, String factoryPid, String cloudEndpointPid) {
this.pidAndFactoryPidAndCloudEndpointPid = new PidAndFactoryPidAndCloudEndpointPid(pid, factoryPid,
cloudEndpointPid);
}

private void givenPidAndFactoryPid(String pid, String factoryPid) {
this.pidAndFactoryPid = new PidAndFactoryPid(pid, factoryPid);
}

private void givenPid(String pid) {
this.pidAndFactoryPid = new PidAndFactoryPid(pid);
}

private void givenExistingCloudEndpoint(String cloudEndpointPid) {
try {
cloudConnectionFactory.createConfiguration(cloudServicePid);
cloudConnectionFactory.createConfiguration(cloudEndpointPid);

} catch (KuraException e) {
e.printStackTrace();
fail("Unable to create the test CloudService");
}
}

private void givenFactoryPidAndCloudServicePid(String factoryPid, String cloudServicePid) {
this.factoryPidAndCloudServicePid = new FactoryPidAndCloudServicePid(factoryPid, cloudServicePid);
private void givenPubSubInstance(String pid, String factoryPid, String cloudEndpointPid) {
try {
configurationService.createFactoryConfiguration(factoryPid, pid, Collections.singletonMap(
CloudConnectionConstants.CLOUD_ENDPOINT_SERVICE_PID_PROP_NAME.value(), cloudEndpointPid), true);
} catch (KuraException e) {
e.printStackTrace();
fail("Unable to create pubSub instance");
}

}

}
52 changes: 52 additions & 0 deletions ....cloudconnection.provider.test/src/main/resources/getCloudComponentFactoriesResponse.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"cloudConnectionFactories": [
{
"cloudConnectionFactoryPid": "org.eclipse.kura.cloud.CloudService",
"defaultCloudEndpointPid": "org.eclipse.kura.cloud.CloudService-2",
"cloudEndpointPidRegex": "^org.eclipse.kura.cloud.CloudService\\-[a-zA-Z0-9]+$"
},
{
"cloudConnectionFactoryPid": "org.eclipse.kura.cloudconnection.eclipseiot.mqtt.ConnectionManager",
"defaultCloudEndpointPid": "org.eclipse.kura.cloudconnection.eclipseiot.mqtt.ConnectionManager",
"cloudEndpointPidRegex": "^org.eclipse.kura.cloudconnection.eclipseiot.mqtt.ConnectionManager(\\-[a-zA-Z0-9]+)?$"
},
{
"cloudConnectionFactoryPid": "org.eclipse.kura.cloudconnection.raw.mqtt.cloud.RawMqttCloudEndpoint",
"defaultCloudEndpointPid": "org.eclipse.kura.cloudconnection.raw.mqtt.CloudEndpoint",
"cloudEndpointPidRegex": "^org.eclipse.kura.cloudconnection.raw.mqtt.CloudEndpoint(\\-[a-zA-Z0-9]+)?$"
},
{
"cloudConnectionFactoryPid": "org.eclipse.kura.camel.cloud.factory.CamelFactory",
"defaultCloudEndpointPid": "org.eclipse.kura.camel.cloud.factory.CamelFactory",
"cloudEndpointPidRegex": "^org.eclipse.kura.camel.cloud.factory.CamelFactory(\\-[a-zA-Z0-9]+)?$"
}
],
"pubSubFactories": [
{
"factoryPid": "org.eclipse.kura.cloudconnection.raw.mqtt.subscriber.RawMqttSubscriber",
"cloudConnectionFactoryPid": "org.eclipse.kura.cloudconnection.raw.mqtt.cloud.RawMqttCloudEndpoint"
},
{
"factoryPid": "org.eclipse.kura.cloudconnection.eclipseiot.mqtt.CloudPublisher",
"cloudConnectionFactoryPid": "org.eclipse.kura.cloudconnection.eclipseiot.mqtt.ConnectionManager",
"defaultPid": "org.eclipse.kura.cloudconnection.eclipseiot.mqtt.CloudPublisher",
"defaultPidRegex": "^org.eclipse.kura.cloudconnection.eclipseiot.mqtt.CloudPublisher(\\-[a-zA-Z0-9]+)?$"
},
{
"factoryPid": "org.eclipse.kura.cloud.subscriber.CloudSubscriber",
"cloudConnectionFactoryPid": "org.eclipse.kura.cloud.CloudService"
},
{
"factoryPid": "org.eclipse.kura.cloud.publisher.CloudPublisher",
"cloudConnectionFactoryPid": "org.eclipse.kura.cloud.CloudService"
},
{
"factoryPid": "org.eclipse.kura.cloudconnection.raw.mqtt.publisher.RawMqttPublisher",
"cloudConnectionFactoryPid": "org.eclipse.kura.cloudconnection.raw.mqtt.cloud.RawMqttCloudEndpoint"
},
{
"factoryPid": "org.eclipse.kura.event.publisher.EventPublisher",
"cloudConnectionFactoryPid": "org.eclipse.kura.cloud.CloudService"
}
]
}
24 changes: 24 additions & 0 deletions ....cloudconnection.provider.test/src/main/resources/getCloudComponentInstancesResponse.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"cloudEndpointInstances": [
{
"cloudConnectionFactoryPid": "org.eclipse.kura.cloud.CloudService",
"cloudEndpointPid": "org.eclipse.kura.cloud.CloudService",
"state": "DISCONNECTED",
"cloudEndpointType": "CLOUD_CONNECTION_MANAGER"
},
{
"cloudConnectionFactoryPid": "org.eclipse.kura.cloud.CloudService-test",
"cloudEndpointPid": "org.eclipse.kura.cloud.CloudService",
"state": "DISCONNECTED",
"cloudEndpointType": "CLOUD_CONNECTION_MANAGER"
}
],
"pubsubInstances": [
{
"cloudEndpointPid": "org.eclipse.kura.cloud.CloudService",
"pid": "heaterPublisher",
"factoryPid": "org.eclipse.kura.cloud.publisher.CloudPublisher",
"type": "PUBLISHER"
}
]
}
22 changes: 0 additions & 22 deletions ...e.kura.rest.cloudconnection.provider.test/src/main/resources/getCloudEntriesResponse.json
View file

This file was deleted.

7 changes: 7 additions & 0 deletions ....rest.cloudconnection.provider.test/src/main/resources/getStackComponentPidsResponse.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"pids": [
"org.eclipse.kura.cloud.CloudService-test",
"org.eclipse.kura.core.data.transport.mqtt.MqttDataTransport-test",
"org.eclipse.kura.data.DataService-test"
]
}
Loading

0 comments on commit 47c1393

Please sign in to comment.