[jbosstools-commits] JBoss Tools SVN: r39475 - 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
jbosstools-commits at lists.jboss.org
Tue Mar 13 12:29:28 EDT 2012
Author: jgargula
Date: 2012-03-13 12:29:27 -0400 (Tue, 13 Mar 2012)
New Revision: 39475
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 closing JBoss Central window and formatted text.
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-13 15:08:29 UTC (rev 39474)
+++ 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-13 16:29:27 UTC (rev 39475)
@@ -45,129 +45,132 @@
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
- OpenDroolsPerspective.class,
- ManageDroolsRuntime.class,
- ManageDroolsProject.class,
- ManageDroolsRules.class,
- DroolsRulesEditorTest.class,
- //GuidedDroolsRulesEditorTest.class,
- DomainSpecificLanguageEditorTest.class,
- RuleFlowTest.class,
- DecisionTableTest.class,
- GuvnorRepositoriesTest.class,
- DroolsViewsTest.class})
+ OpenDroolsPerspective.class,
+ ManageDroolsRuntime.class,
+ ManageDroolsProject.class,
+ ManageDroolsRules.class,
+ DroolsRulesEditorTest.class,
+ // GuidedDroolsRulesEditorTest.class,
+ DomainSpecificLanguageEditorTest.class, RuleFlowTest.class,
+ DecisionTableTest.class, GuvnorRepositoriesTest.class,
+ DroolsViewsTest.class
+})
public class DroolsAllBotTests extends SWTTestExt {
- public static final String DROOLS_PROJECT_NAME = "droolsTest";
- public static final String DROOLS_RUNTIME_NAME = "Drools Test Runtime";
- public static String DROOLS_RUNTIME_LOCATION = null;
- public static String CREATE_DROOLS_RUNTIME_LOCATION = null;
- public static String SRC_MAIN_JAVA_TREE_NODE = "src/main/java";
- public static String SRC_MAIN_RULES_TREE_NODE = "src/main/rules";
- public static String COM_SAMPLE_TREE_NODE = "com.sample";
- public static String DROOLS_TEST_JAVA_TREE_NODE = "DroolsTest.java";
- public static final String TEST_DROOLS_RULE_NAME = "TestRule.drl";
- public static final String SAMPLE_DROOLS_RULE_NAME = "Sample.drl";
- public static final String GUIDED_DROOLS_RULE_NAME = "GuidedRule.brl";
- public static final String DOMAIN_SPECIFIC_LANGUAGE_FILE_NAME = "DslTest.dsl";
- 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
- 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";
- public static final String EXTERNAL_DROOLS_RUTIME_HOME_PROPERTY_NAME = "external-drools-runtime-home";
- public static final String GUVNOR_REPOSITORY_URL_PROPERTY_NAME = "guvnor-repository-url";
- private static boolean USE_EXTERNAL_DROOLS_RUNTIME;
- private static boolean isFirstRun = true;
+ public static final String DROOLS_PROJECT_NAME = "droolsTest";
+ public static final String DROOLS_RUNTIME_NAME = "Drools Test Runtime";
+ public static String DROOLS_RUNTIME_LOCATION = null;
+ public static String CREATE_DROOLS_RUNTIME_LOCATION = null;
+ public static String SRC_MAIN_JAVA_TREE_NODE = "src/main/java";
+ public static String SRC_MAIN_RULES_TREE_NODE = "src/main/rules";
+ public static String COM_SAMPLE_TREE_NODE = "com.sample";
+ public static String DROOLS_TEST_JAVA_TREE_NODE = "DroolsTest.java";
+ public static final String TEST_DROOLS_RULE_NAME = "TestRule.drl";
+ public static final String SAMPLE_DROOLS_RULE_NAME = "Sample.drl";
+ public static final String GUIDED_DROOLS_RULE_NAME = "GuidedRule.brl";
+ public static final String DOMAIN_SPECIFIC_LANGUAGE_FILE_NAME = "DslTest.dsl";
+ 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
+ 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";
+ public static final String EXTERNAL_DROOLS_RUTIME_HOME_PROPERTY_NAME = "external-drools-runtime-home";
+ public static final String GUVNOR_REPOSITORY_URL_PROPERTY_NAME = "guvnor-repository-url";
+ private static boolean USE_EXTERNAL_DROOLS_RUNTIME;
+ private static boolean isFirstRun = true;
- private static String testDroolsRuntimeName = null;
- private static String testDroolsRuntimeLocation = null;
- private static String guvnorRepositoryUrl = null;
- private static String guvnorRepositoryRootTreeItem = "http://localhost:8080/jboss-brms/org.drools.guvnor.Guvnor/webdav/";
-
- public static String getTestDroolsRuntimeName() {
- return testDroolsRuntimeName;
- }
+ private static String testDroolsRuntimeName = null;
+ private static String testDroolsRuntimeLocation = null;
+ private static String guvnorRepositoryUrl = null;
+ private static String guvnorRepositoryRootTreeItem = "http://localhost:8080/jboss-brms/org.drools.guvnor.Guvnor/webdav/";
- public static void setTestDroolsRuntimeName(String testDroolsRuntimeName) {
- DroolsAllBotTests.testDroolsRuntimeName = testDroolsRuntimeName;
- }
+ public static String getTestDroolsRuntimeName() {
+ return testDroolsRuntimeName;
+ }
- public static String getTestDroolsRuntimeLocation() {
- return testDroolsRuntimeLocation;
- }
+ public static void setTestDroolsRuntimeName(String testDroolsRuntimeName) {
+ DroolsAllBotTests.testDroolsRuntimeName = testDroolsRuntimeName;
+ }
- public static void setTestDroolsRuntimeLocation(String testDroolsRuntimeLocation) {
- DroolsAllBotTests.testDroolsRuntimeLocation = testDroolsRuntimeLocation;
- }
-
- public static String getGuvnorRepositoryUrl() {
- return guvnorRepositoryUrl;
- }
+ public static String getTestDroolsRuntimeLocation() {
+ return testDroolsRuntimeLocation;
+ }
- private static void setGuvnorRepositoryUrl(String guvnorRepositoryUrl) {
- DroolsAllBotTests.guvnorRepositoryUrl = guvnorRepositoryUrl;
- }
+ public static void setTestDroolsRuntimeLocation(String testDroolsRuntimeLocation) {
+ DroolsAllBotTests.testDroolsRuntimeLocation = testDroolsRuntimeLocation;
+ }
- public static String getGuvnorRepositoryRootTreeItem() {
- return guvnorRepositoryRootTreeItem;
- }
+ public static String getGuvnorRepositoryUrl() {
+ return guvnorRepositoryUrl;
+ }
- private static void setGuvnorRepositoryRootTreeItem(
- String guvnorRepositoryRootTreeItem) {
- DroolsAllBotTests.guvnorRepositoryRootTreeItem = guvnorRepositoryRootTreeItem;
- }
+ private static void setGuvnorRepositoryUrl(String guvnorRepositoryUrl) {
+ DroolsAllBotTests.guvnorRepositoryUrl = guvnorRepositoryUrl;
+ }
- @BeforeClass
- public static void setUpTest() {
- if (isFirstRun) {
- isFirstRun = false;
- } else {
- return;
+ public static String getGuvnorRepositoryRootTreeItem() {
+ return guvnorRepositoryRootTreeItem;
}
- props = util.loadProperties(Activator.PLUGIN_ID);
- String guvnorRepositoryUrl = props.getProperty(DroolsAllBotTests.GUVNOR_REPOSITORY_URL_PROPERTY_NAME);
- if (guvnorRepositoryUrl != null){
- DroolsAllBotTests.setGuvnorRepositoryUrl(guvnorRepositoryUrl);
- DroolsAllBotTests.setGuvnorRepositoryRootTreeItem("http://localhost:8080" + guvnorRepositoryUrl);
+
+ private static void setGuvnorRepositoryRootTreeItem(String guvnorRepositoryRootTreeItem) {
+ DroolsAllBotTests.guvnorRepositoryRootTreeItem = guvnorRepositoryRootTreeItem;
}
- String useExternalDroolRuntime = props.getProperty(DroolsAllBotTests.USE_EXTERNAL_DROOLS_RUNTIME_PROPERTY_NAME);
- DroolsAllBotTests.USE_EXTERNAL_DROOLS_RUNTIME = useExternalDroolRuntime != null && useExternalDroolRuntime.equalsIgnoreCase("true");
- String droolsRuntimeLocation = props.getProperty(DroolsAllBotTests.EXTERNAL_DROOLS_RUTIME_HOME_PROPERTY_NAME);
- String tmpDir = System.getProperty("java.io.tmpdir");
- if (droolsRuntimeLocation == null || droolsRuntimeLocation.length() == 0) {
- DroolsAllBotTests.DROOLS_RUNTIME_LOCATION = tmpDir;
- }
- else{
- 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
- new File(DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION).mkdir();
- try{
- bot.button(IDELabel.Button.NO).click();
- SWTBotView welcomeView = eclipse.getBot().viewByTitle(IDELabel.View.WELCOME);
- welcomeView.close();
- } catch (WidgetNotFoundException wnfe){
- // Do nothing ignore this error
- }
- // Close JBoss Central editor
- for (SWTBotEditor editor : bot.editors()) {
- if (IDELabel.View.JBOSS_CENTRAL.equals(editor.getTitle())) {
- editor.close();
- break;
- }
- }
- eclipse.openPerspective(PerspectiveType.JAVA);
- eclipse.maximizeActiveShell();
- // Removes legacy files after previous run
- final String serverHome = TestConfigurator.currentConfig.getServer().runtimeHome;
- if (serverHome != null) {
- deleteGuvnorRepositoryIfExists(serverHome + "/bin/");
+ @BeforeClass
+ public static void setUpTest() {
+ if (isFirstRun) {
+ isFirstRun = false;
+ } else {
+ return;
+ }
+ props = util.loadProperties(Activator.PLUGIN_ID);
+ String guvnorRepositoryUrl = props.getProperty(DroolsAllBotTests.GUVNOR_REPOSITORY_URL_PROPERTY_NAME);
+ if (guvnorRepositoryUrl != null) {
+ DroolsAllBotTests.setGuvnorRepositoryUrl(guvnorRepositoryUrl);
+ DroolsAllBotTests.setGuvnorRepositoryRootTreeItem("http://localhost:8080" + guvnorRepositoryUrl);
+ }
+ String useExternalDroolRuntime = props.getProperty(DroolsAllBotTests.USE_EXTERNAL_DROOLS_RUNTIME_PROPERTY_NAME);
+ DroolsAllBotTests.USE_EXTERNAL_DROOLS_RUNTIME = useExternalDroolRuntime != null && useExternalDroolRuntime.equalsIgnoreCase("true");
+ String droolsRuntimeLocation = props.getProperty(DroolsAllBotTests.EXTERNAL_DROOLS_RUTIME_HOME_PROPERTY_NAME);
+ String tmpDir = System.getProperty("java.io.tmpdir");
+ if (droolsRuntimeLocation == null || droolsRuntimeLocation.length() == 0) {
+ DroolsAllBotTests.DROOLS_RUNTIME_LOCATION = tmpDir;
+ } else {
+ 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
+ new File(DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION).mkdir();
+ try {
+ bot.button(IDELabel.Button.NO).click();
+ } catch (WidgetNotFoundException wnfe) {
+ // Do nothing ignore this error
+ }
+ try {
+ SWTBotView welcomeView = eclipse.getBot().viewByTitle(IDELabel.View.WELCOME);
+ welcomeView.close();
+ } catch (WidgetNotFoundException wnfe) {
+ // Do nothing ignore this error
+ }
+ // Close JBoss Central editor
+ for (SWTBotEditor editor : bot.editors()) {
+ if (IDELabel.View.JBOSS_CENTRAL.equals(editor.getTitle())) {
+ editor.close();
+ break;
+ }
+ }
+ eclipse.openPerspective(PerspectiveType.JAVA);
+ eclipse.maximizeActiveShell();
+
+ // Removes legacy files after previous run
+ final String serverHome = TestConfigurator.currentConfig.getServer().runtimeHome;
+ if (serverHome != null) {
+ deleteGuvnorRepositoryIfExists(serverHome + "/bin/");
+ }
}
- }
private static void deleteGuvnorRepositoryIfExists(final String pathToDirectoryWithRepository) {
delete(new File(pathToDirectoryWithRepository + "repository.xml"));
@@ -186,13 +189,13 @@
return file.delete();
}
- public static boolean useExternalDroolsRuntime() {
- return USE_EXTERNAL_DROOLS_RUNTIME;
- }
+ public static boolean useExternalDroolsRuntime() {
+ return USE_EXTERNAL_DROOLS_RUNTIME;
+ }
- @AfterClass
- public static void tearDownTest() {
- // delete created drools runtime
- SWTUtilExt.deleteDirectory(DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION);
- }
+ @AfterClass
+ public static void tearDownTest() {
+ // delete created drools runtime
+ SWTUtilExt.deleteDirectory(DroolsAllBotTests.CREATE_DROOLS_RUNTIME_LOCATION);
+ }
}
\ 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/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-03-13 15:08:29 UTC (rev 39474)
+++ 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-03-13 16:29:27 UTC (rev 39475)
@@ -66,7 +66,7 @@
}
while (eclipse.isDebugging() && !eclipse.isSuspendedAtBreakpoint()) {
- bot.sleep(Timing.time2S());
+ bot.sleep(Timing.time2S());
}
isFirstTimeRun = false;
}
More information about the jbosstools-commits
mailing list