Switched testNestedGetTags to use a BlockingQueue

Author: jkasten2

OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

@@ -89,6 +89,7 @@
 import org.json.JSONObject;
 import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -110,6 +111,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
@@ -3817,14 +3820,17 @@ public void sendsExternalIdOnEmailPlayers() throws Exception {
 
    @Test
    public void testGetTagsQueuesCallbacks() throws Exception {
+      final BlockingQueue<Boolean> queue = new ArrayBlockingQueue<>(2);
 
       // Allows us to validate that both handlers get executed independently
       class DebugGetTagsHandler implements OneSignal.GetTagsHandler {
-         boolean executed = false;
-
          @Override
          public void tagsAvailable(JSONObject tags) {
-            executed = true;
+            try {
+               queue.put(true);
+            } catch (InterruptedException e) {
+               Assert.fail("Throw unexpected");
+            }
          }
       }
 
@@ -3840,50 +3846,46 @@ public void tagsAvailable(JSONObject tags) {
       OneSignal.getTags(first);
       OneSignal.getTags(second);
       threadAndTaskWait();
-      // TODO: Need a clean up if this is stable
-      synchronized (first) { try { if (!first.executed) first.wait(); } catch (InterruptedException e) {} }
-      synchronized (second) { try { if (!second.executed) second.wait(); } catch (InterruptedException e) {} }
 
-      assertTrue(first.executed);
-      assertTrue(second.executed);
+      assertTrue(queue.take());
+      assertTrue(queue.take());
    }
 
    @Test
    public void testNestedGetTags() throws Exception {
+      final BlockingQueue<Boolean> queue = new ArrayBlockingQueue<>(2);
 
       // Validates that nested getTags calls won't throw a ConcurrentModificationException
       class DebugGetTagsHandler implements OneSignal.GetTagsHandler {
-         boolean executed = false;
-
          @Override
          public void tagsAvailable(JSONObject tags) {
             OneSignal.getTags(new OneSignal.GetTagsHandler() {
                @Override
                public void tagsAvailable(JSONObject tags) {
-                  synchronized (this) {
-                     executed = true;
-                     this.notifyAll();
+                  try {
+                     queue.put(true);
+                  } catch (InterruptedException e) {
+                     Assert.fail("Throw unexpected");
                   }
                }
             });
          }
       }
 
-      DebugGetTagsHandler first = new DebugGetTagsHandler();
-      DebugGetTagsHandler second = new DebugGetTagsHandler();
-
       OneSignalInit();
       threadAndTaskWait();
 
       OneSignal.sendTag("test", "value");
       threadAndTaskWait();
 
+      DebugGetTagsHandler first = new DebugGetTagsHandler();
+      DebugGetTagsHandler second = new DebugGetTagsHandler();
       OneSignal.getTags(first);
       OneSignal.getTags(second);
       threadAndTaskWait();
 
-      assertTrue(first.executed);
-      assertTrue(second.executed);
+      assertTrue(queue.take());
+      assertTrue(queue.take());
    }
 
    /**