fix last remaining tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -76,6 +76,7 @@ public abstract class AbstractIT {
     @BeforeClass
     public static void beforeAll() {
         try {
+            // clean up
             targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
             AccountManager platformAccountManager = AccountManager.get(targetContext);
 

src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java

@@ -54,7 +54,14 @@ public abstract class AbstractOnServerIT extends AbstractIT {
     @BeforeClass
     public static void beforeAll() {
         try {
+            // clean up
             targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+            AccountManager platformAccountManager = AccountManager.get(targetContext);
+
+            for (Account account : platformAccountManager.getAccounts()) {
+                platformAccountManager.removeAccountExplicitly(account);
+            }
+
             Bundle arguments = androidx.test.platform.app.InstrumentationRegistry.getArguments();
 
             Uri baseUrl = Uri.parse(arguments.getString("TEST_SERVER_URL"));
@@ -64,7 +71,6 @@ public abstract class AbstractOnServerIT extends AbstractIT {
             Account temp = new Account(loginName + "@" + baseUrl, MainApp.getAccountType(targetContext));
             UserAccountManager accountManager = UserAccountManagerImpl.fromContext(targetContext);
             if (!accountManager.exists(temp)) {
-                AccountManager platformAccountManager = AccountManager.get(targetContext);
                 platformAccountManager.addAccountExplicitly(temp, password, null);
                 platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_ACCOUNT_VERSION,
                                                    Integer.toString(UserAccountManager.ACCOUNT_VERSION));

src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.java

@@ -57,6 +57,7 @@ public class DrawerActivityIT extends AbstractOnServerIT {
     @Rule
     public final GrantPermissionRule permissionRule = GrantPermissionRule.grant(
         Manifest.permission.WRITE_EXTERNAL_STORAGE);
+    private static Account account1;
     private static Account account2;
     private static String account2Name;
     private static String account2DisplayName;
@@ -65,37 +66,49 @@ public class DrawerActivityIT extends AbstractOnServerIT {
     public static void beforeClass() {
         Bundle arguments = androidx.test.platform.app.InstrumentationRegistry.getArguments();
         Uri baseUrl = Uri.parse(arguments.getString("TEST_SERVER_URL"));
-        String loginName = "user1";
-        String password = "user1";
 
         AccountManager platformAccountManager = AccountManager.get(targetContext);
+        UserAccountManager userAccountManager = UserAccountManagerImpl.fromContext(targetContext);
 
         for (Account account : platformAccountManager.getAccounts()) {
             platformAccountManager.removeAccountExplicitly(account);
         }
 
+        String loginName = "user1";
+        String password = "user1";
+
         Account temp = new Account(loginName + "@" + baseUrl, MainApp.getAccountType(targetContext));
-        UserAccountManager accountManager = UserAccountManagerImpl.fromContext(targetContext);
-        if (!accountManager.exists(temp)) {
-            platformAccountManager.addAccountExplicitly(temp, password, null);
-            platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_ACCOUNT_VERSION,
-                                               Integer.toString(UserAccountManager.ACCOUNT_VERSION));
-            platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_VERSION, "14.0.0.0");
-            platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_BASE_URL, baseUrl.toString());
-            platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_USER_ID, loginName); // same as userId
-        }
+        platformAccountManager.addAccountExplicitly(temp, password, null);
+        platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_ACCOUNT_VERSION,
+                                           Integer.toString(UserAccountManager.ACCOUNT_VERSION));
+        platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_VERSION, "14.0.0.0");
+        platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_BASE_URL, baseUrl.toString());
+        platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_USER_ID, loginName); // same as userId
+
+        account1 = userAccountManager.getAccountByName(loginName + "@" + baseUrl);
+
+        baseUrl = Uri.parse("server.com");
+        loginName = "user2";
+        password = "user2";
+
+        temp = new Account(loginName + "@" + baseUrl, MainApp.getAccountType(targetContext));
+        platformAccountManager.addAccountExplicitly(temp, password, null);
+        platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_ACCOUNT_VERSION,
+                                           Integer.toString(UserAccountManager.ACCOUNT_VERSION));
+        platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_VERSION, "14.0.0.0");
+        platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_OC_BASE_URL, baseUrl.toString());
+        platformAccountManager.setUserData(temp, AccountUtils.Constants.KEY_USER_ID, loginName); // same as userId
 
-        final UserAccountManager userAccountManager = UserAccountManagerImpl.fromContext(targetContext);
         account2 = userAccountManager.getAccountByName(loginName + "@" + baseUrl);
         account2Name = loginName + "@" + baseUrl;
-        account2DisplayName = "User One@" + baseUrl;
+        account2DisplayName = "User Two@" + baseUrl;
     }
 
     @Test
     public void switchAccountViaAccountList() {
         FileDisplayActivity sut = activityRule.launchActivity(null);
 
-        assertEquals(account, sut.getUser().get().toPlatformAccount());
+        assertEquals(account1, sut.getUser().get().toPlatformAccount());
 
         onView(withId(R.id.switch_account_button)).perform(click());
 
@@ -106,6 +119,6 @@ public class DrawerActivityIT extends AbstractOnServerIT {
         assertEquals(account2, sut.getUser().get().toPlatformAccount());
 
         onView(withId(R.id.switch_account_button)).perform(click());
-        onView(withText(account.name)).perform(click());
+        onView(withText(account1.name)).perform(click());
     }
 }

src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentIT.kt

@@ -165,7 +165,7 @@ class OCFileListFragmentIT : AbstractOnServerIT() {
 
         // switch back to light mode
         preferences.darkThemeMode = DarkMode.LIGHT
-        MainApp.setAppTheme(DarkMode.LIGHT)
+        sut.onActivity { MainApp.setAppTheme(DarkMode.LIGHT) }
 
         shortSleep()
         sut.onActivity { activity -> activity.onBackPressed() }