Merge pull request #431 from salemove/feature/custom_card_detection

Author: sm-deployer

widgetssdk/build.gradle

@@ -75,6 +75,10 @@ dependencies {
     androidTestImplementation "org.mockito:mockito-android:$mockitoVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidXTestVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
+
+    // Test dependencies to Android native libraries
+    // To prevent unit tests firing errors like 'Method length in org.json.JSONObject not mocked'
+    testImplementation "org.json:json:20220924"
 }
 
 ext {

widgetssdk/src/main/java/com/glia/widgets/chat/adapter/holder/WebViewViewHolder.java

@@ -104,7 +104,7 @@ public void bind(@NonNull ChatMessage message, @NonNull ResponseCallback callbac
      */
     public static boolean isWebViewType(@NonNull ChatMessage message) {
         JSONObject metadata = message.getMetadata();
-        if (metadata == null) {
+        if (metadata == null || metadata.length() == 0) {
             return false;
         }
         return metadata.has(METADATA_KEY);

widgetssdk/src/main/java/com/glia/widgets/chat/domain/CustomCardAdapterTypeUseCase.java

@@ -15,7 +15,7 @@ public CustomCardAdapterTypeUseCase(@Nullable CustomCardAdapter adapter) {
 
     @Nullable
     public Integer execute(ChatMessage message) {
-        if (adapter == null || message.getMetadata() == null) {
+        if (adapter == null || message.getMetadata() == null || message.getMetadata().length() == 0) {
             return null;
         }
         return adapter.getChatAdapterViewType(message);

widgetssdk/src/test/java/com/glia/widgets/chat/domain/CustomCardAdapterTypeUseCaseTest.java

@@ -9,6 +9,7 @@
 import com.glia.androidsdk.chat.ChatMessage;
 import com.glia.widgets.chat.adapter.CustomCardAdapter;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
@@ -57,9 +58,9 @@ public void execute_returnsNull_whenAdapterReturnsNull() {
     }
 
     @Test
-    public void execute_returnsViewType_whenAdapterReturnsViewType() {
+    public void execute_returnsViewType_whenAdapterReturnsViewType() throws JSONException {
         ChatMessage message = mock(ChatMessage.class);
-        JSONObject metadata = new JSONObject();
+        JSONObject metadata = new JSONObject().put("someKey", "someValue");
         when(message.getMetadata()).thenReturn(metadata);
         when(customCardAdapter.getChatAdapterViewType(message)).thenReturn(VIEW_TYPE);