From b87f082fe0e9c05cf45c56b510a2c4000133b572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 24 Mar 2015 19:07:43 +0100
Subject: Indent everything with IntelliJ

---
 .../test/testConfigurationWizard.java              | 63 +++++++++++-----------
 1 file changed, 33 insertions(+), 30 deletions(-)

(limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java')

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
index 755f83a7..7a19409b 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -2,41 +2,44 @@ package se.leap.bitmaskclient.test;
 
 import android.test.*;
 import android.widget.*;
+
 import com.robotium.solo.*;
+
 import java.io.*;
+
 import se.leap.bitmaskclient.*;
 
 public class testConfigurationWizard extends ActivityInstrumentationTestCase2<ConfigurationWizard> {
 
-	private Solo solo;
-	private static int added_providers;
-	
-	public testConfigurationWizard() {
-		super(ConfigurationWizard.class);
-	}
+    private Solo solo;
+    private static int added_providers;
+
+    public testConfigurationWizard() {
+        super(ConfigurationWizard.class);
+    }
 
     public testConfigurationWizard(Solo solo) {
         super(ConfigurationWizard.class);
         this.solo = solo;
     }
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
         solo = new Solo(getInstrumentation(), getActivity());
-		ConnectionManager.setMobileDataEnabled(true, solo.getCurrentActivity().getApplicationContext());
-	}
+        ConnectionManager.setMobileDataEnabled(true, solo.getCurrentActivity().getApplicationContext());
+    }
 
-	@Override
-	protected void tearDown() throws Exception { 
-		solo.finishOpenedActivities();
-	}
-	
-	public void testListProviders() {
-		assertEquals(solo.getCurrentViews(ListView.class).size(), 1);
+    @Override
+    protected void tearDown() throws Exception {
+        solo.finishOpenedActivities();
+    }
 
-		assertEquals("Number of available providers differ", predefinedProviders() + added_providers, shownProviders());
-	}
+    public void testListProviders() {
+        assertEquals(solo.getCurrentViews(ListView.class).size(), 1);
+
+        assertEquals("Number of available providers differ", predefinedProviders() + added_providers, shownProviders());
+    }
 
     private int shownProviders() {
         return solo.getCurrentViews(ListView.class).get(0).getCount();
@@ -53,10 +56,10 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
 
         return predefined_providers;
     }
-	
-	public void testSelectProvider() {
+
+    public void testSelectProvider() {
         selectProvider("demo.bitmask.net");
-	}
+    }
 
     private void selectProvider(String provider) {
         solo.clickOnText(provider);
@@ -70,12 +73,12 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
 
     public void testAddNewProvider() {
         addProvider("calyx.net");
-	}
+    }
 
     private void addProvider(String url) {
         boolean is_new_provider = !solo.searchText(url);
-        if(is_new_provider)
-            added_providers = added_providers+1;
+        if (is_new_provider)
+            added_providers = added_providers + 1;
         solo.clickOnActionBarItem(R.id.new_provider);
         solo.enterText(0, url);
         solo.clickOnCheckBox(0);
@@ -83,10 +86,10 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
         waitForProviderDetails();
         solo.goBack();
     }
