[jbosstools-commits] JBoss Tools SVN: r39276 - in trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test: smoke and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: jgargula
Date: 2012-03-05 04:38:02 -0500 (Mon, 05 Mar 2012)
New Revision: 39276

Modified:
   trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
   trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
   trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java
Log:
Improved code and optimization.


Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java	2012-03-05 08:52:48 UTC (rev 39275)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java	2012-03-05 09:38:02 UTC (rev 39276)
@@ -174,7 +174,7 @@
         delete(new File(pathToDirectoryWithRepository + "repository"));
     }
 
-    private static boolean delete(final File file) {
+    public static boolean delete(final File file) {
         if (!file.exists()) {
             return false;
         }

Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java	2012-03-05 08:52:48 UTC (rev 39275)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java	2012-03-05 09:38:02 UTC (rev 39276)
@@ -154,7 +154,7 @@
     bot.sleep(Timing.time1S());
     KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_ENTER);
     KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER);
-    bot.sleep(Timing.time20S());
+    bot.sleep(Timing.time30S()); // so long because of NFS filesystem on remote machines
     KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_ENTER);
     KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER);
   }

Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java	2012-03-05 08:52:48 UTC (rev 39275)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java	2012-03-05 09:38:02 UTC (rev 39276)
@@ -21,6 +21,7 @@
 import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests;
 import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
 import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.Timing;
 import org.jboss.tools.ui.bot.ext.helper.FileRenameHelper;
 import org.jboss.tools.ui.bot.ext.types.EntityType;
 import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -89,7 +90,7 @@
   private void createDroolsProjectTest(String droolsProjectName){
     createDroolsProject(droolsProjectName);
     SWTTestExt.util.waitForAll(30*1000L);
-    bot.waitForNumberOfShells(1);
+    bot.waitForNumberOfShells(1, 60);
     assertTrue("Project "
       + droolsProjectName 
       + " was not created properly.",SWTEclipseExt.isProjectInPackageExplorer(bot,droolsProjectName));
@@ -151,21 +152,16 @@
     assertNull(checkResult,checkResult);
   }
 
-  /**
-   * Deletes Drools project and check result
-   * @param droolsProjectName
-   */
-  private void deleteDroolsProject(String droolsProjectName){
-
-    packageExplorer.deleteProject(droolsProjectName, true);
-    boolean notFound = false;
-    try{
-      packageExplorer.selectProject(droolsProjectName);
-    }catch (WidgetNotFoundException wnf){
-      notFound = true;
+    /**
+     * Deletes Drools project and check result
+     * 
+     * @param droolsProjectName
+     */
+    private void deleteDroolsProject(final String droolsProjectName) {
+    	bot.sleep(Timing.time10S()); // because of NFS filesystem
+        packageExplorer.deleteProject(droolsProjectName, true);
+        assertFalse("Drools project: " + droolsProjectName + " was not deleted properly",
+        		packageExplorer.existsResource(droolsProjectName));
     }
-    assertTrue("Drools project: " + droolsProjectName +
-      " was not deleted properly",notFound);
-  }
 }