More Tests

Signed-off-by: Pranshu-G <pranshu.grover18@gmail.com>
eclipse-ditto · Aug 17, 2022 · 533c076 · 533c076
1 parent 72642cd
commit 533c076
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 41 deletions.
diff --git a/...rvice/src/main/java/org/eclipse/ditto/connectivity/service/mapping/CloudEventsMapper.java b/...rvice/src/main/java/org/eclipse/ditto/connectivity/service/mapping/CloudEventsMapper.java
@@ -24,6 +24,8 @@
 import org.eclipse.ditto.connectivity.api.ExternalMessageFactory;
 import org.eclipse.ditto.connectivity.model.ConnectivityModelFactory;
 import org.eclipse.ditto.connectivity.model.MappingContext;
+import org.eclipse.ditto.internal.utils.akka.logging.DittoLogger;
+import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
 import org.eclipse.ditto.json.*;
 import org.eclipse.ditto.protocol.Adaptable;
 import org.eclipse.ditto.protocol.JsonifiableAdaptable;
@@ -40,6 +42,7 @@
     })
 public final class CloudEventsMapper extends AbstractMessageMapper {
 
+  private static final DittoLogger LOGGER = DittoLoggerFactory.getLogger(CloudEventsMapper.class);
   static final String CE_ID = "ce-id";
   static final String CE_TYPE = "ce-type";
   static final String CE_SOURCE = "ce-source";
@@ -96,7 +99,6 @@ boolean validatePayload(String payload) {
 
   private JsonifiableAdaptable extractData(final String message)
       throws UnsupportedEncodingException {
-    Map<String, String> payloadMap = new HashMap<>();
     final JsonObject payloadJson = JsonFactory.newObject(message);
     if (payloadJson.getValue("data_base64").isPresent()) {
       String base64Data = payloadJson.getValue("data_base64").orElse(null).asString();
@@ -122,10 +124,9 @@ public List<Adaptable> map(final ExternalMessage message) {
     if (validatePayload(payload)) {
       try {
         JsonifiableAdaptable adaptable = extractData(payload);
-        ;
         return singletonList(ProtocolFactory.newAdaptableBuilder(adaptable).build());
-      } catch (Throwable e) {
-        e.printStackTrace();
+      } catch (Exception e) {
+         e.printStackTrace();
       }
     }
     return null;

diff --git a/...e/src/test/java/org/eclipse/ditto/connectivity/service/mapping/CloudEventsMapperTest.java b/...e/src/test/java/org/eclipse/ditto/connectivity/service/mapping/CloudEventsMapperTest.java
@@ -11,6 +11,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
+import org.apache.kafka.common.protocol.types.Field;
 import org.eclipse.ditto.base.model.common.DittoConstants;
 import org.eclipse.ditto.base.model.exceptions.DittoJsonException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
@@ -41,32 +42,11 @@ public class CloudEventsMapperTest {
   private static final ThingId THING_ID = ThingId.of("thing:id");
   private static final ProtocolAdapter ADAPTER = DittoProtocolAdapter.newInstance();
 
-  //  public static void main(String[] args) {
-  //    //
-  //      String test = "{\"specversion\": \"1.0\", \"id\":\"3212e\",
-  // \"source\":\"http:somesite.com\",\"type\":\"com.site.com\",\"data\":{
-  // \"topic\":\"my.sensors/sensor01/things/twin/commands/create\", \"path\":\"/\",\"value\":55}";
-  //
-  //      ThingId thingId = ThingId.of("org.eclipse.ditto:thingID");
-  //      final JsonifiableAdaptable adaptable =
-  //              ProtocolFactory.wrapAsJsonifiableAdaptable(ProtocolFactory.newAdaptableBuilder
-  //
-  // (ProtocolFactory.newTopicPathBuilder(thingId).things().twin().commands().modify().build())
-  //                      .withPayload(ProtocolFactory
-  //                              .newPayloadBuilder(JsonPointer.of("/"))
-  //                              .withValue(JsonFactory.newObject("{\"value\":\"534\"}"))
-  //                              .build())
-  //                      .build());
-  //      ExternalMessage message = ExternalMessageFactory.newExternalMessageBuilder(
-  //                      Map.of(ExternalMessage.CONTENT_TYPE_HEADER,
-  // DittoConstants.DITTO_PROTOCOL_CONTENT_TYPE))
-  //
-  //              .build();
-  //
-  //  }
-
   String payload =
       "{\"specversion\": \"1.0\", \"id\":\"3212e\", \"source\":\"http:somesite.com\",\"type\":\"com.site.com\"}";
+
+  String incompletePayload =
+          "{ \"id\":\"3212e\", \"source\":\"http:somesite.com\",\"type\":\"com.site.com\"}";
   String testPayload =
       "{\n"
           + "      \"specversion\": \"1.0\", \"id\":\"3212e\", \"source\":\"http:somesite.com\",\"type\":\"com.site.com\",\n"
@@ -106,11 +86,10 @@ public class CloudEventsMapperTest {
   String base64payload =
       "{\n"
           + "                    \"specversion\": \"1.0\" , \"id\":\"3212e\", \"source\":\"http:somesite.com\",\"type\":\"com.site.com\",\n"
-          + "                    \"data_base64\":\"ewogICJ0b3BpYyI6Im15LnNlbnNvcnMvc2Vuc29yMDEvdGhpbmdzL3R3aW4vY29tbWFuZHMvbW9kaWZ5IiwKICAicGF0aCI6Ii8iLAogICJ2YWx1ZSI6ewogICAgICAidGhpbmdJZCI6ICJteS5zZW5zb3JzOnNlbnNvcjAxIiwKICAgICAgInBvbGljeUlkIjogIm15LnRlc3Q6cG9saWN5IiwKICAgICAgImF0dHJpYnV0ZXMiOiB7CiAgICAgICAgICAibWFudWZhY3R1cmVyIjogIldlbGwga25vd24gc2Vuc29ycyBwcm9kdWNlciIsCiAgICAgICAgICAgICJzZXJpYWwgbnVtYmVyIjogIjEwMCIsIAogICAgICAgICAgICAibG9jYXRpb24iOiAiR3JvdW5kIGZsb29yIiB9LAogICAgICAgICAgICAiZmVhdHVyZXMiOiB7CiAgICAgICAgICAgICAgIm1lYXN1cmVtZW50cyI6IAogICAgICAgICAgICAgICB7InByb3BlcnRpZXMiOiAKICAgICAgICAgICAgICAgeyJ0ZW1wZXJhdHVyZSI6IDEwMCwKICAgICAgICAgICAgICAgICJodW1pZGl0eSI6IDIwMH19fX19\"\n"
+          + "                    \"data_base64\":\"ewogICJ0b3BpYyI6Im15LnNlbnNvcnMvc2Vuc29yMDEvdGhpbmdzL3R3aW4vY29tbWFuZHMvbW9kaWZ5IiwKICAicGF0aCI6Ii8iLAogICJ2YWx1ZSI6ewogICAgICAidGhpbmdJZCI6ICJteS5zZW5zb3JzOnNlbnNvcjAxIiwKICAgICAgInBvbGljeUlkIjogIm15LnRlc3Q6cG9saWN5IiwKICAgICAgImF0dHJpYnV0ZXMiOiB7CiAgICAgICAgICAibWFudWZhY3R1cmVyIjogIldlbGwga25vd24gc2Vuc29ycyBwcm9kdWNlciIsCiAgICAgICAgICAgICJzZXJpYWwgbnVtYmVyIjogIjEwMCIsIAogICAgICAgICAgICAibG9jYXRpb24iOiAiR3JvdW5kIGZsb29yIiB9LAogICAgICAgICAgICAiZmVhdHVyZXMiOiB7CiAgICAgICAgICAgICAgIm1lYXN1cmVtZW50cyI6IAogICAgICAgICAgICAgICB7InByb3BlcnRpZXMiOiAKICAgICAgICAgICAgICAgeyJ0ZW1wZXJhdHVyZSI6IDEwMCwKICAgICAgICAgICAgICAgICJodW1pZGl0eSI6IDB9fX19fQ==\"\n"
           + "                  }";
 
-  String data_base64 =
-      "ewogICJ0b3BpYyI6Im15LnNlbnNvcnMvc2Vuc29yMDEvdGhpbmdzL3R3aW4vY29tbWFuZHMvbW9kaWZ5IiwKICAicGF0aCI6Ii8iLAogICJ2YWx1ZSI6ewogICAgICAidGhpbmdJZCI6ICJteS5zZW5zb3JzOnNlbnNvcjAxIiwKICAgICAgInBvbGljeUlkIjogIm15LnRlc3Q6cG9saWN5IiwKICAgICAgImF0dHJpYnV0ZXMiOiB7CiAgICAgICAgICAibWFudWZhY3R1cmVyIjogIldlbGwga25vd24gc2Vuc29ycyBwcm9kdWNlciIsCiAgICAgICAgICAgICJzZXJpYWwgbnVtYmVyIjogIjEwMCIsIAogICAgICAgICAgICAibG9jYXRpb24iOiAiR3JvdW5kIGZsb29yIiB9LAogICAgICAgICAgICAiZmVhdHVyZXMiOiB7CiAgICAgICAgICAgICAgIm1lYXN1cmVtZW50cyI6IAogICAgICAgICAgICAgICB7InByb3BlcnRpZXMiOiAKICAgICAgICAgICAgICAgeyJ0ZW1wZXJhdHVyZSI6IDEwMCwKICAgICAgICAgICAgICAgICJodW1pZGl0eSI6IDIwMH19fX19";
+  String data_base64 = Base64.getEncoder().encodeToString(data.getBytes());
   private CloudEventsMapper underTest;
 
   @Before
@@ -135,24 +114,15 @@ public void textPayloadMessage() {
         singletonList(ProtocolFactory.newAdaptableBuilder(expectedAdaptable).build());
     assertEquals(expectedMap, underTest.map(message));
   }
-
-  @Test
-  public void validatePayload() {
-    Boolean expected = true;
-    Boolean actual = underTest.validatePayload(payload);
-    assertEquals(expected, actual);
-  }
-
   @Test
-  public void base64Payload() {
+  public void base64PayloadMessage() {
     ExternalMessage message =
         ExternalMessageFactory.newExternalMessageBuilder(
                 Map.of(
                     ExternalMessage.CONTENT_TYPE_HEADER,
                     DittoConstants.DITTO_PROTOCOL_CONTENT_TYPE))
             .withText(base64payload)
             .build();
-    System.out.println(underTest.map(message));
     String base64 = data_base64.replace("\"", "");
     byte[] decodedBytes = Base64.getDecoder().decode(base64);
     String decodedString = new String(decodedBytes);
@@ -165,4 +135,51 @@ public void base64Payload() {
         singletonList(ProtocolFactory.newAdaptableBuilder(expectedAdaptable).build());
     assertEquals(expectedMap, underTest.map(message));
   }
+
+  @Test
+  public void bytePayloadMapping(){
+    ExternalMessage byteMessage =
+            ExternalMessageFactory.newExternalMessageBuilder(
+                            Map.of(
+                                    ExternalMessage.CONTENT_TYPE_HEADER,
+                                    DittoConstants.DITTO_PROTOCOL_CONTENT_TYPE))
+                    .withBytes(testPayload.getBytes(StandardCharsets.UTF_8))
+                    .build();
+
+    Adaptable expectedAdaptable =
+            DittoJsonException.wrapJsonRuntimeException(
+                    () -> ProtocolFactory.jsonifiableAdaptableFromJson(JsonFactory.newObject(data.getBytes(StandardCharsets.UTF_8))));
+    List<Adaptable> expectedMap =
+            singletonList(ProtocolFactory.newAdaptableBuilder(expectedAdaptable).build());
+    assertEquals(expectedMap, underTest.map(byteMessage));
+  }
+
+  @Test
+  public void invalidPayloadOutput(){
+    ExternalMessage message =
+            ExternalMessageFactory.newExternalMessageBuilder(
+                            Map.of(
+                                    ExternalMessage.CONTENT_TYPE_HEADER,
+                                    DittoConstants.DITTO_PROTOCOL_CONTENT_TYPE))
+                    .withText(incompletePayload)
+                    .build();
+
+    assertEquals(underTest.map(message),null);
+  }
+
+  @Test
+  public void validatePayloadTest() {
+    Boolean expected = true;
+    Boolean actual = underTest.validatePayload(payload);
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  public void failedValidation(){
+    Boolean expected = false;
+    Boolean actual = underTest.validatePayload(incompletePayload);
+    assertEquals(expected,actual);
+
+  }
+
 }