Fix test

Author: gthea

splitio_android/android/src/main/java/io/split/splitio/SplitMethodParserImpl.java

@@ -422,6 +422,10 @@ private static void invokeCallback(MethodChannel methodChannel, String matchingK
     private static Map<String, Map<String, String>> mapToSplitResults(Map<String, SplitResult> treatmentsWithConfig) {
         Map<String, Map<String, String>> resultMap = new HashMap<>();
 
+        if (treatmentsWithConfig == null) {
+            return resultMap;
+        }
+
         for (Map.Entry<String, SplitResult> entry : treatmentsWithConfig.entrySet()) {
             resultMap.put(entry.getKey(), getSplitResultMap(entry.getValue()));
         }

splitio_android/android/src/test/java/io/split/splitio/SplitMethodParserImplTest.java

@@ -553,17 +553,20 @@ public void getTreatmentsWithConfigByFlagSetWorksCorrectly() {
         map.put("flagSet", "set_1");
         map.put("attributes", Collections.singletonMap("age", 10));
 
+        Map<String, String> resultMap1 = new HashMap<>();
+        resultMap1.put("treatment", "on");
+        resultMap1.put("config", "{config}");
+
         when(mArgumentParser.getStringArgument("matchingKey", map)).thenReturn("user-key");
         when(mArgumentParser.getStringArgument("bucketingKey", map)).thenReturn("bucketing-key");
         when(mArgumentParser.getStringArgument("flagSet", map)).thenReturn("set_1");
         when(mArgumentParser.getMapArgument("attributes", map)).thenReturn(Collections.singletonMap("age", 10));
-        SplitResult splitResult = new SplitResult("on", "{config}");
-        when(mSplitWrapper.getTreatmentsWithConfigByFlagSet(any(), any(), any(), any())).thenReturn(Collections.singletonMap("flag_1", splitResult));
+        when(mSplitWrapper.getTreatmentsWithConfigByFlagSet(any(), any(), any(), any())).thenReturn(Collections.singletonMap("flag_1", new SplitResult("on", "{config}")));
 
         mMethodParser.onMethodCall("getTreatmentsWithConfigByFlagSet", map, mResult);
 
         verify(mSplitWrapper).getTreatmentsWithConfigByFlagSet("user-key", "bucketing-key", "set_1", Collections.singletonMap("age", 10));
-        verify(mResult).success(Collections.singletonMap("flag_1", splitResult));
+        verify(mResult).success(Collections.singletonMap("flag_1", resultMap1));
     }
 
     @Test
@@ -574,16 +577,19 @@ public void getTreatmentsWithConfigByFlagSetsWorksCorrectly() {
         map.put("flagSets", Arrays.asList("set_1", "set_2"));
         map.put("attributes", Collections.singletonMap("age", 10));
 
+        Map<String, String> resultMap1 = new HashMap<>();
+        resultMap1.put("treatment", "on");
+        resultMap1.put("config", "{config}");
+
         when(mArgumentParser.getStringArgument("matchingKey", map)).thenReturn("user-key");
         when(mArgumentParser.getStringArgument("bucketingKey", map)).thenReturn("bucketing-key");
         when(mArgumentParser.getStringListArgument("flagSets", map)).thenReturn(Arrays.asList("set_1", "set_2"));
         when(mArgumentParser.getMapArgument("attributes", map)).thenReturn(Collections.singletonMap("age", 10));
-        SplitResult splitResult = new SplitResult("on", "{config}");
-        when(mSplitWrapper.getTreatmentsWithConfigByFlagSets(any(), any(), any(), any())).thenReturn(Collections.singletonMap("flag_1", splitResult));
+        when(mSplitWrapper.getTreatmentsWithConfigByFlagSets(any(), any(), any(), any())).thenReturn(Collections.singletonMap("flag_1", new SplitResult("on", "{config}")));
 
         mMethodParser.onMethodCall("getTreatmentsWithConfigByFlagSets", map, mResult);
 
         verify(mSplitWrapper).getTreatmentsWithConfigByFlagSets("user-key", "bucketing-key", Arrays.asList("set_1", "set_2"), Collections.singletonMap("age", 10));
-        verify(mResult).success(Collections.singletonMap("flag_1", splitResult));
+        verify(mResult).success(Collections.singletonMap("flag_1", resultMap1));
     }
 }