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

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

diff --git a/automationTest/src/test/java/androidtest/tests/CreateFolderTestSuite.java b/automationTest/src/test/java/androidtest/tests/CreateFolderTestSuite.java
index ad72e36..feaeb0a 100644 (file)
--- a/automationTest/src/test/java/androidtest/tests/CreateFolderTestSuite.java
+++ b/automationTest/src/test/java/androidtest/tests/CreateFolderTestSuite.java
@@ -1,40 +1,54 @@
 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 CreateFolderTestSuite extends Common{
+public class CreateFolderTestSuite{

        
        

+       AndroidDriver driver;
+       Common common;

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

+       
+       @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 testCreateNewFolder () throws Exception {
                String NEW_FOLDER_NAME = "testCreateFolder";
 
                MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
        public void testCreateNewFolder () throws Exception {
                String NEW_FOLDER_NAME = "testCreateFolder";
 
                MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);

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

 
                //check if the folder already exists and if true, delete them
                Actions.deleteElement(NEW_FOLDER_NAME, mainView, driver);
 
                WaitAMomentPopUp waitAMomentPopUp = Actions.createFolder(NEW_FOLDER_NAME, mainView);
 
                //check if the folder already exists and if true, delete them
                Actions.deleteElement(NEW_FOLDER_NAME, mainView, driver);
 
                WaitAMomentPopUp waitAMomentPopUp = Actions.createFolder(NEW_FOLDER_NAME, mainView);

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

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


@@ -44,7 +58,7 @@ public class CreateFolderTestSuite 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(CurrentCreatedFolder, mainView, driver);
                if (folderHasBeenCreated) {
                        MainView mainView = new MainView(driver);
                        Actions.deleteElement(CurrentCreatedFolder, mainView, driver);