Author: vpakan(a)redhat.com Date: 2011-09-05 13:15:43 -0400 (Mon, 05 Sep 2011) New Revision: 34529 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 trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java Log: Use RequirementAwareSuite as runner for tests 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 2011-09-05 17:01:54 UTC (rev 34528) +++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2011-09-05 17:15:43 UTC (rev 34529) @@ -24,6 +24,7 @@ import org.jboss.tools.drools.ui.bot.test.smoke.DroolsRulesEditorTest; import org.jboss.tools.drools.ui.bot.test.smoke.OpenDroolsPerspective; import org.jboss.tools.drools.ui.bot.test.smoke.RuleFlowTest; +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.types.IDELabel; @@ -31,7 +32,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; /** @@ -41,8 +41,9 @@ * @author Vladimir Pakan * */ -(a)RunWith(Suite.class) -(a)SuiteClasses({OpenDroolsPerspective.class, +(a)RunWith(RequirementAwareSuite.class) +@SuiteClasses({ + OpenDroolsPerspective.class, ManageDroolsRuntime.class, ManageDroolsProject.class, ManageDroolsRules.class, 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 2011-09-05 17:01:54 UTC (rev 34528) +++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2011-09-05 17:15:43 UTC (rev 34529) @@ -31,6 +31,9 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.hamcrest.Matcher; import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.requirement.PrepareViews; import org.jboss.tools.ui.bot.ext.config.requirement.RequirementNotFulfilledException; import org.jboss.tools.ui.bot.ext.config.requirement.StartServer; @@ -55,6 +58,12 @@ * @author Vladimir Pakan * */ +@Require(server = @Server(state = ServerState.Present), +clearProjects=false, +clearWorkspace=false, +runOnce=true, +perspective="Guvnor Repository Exploring" +) public class GuvnorRepositoriesTest extends SWTTestExt{ @SuppressWarnings("unused") private static final Logger log = Logger.getLogger(GuvnorRepositoriesTest.class); @@ -247,10 +256,12 @@ IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM, IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM, fileName); + String editorText = GuvnorRepositoriesTest.trimEditorText(editor.toTextEditor().getText()); + String expectedEditorText = GuvnorRepositoriesTest.trimEditorText(changeText + originalEditorText); assertTrue("Commit to Guvnor Repository was not successful. File " + fileName + " was not commited properly." + - "\nIt has content: " + editor.toTextEditor().getText() + - "\nExpected content: " + changeText + originalEditorText, - editor.toTextEditor().getText().equals(changeText + originalEditorText)); + "\nIt has content: " + editorText + + "\nExpected content: " + expectedEditorText, + editorText.equals(expectedEditorText)); // Test Add To Repository SWTBotTreeItem tiSampleFile = packageExplorer.selectTreeItem(sampleFileName, new String[] {DroolsAllBotTests.DROOLS_PROJECT_NAME, @@ -539,4 +550,10 @@ "\n but is " + editorText,editorText.startsWith(addedChange)); } + private static String trimEditorText (String textToTrim){ + + return textToTrim.replaceAll("\n", "").replaceAll("\t", "").replaceAll("\r", "").replaceAll(" ", ""); + + } + } \ No newline at end of file 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 2011-09-05 17:01:54 UTC (rev 34528) +++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java 2011-09-05 17:15:43 UTC (rev 34529) @@ -73,6 +73,8 @@ } } bot.button(IDELabel.Button.NEXT).click(); + bot.comboBoxWithLabel(IDELabel.NewDroolsProjectDialog.GENERATE_CODE_COMPATIBLE_WITH_COMBO_BOX_LABEL) + .setSelection(IDELabel.NewDroolsProjectDialog.CODE_COMPATIBLE_WITH_50_DROOLS); bot.button(IDELabel.Button.FINISH).click(); SWTTestExt.util.waitForAll(30*1000L); bot.sleep(Timing.time10S()); Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-09-05 17:01:54 UTC (rev 34528) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-09-05 17:15:43 UTC (rev 34529) @@ -433,6 +433,9 @@ public static final class NewDroolsProjectDialog { public static final String NAME = "Project name:"; + public static final String GENERATE_CODE_COMPATIBLE_WITH_COMBO_BOX_LABEL = "Generate code compatible with: "; + public static final String CODE_COMPATIBLE_WITH_51_DROOLS_OR_ABOVE = "Drools 5.1 or above"; + public static final String CODE_COMPATIBLE_WITH_50_DROOLS = "Drools 5.0.x"; }