Merge pull request #96 from cloud-of-things/PBT-841-fix-integration-tests

PBT-841 fix integration tests

Author: Andyck

README.md

@@ -63,7 +63,9 @@ Short information about what has changed between releases.
 * EventApi provides the update of events as well now. ([Pull Request #95](https://github.com/cloud-of-things/cot-java-rest-sdk/pull/95))
 * Fixed cast in getSource() method of Alarm and Event
 * Added the getter as counterpart of set(Object) in ExtendedObject
-
+* Includes ([Pull Request #96](https://github.com/cloud-of-things/cot-java-rest-sdk/pull/96)):
+    - Fixed some unstable integration tests due to maybe changed behavior of the c8y API
+    - Provided more details from the c8y error message in CotSdkException
 
 ### Release 1.1.0
 

src/main/java/com/telekom/m2m/cot/restsdk/CloudOfThingsRestClient.java

@@ -632,7 +632,13 @@ private String getErrorMessage(final Response response) throws IOException {
             if (e instanceof JsonObject) {
                 JsonObject o = (JsonObject) e;
                 if (o.has("error")) {
-                    errorMessage += " Platform provided details: '" + o.get("error") + "'";
+                    errorMessage += " Platform provided details: " + o.get("error") + "; ";
+                }
+                if (o.has("message")) {
+                    errorMessage += "message: " + o.get("message") + "; ";
+                }
+                if (o.has("info")) {
+                    errorMessage += "info: " + o.get("info");
                 }
             } else if (e instanceof JsonPrimitive) {
                 JsonPrimitive p = (JsonPrimitive) e;

src/test/java/com/telekom/m2m/cot/restsdk/inventory/InventoryApiExtendedIT.java

@@ -23,7 +23,7 @@ public class InventoryApiExtendedIT {
     private static final String PARENT_MANAGED_OBJECT_NAME = "parentTestManagedObject";
     private static final String CHILD_MANAGED_OBJECT_NAME = "childTestManagedObject";
 
-    private final CloudOfThingsPlatform cloudOfThingsPlatform = new CloudOfThingsPlatform(TestHelper.TEST_HOST, TestHelper.TEST_USERNAME, TestHelper.TEST_PASSWORD);
+    private final CloudOfThingsPlatform cloudOfThingsPlatform = new CloudOfThingsPlatform(TestHelper.TEST_HOST, TestHelper.TEST_TENANT + "/" + TestHelper.TEST_USERNAME, TestHelper.TEST_PASSWORD);
     private final InventoryApi inventoryApi = cloudOfThingsPlatform.getInventoryApi();
     private final MeasurementApi measurementApi = cloudOfThingsPlatform.getMeasurementApi();
 
@@ -247,6 +247,8 @@ public void testManagedObjectNotifications() throws InterruptedException {
 
         List<String> notifications = inventoryApi.pullNotifications(managedObject.getId());
         assertNotNull(notifications);
+        // Actually we expecting exactly one notification at all but c8y is sometimes sending two identical notifications with different notification IDs at once.
+        // Therefore we are checking for more than 0 notification. At least there should be one.
         assertTrue(notifications.size() > 0);
 
         String lastNotification = notifications.get(notifications.size()-1);
@@ -257,6 +259,32 @@ public void testManagedObjectNotifications() throws InterruptedException {
         inventoryApi.unsubscribeFromManagedObjectNotifications(managedObject.getId());
     }
 
+    @Test
+    public void testDeleteManagedObjectNotifications() throws InterruptedException {
+        ManagedObject managedObject = createManagedObjectInCot(PARENT_MANAGED_OBJECT_NAME);
+        managedObjectsToDelete.add(managedObject);
+        inventoryApi.subscribeToManagedObjectNotifications(managedObject.getId());
+
+        Thread.sleep(1000);
+
+        ManagedObject retrievedMo = inventoryApi.get(managedObject.getId());
+        inventoryApi.delete(retrievedMo.getId());
+
+        Thread.sleep(1000);
+
+        List<String> notifications = inventoryApi.pullNotifications(managedObject.getId());
+        assertNotNull(notifications);
+        // Actually we expecting exactly 2 notifications at all but c8y is mostly sending two identical DELETE-notifications with different notification IDs at once.
+        // Therefore we are checking for more than 1 notification. At least there should be two.
+        assertTrue(notifications.size() > 0);
+
+        String lastNotification = notifications.get(notifications.size()-1);
+
+        assertTrue(lastNotification.contains("\"realtimeAction\": \"DELETE\""));
+
+        inventoryApi.unsubscribeFromManagedObjectNotifications(managedObject.getId());
+    }
+
     private ManagedObject createManagedObjectInCot(String name) {
         ManagedObject mo = new ManagedObject();
         mo.setName(name);

src/test/java/com/telekom/m2m/cot/restsdk/realtime/CepApiIT.java

@@ -580,7 +580,9 @@ public void onError(String channel, Throwable error) {
 
         Thread.sleep(DELAY_MILLIS);
 
-        assertEquals(notedInventoryObjects.size(), 2);
+        // Actually we expecting exactly 2 notifications at all but c8y is mostly sending two identical DELETE-notifications with different notification IDs at once.
+        // Therefore we are checking for more than 1 notification. At least there should be two.
+        assertTrue(notedInventoryObjects.size() > 1);
         assertTrue(notedInventoryObjects.get(1).contains("DELETE"));
 
     }
@@ -597,11 +599,11 @@ public void testConnectionAndDisconnection() throws InterruptedException {
        //we check that the connector is not connected before to start
         assertFalse(connector.isConnected(), "the cep connector should be disconnected before to start the test");
 
-//        connector.connect();
-//        assertTrue(connector.isConnected());
-//
-//        connector.disconnect();
-//        assertFalse(connector.isConnected());
+        connector.connect();
+        assertTrue(connector.isConnected());
+
+        connector.disconnect();
+        assertFalse(connector.isConnected());
 
         //till here, we already verified that in case of connection or disconnection the flag is properly set
 
@@ -611,10 +613,6 @@ public void testConnectionAndDisconnection() throws InterruptedException {
         connector.addListener(new SubscriptionListener() {
             @Override
             public void onNotification(String channel, Notification notification) {
-                System.out.println(channel + ": " + notification.toString());
-//                System.out.println(channel + ": " + notification.getPayload());
-//                System.out.println(channel + ": " + notification.getRealtimeAction());
-                System.out.println(channel + ": " + notification.getData().toString());
                 notedInventoryObjects.add(notification.getData().toString());
             }
 
@@ -637,22 +635,24 @@ public void onError(String channel, Throwable error) {
         assertEquals(notedInventoryObjects.size(), 1);
         assertTrue(notedInventoryObjects.get(0).contains("UPDATE"));
 
-//        //now we disconnect, to test the reconnection to the channel
-//        connector.disconnect();
-//        assertFalse(connector.isConnected());
-//
-//        //we reconnect....
-//        connector.connect();
-//        assertTrue(connector.isConnected());
+        //now we disconnect, to test the reconnection to the channel
+        connector.disconnect();
+        assertFalse(connector.isConnected());
+
+        //we reconnect....
+        connector.connect();
+        assertTrue(connector.isConnected());
 
         // Now let's delete the managed object and see what happens, we should receive the notification of delete due to the
         // reconnection
         Thread.sleep(DELAY_MILLIS);
         invApi.delete(testObjectForConnectAndDisconnect.getId());
         Thread.sleep(DELAY_MILLIS);
 
-        //the second notification should be a delete one
-        assertEquals(notedInventoryObjects.size(), 2);
+        // The second notification should be a delete one
+        // Actually we expecting exactly 2 notifications at all but c8y is mostly sending two identical DELETE-notifications with different notification IDs at once.
+        // Therefore we are checking for more than 1 notification. At least there should be two.
+        assertTrue(notedInventoryObjects.size() > 1);
         assertTrue(notedInventoryObjects.get(1).contains("DELETE"));
 
         //and ... we disconnect to test again :)