Author: psrna Date: 2012-06-14 11:28:31 -0400 (Thu, 14 Jun 2012) New Revision: 41986 Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java Log: * Forge tests bot fixes. Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java 2012-06-14 15:07:12 UTC (rev 41985) +++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/PersistenceTest.java 2012-06-14 15:28:31 UTC (rev 41986) @@ -24,6 +24,7 @@ getStyledText().setText("persistence setup\n"); getStyledText().setText("HIBERNATE\n"); getStyledText().setText("JBOSS_AS7\n"); + getStyledText().setText("\n"); //accept default java-ee-spec getStyledText().setText("N\n"); assertTrue(ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3)); @@ -48,11 +49,13 @@ @Test public void openjpaJBossAS7(){ + createProject(); getStyledText().setText("persistence setup\n"); getStyledText().setText("OPENJPA\n"); getStyledText().setText("JBOSS_AS7\n"); + getStyledText().setText("\n"); //accept default java-ee-spec getStyledText().setText("N\n"); assertTrue(ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3)); @@ -73,11 +76,13 @@ @Test public void eclipselinkJBossAS7(){ + createProject(); getStyledText().setText("persistence setup\n"); getStyledText().setText("ECLIPSELINK\n"); getStyledText().setText("JBOSS_AS7\n"); + getStyledText().setText("\n"); //accept default java-ee-spec getStyledText().setText("N\n"); assertTrue(ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3)); @@ -99,11 +104,13 @@ @Test public void infinispanJBossAS7(){ + createProject(); getStyledText().setText("persistence setup\n"); getStyledText().setText("INFINISPAN\n"); getStyledText().setText("JBOSS_AS7\n"); + getStyledText().setText("\n"); //accept default java-ee-spec getStyledText().setText("N\n"); assertTrue(ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3)); Modified: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java 2012-06-14 15:07:12 UTC (rev 41985) +++ trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/src/org/jboss/tools/forge/ui/bot/test/suite/ForgeTest.java 2012-06-14 15:28:31 UTC (rev 41986) @@ -53,7 +53,6 @@ getStyledText().setText("Y\n"); ConsoleUtils.waitUntilTextInConsole("project [" + PROJECT_NAME + "]", TIME_1S, TIME_20S*3); - util.waitForNonIgnoredJobs(); } @@ -66,7 +65,6 @@ getStyledText().setText("Y\n"); ConsoleUtils.waitUntilTextInConsole("project [" + PROJECT_NAME + "]", TIME_1S, TIME_20S*3); - util.waitForNonIgnoredJobs(); } @@ -75,9 +73,11 @@ getStyledText().setText("persistence setup\n"); getStyledText().setText("HIBERNATE\n"); getStyledText().setText("JBOSS_AS7\n"); + getStyledText().setText("\n"); //accept default java-ee-spec getStyledText().setText("N\n"); ConsoleUtils.waitUntilTextInConsole("persistence.xml", TIME_1S, TIME_20S*3); + util.waitForNonIgnoredJobs(); } @@ -168,6 +168,8 @@ if(!isForgeViewActive()) openForgeView(); + if(isForgeRunning()) + return; SWTBotView view = getForgeView(); view.toolbarButton("Start the default Forge runtime").click();