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

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

diff --git a/automationTest/src/test/java/androidtest/tests/DeleteFolderTestSuite.java b/automationTest/src/test/java/androidtest/tests/DeleteFolderTestSuite.java
index f015c1e..fe7aabd 100644 (file)
--- a/automationTest/src/test/java/androidtest/tests/DeleteFolderTestSuite.java
+++ b/automationTest/src/test/java/androidtest/tests/DeleteFolderTestSuite.java
@@ -1,36 +1,50 @@
 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.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 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.MainView;
 import androidtest.models.WaitAMomentPopUp;
 
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 import androidtest.models.MainView;
 import androidtest.models.WaitAMomentPopUp;
 
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

        private Boolean folderHasBeenCreated = false;
        private final String FOLDER_NAME = "testCreateFolder";
        private Boolean folderHasBeenCreated = false;
        private final String FOLDER_NAME = "testCreateFolder";

+       
+       @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 testDeleteFolder () throws Exception {
                MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
        public void testDeleteFolder () 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
                WaitAMomentPopUp waitAMomentPopUp = Actions.createFolder(FOLDER_NAME, mainView);
                
                //TODO. if the folder already exists, do no created
                //create the folder
                WaitAMomentPopUp waitAMomentPopUp = Actions.createFolder(FOLDER_NAME, mainView);

-               waitTillElementIsNotPresent(waitAMomentPopUp.getWaitAMomentTextElement(), 100);
+               Common.waitTillElementIsNotPresent(waitAMomentPopUp.getWaitAMomentTextElement(), 100);

                mainView.scrollTillFindElement(FOLDER_NAME);
                assertTrue(folderHasBeenCreated = mainView.getFileElement().isDisplayed());
 
                mainView.scrollTillFindElement(FOLDER_NAME);
                assertTrue(folderHasBeenCreated = mainView.getFileElement().isDisplayed());
 


@@ -41,7 +55,7 @@ public class DeleteFolderTestSuite extends Common{
 
        @After
        public void tearDown() throws Exception {
 
        @After
        public void tearDown() throws Exception {

-               takeScreenShotOnFailed(getName());
+               common.takeScreenShotOnFailed(name.getMethodName());

                if(folderHasBeenCreated){
                        MainView mainView = new MainView(driver);
                        Actions.deleteElement(FOLDER_NAME, mainView, driver);
                if(folderHasBeenCreated){
                        MainView mainView = new MainView(driver);
                        Actions.deleteElement(FOLDER_NAME, mainView, driver);