X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/2d95a83959c77a0c4820c6668b439f8e1b0d038a..a52fc9424444400d4c774b76cf9f59ba43f9dc12:/automationTest/src/test/java/androidtest/tests/LoginTestSuite.java

diff --git a/automationTest/src/test/java/androidtest/tests/LoginTestSuite.java b/automationTest/src/test/java/androidtest/tests/LoginTestSuite.java
index 0d2553a0..6aa6c2bb 100644
--- a/automationTest/src/test/java/androidtest/tests/LoginTestSuite.java
+++ b/automationTest/src/test/java/androidtest/tests/LoginTestSuite.java
@@ -1,65 +1,76 @@
 package androidtest.tests;
 
+import static org.junit.Assert.*;
+import io.appium.java_client.android.AndroidDriver;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
 import org.junit.runners.MethodSorters;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.openqa.selenium.ScreenOrientation;
 import androidtest.actions.Actions;
+import androidtest.groups.*;
 import androidtest.models.LoginForm;
 import androidtest.models.MainView;
 import androidtest.models.MenuList;
 import androidtest.models.SettingsView;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class LoginTestSuite extends Common{
-
+public class LoginTestSuite{
+	AndroidDriver driver;
+	Common common;
+	
+	@Rule public TestName name = new TestName();
+	
 	@Before
 	public void setUp() throws Exception {
-			setUpCommonDriver();
+		common=new Common();
+		driver=common.setUpCommonDriver();
 	}
 	
 	@Test
+	@Category({NoIgnoreTestCategory.class})
 	public void test1LoginPortrait () throws Exception {
 		driver.rotate(ScreenOrientation.PORTRAIT);
 		
 		MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
-		assertTrue(waitForTextPresent("ownCloud", mainView.getTitleTextElement()));
+		common.assertIsInMainView();
 	}
 	
 	@Test
+	@Category({NoIgnoreTestCategory.class})
 	public void test2LoginLandscape () throws Exception {
 		driver.rotate(ScreenOrientation.LANDSCAPE);
 		MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
-		assertTrue(waitForTextPresent("ownCloud", mainView.getTitleTextElement()));
-		//TO DO. detect in which view is. it can be files view or settings view
+		common.assertIsInMainView();
 	}
 	
 	
 	@Test
+	@Category({NoIgnoreTestCategory.class, SmokeTestCategory.class})
 	public void test3MultiAccountRotate () throws Exception {
 		driver.rotate(ScreenOrientation.LANDSCAPE);
 		MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
-		assertTrue(waitForTextPresent("ownCloud", mainView.getTitleTextElement()));
+		common.assertIsInMainView();
 		
 		driver.rotate(ScreenOrientation.PORTRAIT);
 		MenuList menu = mainView.clickOnMenuButton();
 		SettingsView settingsView = menu.clickOnSettingsButton();
+		
 		settingsView.tapOnAddAccount(1, 1000);
 		mainView = Actions.login(Config.URL2, Config.user2,Config.password2, Config.isTrusted2, driver);
-		
-		assertTrue(waitForTextPresent("Settings", mainView.getTitleTextElement()));
-		//TO DO. detect in which view is. it can be files view or settings view
-		//Actions.deleteAccount(mainView);
-		//TO DO. Delete the second user
+		common.assertIsInSettingsView();
 	}
 	
 	@Test
+	@Category({NoIgnoreTestCategory.class})
 	public void test4ExistingAccountRotate () throws Exception {
 		driver.rotate(ScreenOrientation.PORTRAIT);
 		MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
-		assertTrue(waitForTextPresent("ownCloud", mainView.getTitleTextElement()));
+		common.assertIsInMainView();
 		
 		driver.rotate(ScreenOrientation.LANDSCAPE);
 		MenuList menu = mainView.clickOnMenuButton();
@@ -68,27 +79,28 @@ public class LoginTestSuite extends Common{
 		
 		LoginForm loginForm = new LoginForm(driver);
 		mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);	
-		assertTrue(waitForTextPresent("An account for the same user and server already exists in the device", loginForm.getAuthStatusText()));
+		assertTrue(common.waitForTextPresent("An account for the same user and server already exists in the device", loginForm.getAuthStatusText()));
 	}
 	
-
+	@Test
+	@Category({NoIgnoreTestCategory.class})
 	public void test5ChangePasswordWrong () throws Exception {
-
+		driver.rotate(ScreenOrientation.PORTRAIT);
 		MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
-		assertTrue(waitForTextPresent("ownCloud", mainView.getTitleTextElement()));
+		common.assertIsInMainView();
 		MenuList menu = mainView.clickOnMenuButton();
 		SettingsView settingsView = menu.clickOnSettingsButton();
 		settingsView.tapOnAccountElement(1, 1000);
 		LoginForm changePasswordForm = settingsView.clickOnChangePasswordElement();
 		changePasswordForm.typePassword("WrongPassword");
 		changePasswordForm.clickOnConnectButton();
-		assertTrue(waitForTextPresent("Wrong username or password", changePasswordForm.getAuthStatusText()));
+		assertTrue(common.waitForTextPresent("Wrong username or password", changePasswordForm.getAuthStatusText()));
 	}
 	
 
 	@After
 	public void tearDown() throws Exception {
-		takeScreenShotOnFailed(getName());
+		common.takeScreenShotOnFailed(name.getMethodName());
 		driver.removeApp("com.owncloud.android");
 		driver.quit();
 	}