Merge pull request #372 from Countly/android24_7_1

fix: hot for orientation tests

Author: turtledreams

sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java

@@ -512,6 +512,14 @@ protected static CountlyStore getCountyStore() {
         return resultMapArray;
     }
 
+    protected static void removeRequestContains(String search) {
+        for (String request : getCountyStore().getRequests()) {
+            if (request.contains(search)) {
+                getCountyStore().removeRequest(request);
+            }
+        }
+    }
+
     protected static Map<String, Object> map(Object... args) {
         Map<String, Object> map = new ConcurrentHashMap<>();
 

sdk/src/androidTest/java/ly/count/android/sdk/scSE_SessionsTests.java

@@ -97,11 +97,12 @@ public void SE_201_CNR_M() throws InterruptedException {
 
         flowManualSessions(countly);
 
-        Assert.assertEquals(5, TestUtils.getCurrentRQ().length);
+        TestUtils.removeRequestContains("orientation"); //TODO fix for now, tweak this
+        Assert.assertEquals(4, TestUtils.getCurrentRQ().length);
         validateSessionBeginRequest(0, TestUtils.commonDeviceId);
+        validateSessionUpdateRequest(1, 2, TestUtils.commonDeviceId);
         validateSessionUpdateRequest(2, 2, TestUtils.commonDeviceId);
-        validateSessionUpdateRequest(3, 2, TestUtils.commonDeviceId);
-        validateSessionEndRequest(4, 2, TestUtils.commonDeviceId);
+        validateSessionEndRequest(3, 2, TestUtils.commonDeviceId);
     }
 
     /**
@@ -213,7 +214,8 @@ public void SE_204_CNR_A_id_change() throws InterruptedException {
 
         Assert.assertEquals(16, TestUtils.getCurrentRQ().length);
         validateSessionBeginRequest(0, TestUtils.commonDeviceId);
-        TestUtils.validateRequest("newID", TestUtils.map("old_device_id", TestUtils.commonDeviceId), 1);
+        boolean isOrientationRequest = TestUtils.getCurrentRQ()[1].containsKey("events");
+        TestUtils.validateRequest("newID", TestUtils.map("old_device_id", TestUtils.commonDeviceId), isOrientationRequest ? 2 : 1);
         // orientation request
         validateSessionEndRequest(3, 2, "newID");