Fix handling of primitive arrays and clean up unit tests

Author: jkuester

src/main/java/org/medicmobile/webapp/mobile/ChtExternalApp.java

@@ -344,7 +344,14 @@ private boolean isPrimitive(Object value) {
 
 		private Optional<List<?>> asPrimitiveList(Object value) {
 			if (value != null && value.getClass().isArray()) {
-				value = List.of(((Object[]) value));
+				// Java utility methods are not great when mixing primitive and object arrays.
+				// So, we manually convert any array to a List<Object>.
+				int len = java.lang.reflect.Array.getLength(value);
+				List<Object> list = new ArrayList<>(len);
+				for (int i = 0; i < len; i++) {
+					list.add(java.lang.reflect.Array.get(value, i));
+				}
+				value = list;
 			}
 			if (
 				!(value instanceof List)

src/test/java/org/medicmobile/webapp/mobile/ChtExternalAppHandlerTest.java

@@ -5,11 +5,13 @@
 import static android.app.Activity.RESULT_OK;
 import static android.content.pm.PackageManager.PERMISSION_DENIED;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.medicmobile.webapp.mobile.EmbeddedBrowserActivity.RequestCode;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.matches;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -35,6 +37,8 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
+import java.util.regex.Pattern;
+
 @RunWith(RobolectricTestRunner.class)
 public class ChtExternalAppHandlerTest {
 	@Mock
@@ -154,18 +158,19 @@ public void processResult_withBadResultCodeAndData_logError() {
 			//> GIVEN
 			Intent intent = new Intent();
 			intent.putExtra("name", "Eric");
+			intent.putExtra("duration", 0L);
 			ChtExternalAppHandler chtExternalAppHandler = new ChtExternalAppHandler(contextMock);
 			String expectedMessageWarn = "ChtExternalAppHandler :: Bad result code: %s. The external app either: " +
-				"explicitly returned this result, did not return any result or crashed during the operation. [{\"name\":\"Eric\"}]";
+				"explicitly returned this result, did not return any result or crashed during the operation. \\[\\{\"duration\":\\d+,\"name\":\"Eric\"}]";
 			String expectedMessageConsole = "ChtExternalAppHandler :: Bad result code: " + RESULT_CANCELED + ". The external app either: " +
-				"explicitly returned this result, did not return any result or crashed during the operation. [{\"name\":\"Eric\"}]";
+				"explicitly returned this result, did not return any result or crashed during the operation. \\[\\{\"duration\":\\d+,\"name\":\"Eric\"}]";
 
 			//> WHEN
 			String script = chtExternalAppHandler.processResult(RESULT_CANCELED, intent);
 
 			//> THEN
-			assertEquals("console.error('" + expectedMessageConsole + "')", script);
-			medicLogMock.verify(() -> MedicLog.warn(eq(chtExternalAppHandler), eq(expectedMessageWarn), eq(RESULT_CANCELED)));
+			assertTrue(Pattern.matches("console\\.error\\('" + expectedMessageConsole + "'\\)", script));
+			medicLogMock.verify(() -> MedicLog.warn(eq(chtExternalAppHandler), matches(expectedMessageWarn), eq(RESULT_CANCELED)));
 		}
 	}
 

src/test/java/org/medicmobile/webapp/mobile/ChtExternalAppTest.java

@@ -265,16 +265,16 @@ public void processResponse_withSimpleData_buildJsonCorrectly() {
 		intent.putExtra("a.string.array", new String[]{"some text", "another text"});
 
 		String expectedJsonData = "{" +
-				"\"an.int.array\":[5,9]," +
+				"\"an.int.array\":\"5 9\"," +
 				"\"a.double\":2.8," +
 				"\"a.long\":2147483649," +
 				"\"a.string\":\"some text\"," +
 				"\"an.int\":5," +
-				"\"a.boolean.array\":[true,false,true]," +
+				"\"a.boolean.array\":\"true false true\"," +
 				"\"a.boolean\":true," +
-				"\"a.string.array\":[\"some text\",\"another text\"]," +
-				"\"a.long.array\":[2147483649,2147483700]," +
-				"\"a.double.array\":[2.8,5.5]" +
+				"\"a.string.array\":\"some_text another_text\"," +
+				"\"a.long.array\":\"2147483649 2147483700\"," +
+				"\"a.double.array\":\"2.8 5.5\"" +
 				"}";
 
 		//> WHEN
@@ -326,7 +326,7 @@ public void processResponse_withNestedObjects_buildJsonCorrectly() {
 		String expectedJsonData = "{" +
 				"\"people\":[" +
 					"{" +
-						"\"relatives\":[\"Pepe\",\"John\",\"Matt\"]," +
+						"\"relatives\":\"Pepe John Matt\"," +
 						"\"name\":\"Anna\"" +
 					"}," +
 					"{" +
@@ -343,9 +343,9 @@ public void processResponse_withNestedObjects_buildJsonCorrectly() {
 					"\"a.boolean\":true," +
 					"\"more.details\":{" +
 						"\"a.null\":null," +
-						"\"a.boolean.array\":[true,false,true]," +
+						"\"a.boolean.array\":\"true false true\"," +
 						"\"a.description\":\"some awesome data\"," +
-						"\"a.double.array\":[2.8,5.5]" +
+						"\"a.double.array\":\"2.8 5.5\"" +
 					"}" +
 				"}" +
 				"}";