X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/cefcf53e9e34e6b4de0449a6c24fb1872a42258f..aa9abc55b4195e3dadd8f0985322e4f49b88c4b9:/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 87363840..ad72e36a 100644
--- a/automationTest/src/test/java/androidtest/tests/CreateFolderTestSuite.java
+++ b/automationTest/src/test/java/androidtest/tests/CreateFolderTestSuite.java
@@ -1,54 +1,56 @@
 package androidtest.tests;
 
-import io.appium.java_client.android.AndroidElement;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.runners.MethodSorters;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 
-
 import androidtest.actions.Actions;
 import androidtest.models.MainView;
+import androidtest.models.WaitAMomentPopUp;
 
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class CreateFolderTestSuite extends CommonTest{
+public class CreateFolderTestSuite extends Common{
+	
+	private Boolean folderHasBeenCreated = false;
+	private final String FOLDER_NAME = "testCreateFolder";
+	private String CurrentCreatedFolder = "";
 
 	@Before
 	public void setUp() throws Exception {
 		setUpCommonDriver();
 	}
 
-
 	@Test
-	public void test6CreateNewFolder () throws Exception {
+	public void testCreateNewFolder () throws Exception {
 		String NEW_FOLDER_NAME = "testCreateFolder";
 
-		MainView mainView = login(Config.URL, Config.user,Config.password);
+		MainView mainView = Actions.login(Config.URL, Config.user,Config.password, Config.isTrusted, driver);
 		assertTrue(waitForTextPresent("ownCloud", mainView.getTitleTextElement()));
-		mainView.clickOnNewFolderButton();
-		mainView.typeNewFolderName(NEW_FOLDER_NAME);
-		mainView.clickOnNewFolderOkButton();
-		assertTrue(waitForTextPresent("Wait a moment" , mainView.getWaitAMomentTextElement()));
-		while(mainView.getWaitAMomentTextElement().isDisplayed()){}
-		AndroidElement newFolderElement = mainView.scrollTillFindElement(NEW_FOLDER_NAME);
-		assertTrue(newFolderElement.isDisplayed());
-		newFolderElement.tap(1, 1000);
-		mainView.clickOnRemoveFileElement();
-		mainView.clickOnRemoteAndLocalButton();
-		assertTrue(waitForTextPresent("Wait a moment" , mainView.getWaitAMomentTextElement()));
-		while(mainView.getWaitAMomentTextElement().isDisplayed()){}
-		Actions.deleteAccount(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);
+		mainView.scrollTillFindElement(FOLDER_NAME);
+		assertNotNull(mainView.getFileElement());
+		assertTrue(folderHasBeenCreated=mainView.getFileElement().isDisplayed());	
+		CurrentCreatedFolder = FOLDER_NAME;
+		assertEquals(FOLDER_NAME , mainView.getFileElement().getText());
+	}
 
 	@After
 	public void tearDown() throws Exception {
+		takeScreenShotOnFailed(getName());
+		if (folderHasBeenCreated) {
+			MainView mainView = new MainView(driver);
+			Actions.deleteElement(CurrentCreatedFolder, mainView, driver);
+		}
 		driver.removeApp("com.owncloud.android");
 		driver.quit();
 	}
 
 }
-