add new testCases. prepare the test to have them into categories

[pub/Android/ownCloud.git] / automationTest / src / test / java / androidtest / tests / LogoutTestSuite.java

diff --git a/automationTest/src/test/java/androidtest/tests/LogoutTestSuite.java b/automationTest/src/test/java/androidtest/tests/LogoutTestSuite.java
index f9f5402..876c0ce 100644 (file)
--- a/automationTest/src/test/java/androidtest/tests/LogoutTestSuite.java
+++ b/automationTest/src/test/java/androidtest/tests/LogoutTestSuite.java
@@ -1,27 +1,42 @@
 package androidtest.tests;
 
 
 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.After;
 import org.junit.Before;

+import org.junit.Rule;

 import org.junit.Test;
 import org.junit.Test;

+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;

 
 import androidtest.actions.Actions;
 
 import androidtest.actions.Actions;

+import androidtest.groups.NoIgnoreTestCategory;
+import androidtest.groups.SmokeTestCategory;

 import androidtest.models.LoginForm;
 import androidtest.models.MainView;
 import androidtest.models.MenuList;
 import androidtest.models.SettingsView;
 
 import androidtest.models.LoginForm;
 import androidtest.models.MainView;
 import androidtest.models.MenuList;
 import androidtest.models.SettingsView;
 

-public class LogoutTestSuite extends Common{
+public class LogoutTestSuite{
+       
+       AndroidDriver driver;
+       Common common;

 
 

+       @Rule public TestName name = new TestName();
+       

        @Before
        public void setUp() throws Exception {
        @Before
        public void setUp() throws Exception {

-               setUpCommonDriver();
+               common=new Common();
+               driver=common.setUpCommonDriver();

        }
 
        @Test
        }
 
        @Test

+       @Category({NoIgnoreTestCategory.class, SmokeTestCategory.class})

        public void testLogout () throws Exception {
                MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
        public void testLogout () throws Exception {
                MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);

-               waitForTextPresent("ownCloud", mainView.getTitleTextElement());
+               common.assertIsInMainView();

                MenuList menulist = mainView.clickOnMenuButton();
                SettingsView settingsView = menulist.clickOnSettingsButton();
                settingsView.tapOnAccountElement(1, 1000);
                MenuList menulist = mainView.clickOnMenuButton();
                SettingsView settingsView = menulist.clickOnSettingsButton();
                settingsView.tapOnAccountElement(1, 1000);


@@ -33,8 +48,8 @@ public class LogoutTestSuite extends Common{
 
        @After
        public void tearDown() throws Exception {
 
        @After
        public void tearDown() throws Exception {

-               takeScreenShotOnFailed(getName());
-               driver.removeApp("com.owncloud.android");
+               common.takeScreenShotOnFailed(name.getMethodName());
+               //driver.removeApp("com.owncloud.android");

                driver.quit();
        }
 }
                driver.quit();
        }
 }