-	
-	public void testShowAbout() {
-		showAbout();
-	}
+
+    public void testShowAbout() {
+        showAbout();
+    }
 
     private void showAbout() {
         String text = solo.getString(R.string.about);
-- 
cgit v1.2.3


From 5734bbe4e7e509b81c6670c8a40225997593ddef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 27 Mar 2015 13:40:12 +0100
Subject: Just coded, not tested

---
 .../test/testConfigurationWizard.java              | 72 +++++++++++++++++++++-
 1 file changed, 70 insertions(+), 2 deletions(-)

(limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java')

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
index 7a19409b..c01e21c6 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -1,6 +1,14 @@
 package se.leap.bitmaskclient.test;
 
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.test.*;
+import android.view.ActionProvider;
+import android.view.ContextMenu;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
 import android.widget.*;
 
 import com.robotium.solo.*;
@@ -97,14 +105,74 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
         assertTrue("Provider details dialog did not appear", solo.waitForActivity(AboutActivity.class));
     }
 
-    protected void toDashboard(String provider) {
+    protected void toDashboardAnonymously(String provider) {
         selectProvider(provider);
         useAnonymously();
     }
 
     private void useAnonymously() {
         String text = solo.getString(R.string.use_anonymously_button);
-        solo.clickOnText(text);
+        clickAndWaitForDashboard(text);
+    }
+
+    protected void toDashboardRegistered(String provider) {
+        selectProvider(provider);
+        useRegistered();
+    }
+
+    private void useRegistered() {
+        String text = solo.getString(R.string.signup_or_login_button);
+        clickAndWaitForDashboard(text);
+        login();
+    }
+
+    private void login() {
+        long milliseconds_to_log_in = 40 * 1000;
+        logIn("parmegvtest10", "holahola2");
+        solo.waitForDialogToClose(milliseconds_to_log_in);
+        assertSuccessfulLogin();
+    }
+
+    private void logIn(String username, String password) {
+        solo.clickOnActionBarItem(R.id.login_button);
+        solo.enterText(0, username);
+        solo.enterText(1, password);
+        solo.clickOnText("Log In");
+        solo.waitForDialogToClose();
+    }
+
+    private void assertSuccessfulLogin() {
+        String message = solo.getString(R.string.succesful_authentication_message);
+        assertTrue(solo.waitForText(message));
+    }
+
+    private void clickAndWaitForDashboard(String click_text) {
+        solo.clickOnText(click_text);
         solo.waitForText(solo.getString(R.string.title_activity_dashboard));
     }
+
+    public void testEveryProvider() {
+        toDashboardAnonymously("demo.bitmask.net");
+        connectAndComeBack();
+
+        toDashboardRegistered("calyx.net");
+        connectAndComeBack();
+
+        toDashboardRegistered("riseup.net");
+        connectAndComeBack();
+
+    }
+
+    private void connectAndComeBack() {
+        solo.clickOnView(solo.getView(R.id.eipSwitch));
+        if(!solo.waitForText(solo.getString(R.string.eip_state_connected)))
+            fail();
+
+        solo.clickOnView(solo.getView(R.id.eipSwitch));
+        if(!solo.waitForText(solo.getString(R.string.eip_state_not_connected)))
+            fail();
+
+        solo.clickOnMenuItem(solo.getString(R.string.switch_provider_menu_option));
+
+    }
 }
-- 
cgit v1.2.3


From 76396cda955c3681db9aa86224f465e3fd2ebf4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 30 Mar 2015 17:53:50 +0200
Subject: testEveryProvider() coded and working.

Calyx fails.
---
 .../test/testConfigurationWizard.java              | 25 ++++++----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java')

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
index c01e21c6..efb843f7 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -40,7 +40,7 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
 
     @Override
     protected void tearDown() throws Exception {
-        solo.finishOpenedActivities();
+
     }
 
     public void testListProviders() {
@@ -115,6 +115,11 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
         clickAndWaitForDashboard(text);
     }
 
+    private void clickAndWaitForDashboard(String click_text) {
+        solo.clickOnText(click_text);
+        assertTrue(solo.waitForActivity(Dashboard.class, 5000));
+    }
+
     protected void toDashboardRegistered(String provider) {
         selectProvider(provider);
         useRegistered();
@@ -146,23 +151,6 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
         assertTrue(solo.waitForText(message));
     }
 
-    private void clickAndWaitForDashboard(String click_text) {
-        solo.clickOnText(click_text);
-        solo.waitForText(solo.getString(R.string.title_activity_dashboard));
-    }
-
-    public void testEveryProvider() {
-        toDashboardAnonymously("demo.bitmask.net");
-        connectAndComeBack();
-
-        toDashboardRegistered("calyx.net");
-        connectAndComeBack();
-
-        toDashboardRegistered("riseup.net");
-        connectAndComeBack();
-
-    }
-
     private void connectAndComeBack() {
         solo.clickOnView(solo.getView(R.id.eipSwitch));
         if(!solo.waitForText(solo.getString(R.string.eip_state_connected)))
@@ -173,6 +161,5 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
             fail();
 
         solo.clickOnMenuItem(solo.getString(R.string.switch_provider_menu_option));
-
     }
 }
-- 
cgit v1.2.3


From 9ddbecd55d29923543f224d773c5c16e98276332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 30 Mar 2015 18:16:13 +0200
Subject: Cleaning moved methods.

---
 .../test/testConfigurationWizard.java              | 51 ----------------------
 1 file changed, 51 deletions(-)

(limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java')

diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
index efb843f7..1fa4cf2f 100644
--- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -1,14 +1,6 @@
 package se.leap.bitmaskclient.test;
 
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.test.*;
-import android.view.ActionProvider;
-import android.view.ContextMenu;
-import android.view.MenuItem;
-import android.view.SubMenu;
-import android.view.View;
 import android.widget.*;
 
 import com.robotium.solo.*;
@@ -119,47 +111,4 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
         solo.clickOnText(click_text);
         assertTrue(solo.waitForActivity(Dashboard.class, 5000));
     }
-
-    protected void toDashboardRegistered(String provider) {
-        selectProvider(provider);
-        useRegistered();
-    }
-
-    private void useRegistered() {
-        String text = solo.getString(R.string.signup_or_login_button);
-        clickAndWaitForDashboard(text);
-        login();
-    }
-
-    private void login() {
-        long milliseconds_to_log_in = 40 * 1000;
-        logIn("parmegvtest10", "holahola2");
-        solo.waitForDialogToClose(milliseconds_to_log_in);
-        assertSuccessfulLogin();
-    }
-
-    private void logIn(String username, String password) {
-        solo.clickOnActionBarItem(R.id.login_button);
-        solo.enterText(0, username);
-        solo.enterText(1, password);
-        solo.clickOnText("Log In");
-        solo.waitForDialogToClose();
-    }
-
-    private void assertSuccessfulLogin() {
-        String message = solo.getString(R.string.succesful_authentication_message);
-        assertTrue(solo.waitForText(message));
-    }
-
-    private void connectAndComeBack() {
-        solo.clickOnView(solo.getView(R.id.eipSwitch));
-        if(!solo.waitForText(solo.getString(R.string.eip_state_connected)))
-            fail();
-
-        solo.clickOnView(solo.getView(R.id.eipSwitch));
-        if(!solo.waitForText(solo.getString(R.string.eip_state_not_connected)))
-            fail();
-
-        solo.clickOnMenuItem(solo.getString(R.string.switch_provider_menu_option));
-    }
 }
-- 
cgit v1.2.3