Fix flaky test for TrackerWebViewInterface

snowplow · Jul 30, 2022 · 9dda216 · 9dda216
1 parent 695a3f0
commit 9dda216
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/...er/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/MockNetworkConnection.java b/...er/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/MockNetworkConnection.java
@@ -54,4 +54,16 @@ public HttpMethod getHttpMethod() {
     public Uri getUri() {
         return Uri.parse("http://fake-url.com");
     }
+
+    public List<Request> getAllRequests() {
+        List<Request> flattened = new ArrayList<>();
+        for (List<Request> requests : previousRequests) {
+            flattened.addAll(requests);
+        }
+        return flattened;
+    }
+
+    public int countRequests() {
+        return getAllRequests().size();
+    }
 }
diff --git a/.../androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerWebViewInterfaceTest.java b/.../androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerWebViewInterfaceTest.java
@@ -72,13 +72,12 @@ public void tracksStructuredEventWithAllProperties() throws JSONException, Inter
                 "cat", "act", "lbl", "prop", 10.0, null, null
         );
 
-        for (int i = 0; i < 10 && (networkConnection.sendingCount() == 0); i++) {
+        for (int i = 0; i < 10 && (networkConnection.countRequests() == 0); i++) {
             Thread.sleep(1000);
         }
 
-        assertEquals(1, networkConnection.sendingCount());
-        assertEquals(1, networkConnection.previousRequests.get(0).size());
-        Request request = networkConnection.previousRequests.get(0).get(0);
+        assertEquals(1, networkConnection.countRequests());
+        Request request = networkConnection.getAllRequests().get(0);
         Map payload = request.payload.getMap();
         assertEquals("cat", payload.get("se_ca"));
         assertEquals("act", payload.get("se_ac"));
@@ -98,12 +97,11 @@ public void tracksEventWithCorrectTracker() throws JSONException, InterruptedExc
         webInterface.trackPageView("http://localhost", null, null, null, new String[]{"ns2"});
 
         // wait and check for the event
-        for (int i = 0; i < 10 && (networkConnection2.sendingCount() == 0); i++) {
+        for (int i = 0; i < 10 && (networkConnection2.countRequests() == 0); i++) {
             Thread.sleep(1000);
         }
-        assertEquals(0, networkConnection.sendingCount());
-        assertEquals(1, networkConnection2.previousRequests.size());
-        assertEquals(1, networkConnection2.previousRequests.get(0).size());
+        assertEquals(0, networkConnection.countRequests());
+        assertEquals(1, networkConnection2.countRequests());
     }
 
     @Test
@@ -114,13 +112,12 @@ public void tracksEventWithContext() throws JSONException, InterruptedException
                 "[{\"schema\":\"http://context-schema.com\",\"data\":{\"a\":\"b\"}}]",
                 null);
 
-        for (int i = 0; i < 10 && (networkConnection.sendingCount() == 0); i++) {
+        for (int i = 0; i < 10 && (networkConnection.countRequests() == 0); i++) {
             Thread.sleep(1000);
         }
 
-        assertEquals(1, networkConnection.sendingCount());
-        assertEquals(1, networkConnection.previousRequests.get(0).size());
-        Request request = networkConnection.previousRequests.get(0).get(0);
+        assertEquals(1, networkConnection.countRequests());
+        Request request = networkConnection.getAllRequests().get(0);
         JSONObject parsedEntity = new JSONObject((String) request.payload.getMap().get("co"))
                 .getJSONArray("data")
                 .getJSONObject(0);