Author: jgargula Date: 2012-04-20 08:23:36 -0400 (Fri, 20 Apr 2012) New Revision: 40380 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/DroolsViewsTest.java Log: Fixed removing previosly created files by Guvnor. 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-04-20 11:31:43 UTC (rev 40379) +++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2012-04-20 12:23:36 UTC (rev 40380) @@ -28,6 +28,7 @@ import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.config.ServerBean; import org.jboss.tools.ui.bot.ext.config.TestConfigurator; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.ext.types.PerspectiveType; @@ -73,8 +74,7 @@ public static final String RULE_FLOW_JAVA_TEST_FILE_NAME = "ProcessTest.java"; public static final String RULE_FLOW_RF_FILE_NAME = "ruleflow.rf"; public static final String RULE_FLOW_SAMPLE_FILE_NAME = "sample.bpmn"; - // this variable should be set in ManageDroolsProject class according to - // used Drools version + // this variable should be set in ManageDroolsProject class according to used Drools version public static String RULE_FLOW_FILE_NAME = RULE_FLOW_SAMPLE_FILE_NAME; // default choice public static final String DECISION_TABLE_JAVA_TEST_FILE_NAME = "DecisionTableTest.java"; public static final String USE_EXTERNAL_DROOLS_RUNTIME_PROPERTY_NAME = "use-external-drools-runtime"; @@ -143,8 +143,7 @@ DroolsAllBotTests.DROOLS_RUNTIME_LOCATION = droolsRuntimeLocation; } DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION = tmpDir + File.separator + "drools"; - // Create directory for Drools Runtime which will be created as a part - // of test + // Create directory for Drools Runtime which will be created as a part of test new File(DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION).mkdir(); try { bot.button(IDELabel.Button.NO).click(); @@ -168,9 +167,12 @@ eclipse.maximizeActiveShell(); // Removes legacy files after previous run - final String serverHome = TestConfigurator.currentConfig.getServer().runtimeHome; - if (serverHome != null) { - deleteGuvnorRepositoryIfExists(serverHome + "/bin/"); + ServerBean server = TestConfigurator.currentConfig.getServer(); + if (server != null) { + final String serverHome = server.runtimeHome; + if (serverHome != null) { + deleteGuvnorRepositoryIfExists(serverHome + "/bin/"); + } } } Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java =================================================================== --- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java 2012-04-20 11:31:43 UTC (rev 40379) +++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java 2012-04-20 12:23:36 UTC (rev 40380) @@ -69,12 +69,14 @@ while (!eclipse.isDebugging()) { bot.sleep(Timing.time500MS()); } + // waits for stopping at breakpoint while (!eclipse.isSuspendedAtBreakpoint()) { bot.sleep(Timing.time1S()); } isFirstTimeRun = false; + bot.sleep(Timing.time1S()); } /** @@ -91,7 +93,6 @@ * and creates brand new project. */ private void manageProject() { - //packageExplorer.deleteAllProjects(); ManageDroolsProject.createDroolsProject(PROJECT_NAME); Widget openingProjectWidget = null;