ConnectionManagerTest: avoid use of race-prone ConnectionManagerWaite…

…r helper
ably · Nov 15, 2019 · a61136a · a61136a
1 parent d073edb
commit a61136a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/src/test/java/io/ably/lib/test/realtime/ConnectionManagerTest.java b/lib/src/test/java/io/ably/lib/test/realtime/ConnectionManagerTest.java
@@ -65,7 +65,7 @@ public void connectionmanager_fallback_none() throws AblyException {
 		AblyRealtime ably = new AblyRealtime(opts);
 		ConnectionManager connectionManager = ably.connection.connectionManager;
 
-		new Helpers.ConnectionManagerWaiter(connectionManager).waitFor(ConnectionState.connected);
+		new Helpers.ConnectionWaiter(ably.connection).waitFor(ConnectionState.connected);
 
 		/* Verify that,
 		 *   - connectionManager is connected
@@ -96,7 +96,7 @@ public void connectionmanager_fallback_none_customhost() throws AblyException {
 		AblyRealtime ably = new AblyRealtime(opts);
 		ConnectionManager connectionManager = ably.connection.connectionManager;
 
-		new Helpers.ConnectionManagerWaiter(connectionManager).waitFor(ConnectionState.disconnected);
+		new Helpers.ConnectionWaiter(ably.connection).waitFor(ConnectionState.disconnected);
 
 		/* Verify that,
 		 *   - connectionManager is disconnected
@@ -126,6 +126,7 @@ public void connectionmanager_fallback_none_withoutconnection() throws AblyExcep
 		opts.realtimeHost = "un.reachable.host";
 		opts.environment = null;
 		opts.autoConnect = false;
+		opts.logLevel = Log.VERBOSE;
 		AblyRealtime ably = new AblyRealtime(opts);
 		Connection connection = Mockito.mock(Connection.class);
 
@@ -176,7 +177,7 @@ public void connectionmanager_fallback_applied() throws AblyException {
 		AblyRealtime ably = new AblyRealtime(opts);
 		ConnectionManager connectionManager = ably.connection.connectionManager;
 
-		new Helpers.ConnectionManagerWaiter(connectionManager).waitFor(ConnectionState.disconnected);
+		new Helpers.ConnectionWaiter(ably.connection).waitFor(ConnectionState.disconnected);
 
 		/* Verify that,
 		 *   - connectionManager is disconnected
@@ -210,7 +211,7 @@ public void connectionmanager_reconnect_default_endpoint() throws AblyException
 		ConnectionManager connectionManager = ably.connection.connectionManager;
 
 		System.out.println("waiting for disconnected");
-		new Helpers.ConnectionManagerWaiter(connectionManager).waitFor(ConnectionState.disconnected);
+		new Helpers.ConnectionWaiter(ably.connection).waitFor(ConnectionState.disconnected);
 		System.out.println("got disconnected");
 
 		/* Verify that,
@@ -225,7 +226,7 @@ public void connectionmanager_reconnect_default_endpoint() throws AblyException
 		System.out.println("about to connect");
 		ably.connection.connect();
 
-		new Helpers.ConnectionManagerWaiter(connectionManager).waitFor(ConnectionState.failed);
+		new Helpers.ConnectionWaiter(ably.connection).waitFor(ConnectionState.failed);
 
 		/* Verify that,
 		 *   - connectionManager is failed, because we are using an application key
@@ -260,7 +261,7 @@ public void connectionmanager_reconnect_default_fallback() throws AblyException
 		ConnectionManager connectionManager = ably.connection.connectionManager;
 
 		System.out.println("waiting for disconnected");
-		new Helpers.ConnectionManagerWaiter(connectionManager).waitFor(ConnectionState.disconnected);
+		new Helpers.ConnectionWaiter(ably.connection).waitFor(ConnectionState.disconnected);
 		System.out.println("got disconnected");
 		ably.close();
 
@@ -470,7 +471,7 @@ public void onConnectionStateChanged(ConnectionStateChange state) {
 					}
 				}
 			});
-			new Helpers.ConnectionManagerWaiter(ably.connection.connectionManager).waitFor(ConnectionState.connected);
+			new Helpers.ConnectionWaiter(ably.connection).waitFor(ConnectionState.connected);
 			assertTrue("Connected callback was not run", callbackWasRun[0]);
 			ably.close();
 		} catch (AblyException e) {