From f008b5ec8e1c74968e4a605d2de5423edf91b854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 29 Apr 2015 12:25:24 +0200
Subject: Creating a user session fragment.

I've separated the user session management to it, and encapsulated
ProviderAPICommand into its own class.

Putting the fragment statically in dashboard.xml isn't working, Android
complains about it being duplicated, so I'm going to add it dynamically.
---
 .../test/testDashboardIntegration.java             | 32 +++++++++-------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'app/src/androidTest')

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
index 13ca4431..262310bd 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
@@ -97,7 +97,7 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
             }
         };
         solo.waitForCondition(condition, max_seconds_until_connected * 1000);
-        solo.sleep(2 * 1000);
+        sleepSeconds(2);
     }
 
     private void assertInProgress() {
@@ -124,7 +124,7 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
             }
         };
         solo.waitForCondition(condition, max_seconds_until_connected * 1000);
-        solo.sleep(2 * 1000);
+        sleepSeconds(2);
     }
 
     private void okToBrowserWarning() {
@@ -160,15 +160,17 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
     }
 
     public void testLogInAndOut() {
-        long milliseconds_to_log_in = 40 * 1000;
-        solo.clickOnActionBarItem(R.id.login_button);
+        changeProvider("demo.bitmask.net");
+        clickLogIn();
         logIn("parmegvtest1", " S_Zw3'-");
-        solo.waitForDialogToClose(milliseconds_to_log_in);
         assertSuccessfulLogin();
 
         logOut();
     }
 
+    private void clickLogIn() {
+        solo.clickOnActionBarItem(R.id.user_session_button);
+    }
     private void logIn(String username, String password) {
         solo.enterText(0, username);
         solo.enterText(1, password);
@@ -218,20 +220,17 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
 
     private void changeAndTestProvider(String provider) {
         changeProvider(provider);
-        sleep(1);
+        sleepSeconds(1);
         clickVpnButton();
         turningEipOn();
         clickVpnButton();
         turningEipOff();
     }
 
-    private void sleep(int seconds) {
-        try {
-            Thread.sleep(seconds * 1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
+    private void sleepSeconds(int seconds) {
+        solo.sleep(seconds * 1000);
     }
+
     private void changeProvider(String provider) {
         tapSwitchProvider();
         solo.clickOnText(provider);
@@ -241,7 +240,8 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
     private void useRegistered() {
         String text = solo.getString(R.string.signup_or_login_button);
         clickAndWaitForDashboard(text);
-        login();
+        logIn("parmegvtest10", "holahola2");
+        assertSuccessfulLogin();
     }
 
     private void clickAndWaitForDashboard(String click_text) {
@@ -249,12 +249,6 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
         assertTrue(solo.waitForActivity(Dashboard.class, 5000));
     }
 
-    private void login() {
-        long milliseconds_to_log_in = 40 * 1000;
-        logIn("parmegvtest10", "holahola2");
-        solo.waitForDialogToClose(milliseconds_to_log_in);
-        assertSuccessfulLogin();
-    }
     public void testVpnIconIsDisplayed() {
         assertTrue(isShownWithinConfinesOfVisibleScreen(getVpnImage()));
     }
-- 
cgit v1.2.3


From 8833acbafe00eb2941cfa052cb679fc2684b5290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 29 Apr 2015 12:47:43 +0200
Subject: Dynamically load user session fragment.

Tests click new button, instead of action bar's.

Fixing more bugs...
---
 .../java/se/leap/bitmaskclient/test/testDashboardIntegration.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/src/androidTest')

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
index 262310bd..7551091b 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
@@ -169,7 +169,11 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
     }
 
     private void clickLogIn() {
-        solo.clickOnActionBarItem(R.id.user_session_button);
+        solo.clickOnView(getLogInButton());
+    }
+
+    private View getLogInButton() {
+        return solo.getView(R.id.user_session_button);
     }
     private void logIn(String username, String password) {
         solo.enterText(0, username);
-- 
cgit v1.2.3


From 237e51e09ea7ae13c4cdf7fd9247447f6d75fb9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 30 Apr 2015 13:51:43 +0200
Subject: Works smoothly, correct texts.

Next step: beautify.
---
 .../test/testDashboardIntegration.java             | 32 ++++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'app/src/androidTest')

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
index 7551091b..a41a1acf 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testDashboardIntegration.java
@@ -161,20 +161,25 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
 
     public void testLogInAndOut() {
         changeProvider("demo.bitmask.net");
-        clickLogIn();
+        clickUserSessionButton();
+        assertLoggedOut();
+        clickUserSessionButton();
         logIn("parmegvtest1", " S_Zw3'-");
-        assertSuccessfulLogin();
+        assertLoggedIn();
 
         logOut();
     }
 
-    private void clickLogIn() {
-        solo.clickOnView(getLogInButton());
+    private void clickUserSessionButton() {
+        solo.clickOnView(getUserSessionButton());
     }
 
-    private View getLogInButton() {
-        return solo.getView(R.id.user_session_button);
+    private View getUserSessionButton() {
+        View view = solo.getView(R.id.user_status_button);
+        assertTrue(view != null);
+        return view;
     }
+
     private void logIn(String username, String password) {
         solo.enterText(0, username);
         solo.enterText(1, password);
@@ -182,11 +187,20 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
         solo.waitForDialogToClose();
     }
 
-    private void assertSuccessfulLogin() {
-        assertTrue(solo.waitForText(solo.getString(R.string.logged_in_user_status)));
+    private void assertLoggedIn() {
+        String log_out = solo.getString(R.string.logout_button);
+        solo.waitForText(log_out);
+    }
+
+    private void assertLoggedOut() {
+        String log_in = solo.getString(R.string.login_button);
+        solo.waitForText(log_in);
     }
 
     private void logOut() {
+        assertLoggedIn();
+        clickUserSessionButton();
+
         solo.clickOnActionBarItem(R.string.logout_button);
         assertTrue(solo.waitForDialogToClose());
     }
@@ -245,7 +259,7 @@ public class testDashboardIntegration extends ActivityInstrumentationTestCase2<D
         String text = solo.getString(R.string.signup_or_login_button);
         clickAndWaitForDashboard(text);
         logIn("parmegvtest10", "holahola2");
-        assertSuccessfulLogin();
+        assertLoggedIn();
     }
 
     private void clickAndWaitForDashboard(String click_text) {
-- 
cgit v1.2.3