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

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

diff --git a/automationTest/src/test/java/androidtest/tests/RenameFolderTestSuite.java b/automationTest/src/test/java/androidtest/tests/RenameFolderTestSuite.java
index 24c6484..c97c3e0 100644 (file)
--- a/automationTest/src/test/java/androidtest/tests/RenameFolderTestSuite.java
+++ b/automationTest/src/test/java/androidtest/tests/RenameFolderTestSuite.java
@@ -1,11 +1,20 @@
 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 androidtest.actions.Actions;
+import androidtest.groups.NoIgnoreTestCategory;
+import androidtest.groups.SmokeTestCategory;
 import androidtest.models.ElementMenuOptions;
 import androidtest.models.MainView;
 import androidtest.models.NewFolderPopUp;
@@ -13,28 +22,34 @@ import androidtest.models.WaitAMomentPopUp;
 
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class RenameFolderTestSuite extends Common{
+public class RenameFolderTestSuite{
 
+       AndroidDriver driver;
+       Common common;
        private Boolean folderHasBeenCreated = false;
        private final String OLD_FOLDER_NAME = "beforeRemoving";
        private final String FOLDER_NAME = "testCreateFolder";
        private String CurrentCreatedFolder = "";
+       
+       @Rule public TestName name = new TestName();
 
 
        @Before
        public void setUp() throws Exception {
-               setUpCommonDriver();
+               common=new Common();
+               driver=common.setUpCommonDriver();
        }
 
        @Test
+       @Category({NoIgnoreTestCategory.class, SmokeTestCategory.class})
        public void testRenameFolder () throws Exception {
                MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
-               waitForTextPresent("ownCloud", mainView.getTitleTextElement());
+               common.assertIsInMainView();
 
                //TODO. if the folder already exists, do no created
                //create the folder to rename
                WaitAMomentPopUp waitAMomentPopUp = Actions.createFolder(OLD_FOLDER_NAME, mainView);
-               waitTillElementIsNotPresent(waitAMomentPopUp.getWaitAMomentTextElement(), 100);
+               Common.waitTillElementIsNotPresent(waitAMomentPopUp.getWaitAMomentTextElement(), 100);
                mainView.scrollTillFindElement(OLD_FOLDER_NAME);
 
                assertTrue(folderHasBeenCreated = mainView.getFileElement().isDisplayed());
@@ -48,7 +63,7 @@ public class RenameFolderTestSuite extends Common{
                FolderPopUp.typeNewFolderName(FOLDER_NAME);
                FolderPopUp.clickOnNewFolderOkButton();
                CurrentCreatedFolder = FOLDER_NAME;
-               waitTillElementIsNotPresent(waitAMomentPopUp.getWaitAMomentTextElement(), 100);
+               Common.waitTillElementIsNotPresent(waitAMomentPopUp.getWaitAMomentTextElement(), 100);
                mainView.scrollTillFindElement(FOLDER_NAME);
                assertNotNull(mainView.getFileElement());
                assertTrue(folderHasBeenCreated = mainView.getFileElement().isDisplayed());     
@@ -57,7 +72,7 @@ public class RenameFolderTestSuite extends Common{
 
        @After
        public void tearDown() throws Exception {
-               takeScreenShotOnFailed(getName());
+               common.takeScreenShotOnFailed(name.getMethodName());
                if(folderHasBeenCreated){
                        MainView mainView = new MainView(driver);
                        Actions.deleteElement(CurrentCreatedFolder, mainView, driver);