Fix: after connect call, login must wait for connection state

juxeii · Feb 16, 2017 · 714e4da · 714e4da
1 parent b64da70
commit 714e4da
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 6 deletions.
diff --git a/src/main/java/com/jforex/programming/client/ClientUtil.java b/src/main/java/com/jforex/programming/client/ClientUtil.java
@@ -36,7 +36,9 @@ public ClientUtil(final IClient client,
 
         this.client = client;
         pinCaptcha = new PinCaptcha(client);
-        authentification = new Authentification(client, loginStatePublisher);
+        authentification = new Authentification(client,
+                                                observeConnectionState(),
+                                                loginStatePublisher);
 
         initCacheDirectory(cacheDirectory);
         client.setSystemListener(jfSystemListener);

diff --git a/src/main/java/com/jforex/programming/connection/Authentification.java b/src/main/java/com/jforex/programming/connection/Authentification.java
@@ -8,15 +8,19 @@
 import com.jforex.programming.rx.JFHotPublisher;
 
 import io.reactivex.Completable;
+import io.reactivex.Observable;
 
 public class Authentification {
 
     private final IClient client;
+    private final Observable<ConnectionState> connectionStateObservable;
     private final JFHotPublisher<LoginState> loginStatePublisher;
 
     public Authentification(final IClient client,
+                            final Observable<ConnectionState> connectionStateObservable,
                             final JFHotPublisher<LoginState> loginStatePublisher) {
         this.client = client;
+        this.connectionStateObservable = connectionStateObservable;
         this.loginStatePublisher = loginStatePublisher;
     }
 
@@ -37,6 +41,14 @@ public Completable login(final LoginCredentials loginCredentials) {
                     : () -> client.connect(jnlpAddress,
                                            username,
                                            password))
+            .andThen(connectionStateObservable
+                .take(1)
+                .map(state -> {
+                    if (state == ConnectionState.CONNECTED)
+                        return state;
+                    throw new ConnectionLostException("Login failed! Connection state: " + state);
+                }))
+            .ignoreElements()
             .doOnComplete(() -> loginStatePublisher.onNext(LoginState.LOGGED_IN));
     }
 

diff --git a/src/test/java/com/jforex/programming/connection/test/AuthentificationTest.java b/src/test/java/com/jforex/programming/connection/test/AuthentificationTest.java
@@ -5,32 +5,55 @@
 import org.junit.runner.RunWith;
 
 import com.jforex.programming.connection.Authentification;
+import com.jforex.programming.connection.ConnectionLostException;
+import com.jforex.programming.connection.ConnectionState;
 import com.jforex.programming.connection.LoginCredentials;
 import com.jforex.programming.connection.LoginState;
 import com.jforex.programming.rx.JFHotPublisher;
 import com.jforex.programming.test.common.CommonUtilForTest;
 
 import de.bechte.junit.runners.context.HierarchicalContextRunner;
 import io.reactivex.observers.TestObserver;
+import io.reactivex.subjects.PublishSubject;
+import io.reactivex.subjects.Subject;
 
 @RunWith(HierarchicalContextRunner.class)
 public class AuthentificationTest extends CommonUtilForTest {
 
     private Authentification authentification;
 
     private final JFHotPublisher<LoginState> loginStatePublisher = new JFHotPublisher<>();
+    private final Subject<ConnectionState> connectionStateSubject = PublishSubject.create();
     private TestObserver<LoginState> loginStateSubscriber;
 
     @Before
     public void setUp() {
-        authentification = new Authentification(clientMock, loginStatePublisher);
+        authentification = new Authentification(clientMock,
+                                                connectionStateSubject,
+                                                loginStatePublisher);
     }
 
-    private void login(final LoginCredentials credentials) {
+    private void loginWithConnectState(final LoginCredentials credentials) {
         authentification
             .login(credentials)
             .subscribe(() -> {},
                        t -> {});
+        connectionStateSubject.onNext(ConnectionState.CONNECTED);
+    }
+
+    @Test
+    public void connectionLostExceptionWhenStateIsNotConnected() {
+        loginStateSubscriber = loginStatePublisher
+            .observable()
+            .test();
+
+        final TestObserver<Void> testObserver = authentification
+            .login(loginCredentials)
+            .test();
+        connectionStateSubject.onNext(ConnectionState.DISCONNECTED);
+
+        testObserver.assertError(ConnectionLostException.class);
+        loginStateSubscriber.assertNoValues();
     }
 
     @Test
@@ -42,7 +65,7 @@ public void logoutDoesNotCallsDisconnectOnClientWhenNotSubscribed() {
 
     @Test
     public void loginWithPinCallsConnectClientWithPin() throws Exception {
-        login(loginCredentialsWithPin);
+        loginWithConnectState(loginCredentialsWithPin);
 
         verify(clientMock).connect(loginCredentialsWithPin.jnlpAddress(),
                                    loginCredentialsWithPin.username(),
@@ -62,7 +85,7 @@ public void loginWithExecpetionDoesNotPublishLoginStatss() throws Exception {
             .observable()
             .test();
 
-        login(loginCredentialsWithPin);
+        loginWithConnectState(loginCredentialsWithPin);
 
         loginStateSubscriber.assertNoValues();
     }
@@ -75,7 +98,7 @@ public void setUp() {
                 .observable()
                 .test();
 
-            login(loginCredentials);
+            loginWithConnectState(loginCredentials);
         }
 
         @Test