JBoss Tools SVN: r41112 - trunk/drools.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-17 09:49:00 -0400 (Thu, 17 May 2012)
New Revision: 41112
Removed:
trunk/drools/plugins/
Log:
remove empty folder
12 years, 8 months
JBoss Tools SVN: r41111 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: jboss7 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-05-17 08:34:10 -0400 (Thu, 17 May 2012)
New Revision: 41111
Added:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/DetectJBoss7.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/OperateJBoss7.java
Removed:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/DetectJBoss71.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/OperateJBoss71.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss71/
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java
Log:
Renaming
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-17 12:19:25 UTC (rev 41110)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-17 12:34:10 UTC (rev 41111)
@@ -12,16 +12,16 @@
import org.jboss.tools.runtime.as.ui.bot.test.epp5.OperateEPP5;
import org.jboss.tools.runtime.as.ui.bot.test.ewp5.DetectEWP5;
import org.jboss.tools.runtime.as.ui.bot.test.ewp5.OperateEWP5;
-import org.jboss.tools.runtime.as.ui.bot.test.jboss71.DetectJBoss71;
-import org.jboss.tools.runtime.as.ui.bot.test.jboss71.OperateJBoss71;
+import org.jboss.tools.runtime.as.ui.bot.test.jboss7.DetectJBoss7;
+import org.jboss.tools.runtime.as.ui.bot.test.jboss7.OperateJBoss7;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
- DetectJBoss71.class,
- OperateJBoss71.class,
+ DetectJBoss7.class,
+ OperateJBoss7.class,
DetectEAP6.class,
OperateEAP6.class,
DetectEAP5.class,
Copied: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/DetectJBoss7.java (from rev 41110, trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss71/DetectJBoss71.java)
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/DetectJBoss7.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/DetectJBoss7.java 2012-05-17 12:34:10 UTC (rev 41111)
@@ -0,0 +1,25 @@
+package org.jboss.tools.runtime.as.ui.bot.test.jboss7;
+
+import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
+import org.jboss.tools.runtime.as.ui.bot.test.entity.Server;
+import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate;
+
+public class DetectJBoss7 extends DetectServerTemplate {
+
+ public static final String SERVER_ID = "jboss-as-7.1.1.Final";
+
+ @Override
+ protected String getServerID() {
+ return SERVER_ID;
+ }
+
+ @Override
+ protected Server getExpectedServer() {
+ Server expectedServer = new Server();
+ expectedServer.setName(SERVER_ID);
+ expectedServer.setVersion("7.1");
+ expectedServer.setType("AS");
+ expectedServer.setLocation(RuntimeProperties.getInstance().getRuntimePath(SERVER_ID));
+ return expectedServer;
+ }
+}
Deleted: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/DetectJBoss71.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss71/DetectJBoss71.java 2012-05-17 12:19:25 UTC (rev 41110)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/DetectJBoss71.java 2012-05-17 12:34:10 UTC (rev 41111)
@@ -1,25 +0,0 @@
-package org.jboss.tools.runtime.as.ui.bot.test.jboss71;
-
-import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
-import org.jboss.tools.runtime.as.ui.bot.test.entity.Server;
-import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate;
-
-public class DetectJBoss71 extends DetectServerTemplate {
-
- public static final String JBOSS_7_1 = "jboss-as-7.1.1.Final";
-
- @Override
- protected String getServerID() {
- return JBOSS_7_1;
- }
-
- @Override
- protected Server getExpectedServer() {
- Server expectedServer = new Server();
- expectedServer.setName(JBOSS_7_1);
- expectedServer.setVersion("7.1");
- expectedServer.setType("AS");
- expectedServer.setLocation(RuntimeProperties.getInstance().getRuntimePath(JBOSS_7_1));
- return expectedServer;
- }
-}
Copied: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/OperateJBoss7.java (from rev 41110, trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss71/OperateJBoss71.java)
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/OperateJBoss7.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/OperateJBoss7.java 2012-05-17 12:34:10 UTC (rev 41111)
@@ -0,0 +1,11 @@
+package org.jboss.tools.runtime.as.ui.bot.test.jboss7;
+
+import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;
+
+public class OperateJBoss7 extends OperateServerTemplate {
+
+ @Override
+ protected String getServerName() {
+ return DetectJBoss7.SERVER_ID;
+ }
+}
Deleted: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/OperateJBoss71.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss71/OperateJBoss71.java 2012-05-17 12:19:25 UTC (rev 41110)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/OperateJBoss71.java 2012-05-17 12:34:10 UTC (rev 41111)
@@ -1,11 +0,0 @@
-package org.jboss.tools.runtime.as.ui.bot.test.jboss71;
-
-import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;
-
-public class OperateJBoss71 extends OperateServerTemplate {
-
- @Override
- protected String getServerName() {
- return DetectJBoss71.JBOSS_7_1;
- }
-}
12 years, 8 months
JBoss Tools SVN: r41110 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling/3.3.0.Nightly.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-05-17 08:19:25 -0400 (Thu, 17 May 2012)
New Revision: 41110
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
Log:
Fixed composite artifacts
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-17 11:37:44 UTC (rev 41109)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-17 12:19:25 UTC (rev 41110)
@@ -13,17 +13,16 @@
<!-- SOA Tooling : 10 x 1 = 10 -->
-<child location='../../../../staging/soatools-3.3.0.Nightly--bpel/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--droolsjbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--esb/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--flow/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--jbpm/all/repo/'/>
-
-<child location='../../../../staging/soatools-3.3.0.Nightly--modeshape/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--teiid-designer/all/repo/'/>
<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--teiid-designer/all/repo/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-17 11:37:44 UTC (rev 41109)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-17 12:19:25 UTC (rev 41110)
@@ -13,17 +13,16 @@
<!-- SOA Tooling : 10 x 1 = 10 -->
-<child location='../../../../staging/soatools-3.3.0.Nightly--bpel/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--droolsjbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--esb/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--flow/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--jbpm/all/repo/'/>
-
-<child location='../../../../staging/soatools-3.3.0.Nightly--modeshape/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0.Nightly.component--teiid-designer/all/repo/'/>
<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
-<child location='../../../../staging/soatools-3.3.0.Nightly--teiid-designer/all/repo/'/>
</children>
</repository>
12 years, 8 months
JBoss Tools SVN: r41109 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test: resources/template and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-05-17 07:37:44 -0400 (Thu, 17 May 2012)
New Revision: 41109
Added:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/DetectEAP4.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/OperateEAP4.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/DetectEAP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/OperateEAP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/DetectEAP6.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/OperateEAP6.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/DetectEPP4.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/OperateEPP4.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/DetectEPP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/OperateEPP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/DetectEWP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/OperateEWP5.java
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/launchers/prepare_workspace/RT_prepare_workspace.launch
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/resources/template/runtimes.properties
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectServerTemplate.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/OperateServerTemplate.java
Log:
Initial tests commit.
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/launchers/prepare_workspace/RT_prepare_workspace.launch
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/launchers/prepare_workspace/RT_prepare_workspace.launch 2012-05-17 11:36:43 UTC (rev 41108)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/launchers/prepare_workspace/RT_prepare_workspace.launch 2012-05-17 11:37:44 UTC (rev 41109)
@@ -6,7 +6,13 @@
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES">
-<listEntry value="jboss-as-7-1=${folder_prompt:JBoss AS 7.1 installation folder}"/>
+<listEntry value="jboss-as-7=${folder_prompt:JBoss AS 7 installation folder}"/>
+<listEntry value="jboss-eap-6=${folder_prompt:EAP 6 installation folder}"/>
+<listEntry value="jboss-eap-5=${folder_prompt:EAP 5 installation folder}"/>
+<listEntry value="jboss-eap-4=${folder_prompt:EAP 4 installation folder}"/>
+<listEntry value="jboss-epp-5=${folder_prompt:EPP 5 installation folder}"/>
+<listEntry value="jboss-epp-4=${folder_prompt:EPP 4 installation folder}"/>
+<listEntry value="jboss-ewp-5=${folder_prompt:EWP 5 installation folder}"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="/home/ljelinko/programs/apache-maven-3.0.3"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/resources/template/runtimes.properties
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/resources/template/runtimes.properties 2012-05-17 11:36:43 UTC (rev 41108)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/resources/template/runtimes.properties 2012-05-17 11:37:44 UTC (rev 41109)
@@ -1 +1,7 @@
-jboss-as-7.1.1.Final=${jboss-as-7-1}
\ No newline at end of file
+jboss-as-7.1.1.Final=${jboss-as-7}
+jboss-eap-6.0=${jboss-eap-6}
+jboss-eap-5.1=${jboss-eap-5}
+jboss-eap-4.3=${jboss-eap-4}
+jboss-epp-5.2=${jboss-epp-5}
+jboss-epp-4.3=${jboss-epp-4}
+jboss-ewp-5.1=${jboss-ewp-5}
\ No newline at end of file
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-17 11:36:43 UTC (rev 41108)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -1,5 +1,17 @@
package org.jboss.tools.runtime.as.ui.bot.test;
+import org.jboss.tools.runtime.as.ui.bot.test.eap4.DetectEAP4;
+import org.jboss.tools.runtime.as.ui.bot.test.eap4.OperateEAP4;
+import org.jboss.tools.runtime.as.ui.bot.test.eap5.DetectEAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.eap5.OperateEAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.eap6.DetectEAP6;
+import org.jboss.tools.runtime.as.ui.bot.test.eap6.OperateEAP6;
+import org.jboss.tools.runtime.as.ui.bot.test.epp4.DetectEPP4;
+import org.jboss.tools.runtime.as.ui.bot.test.epp4.OperateEPP4;
+import org.jboss.tools.runtime.as.ui.bot.test.epp5.DetectEPP5;
+import org.jboss.tools.runtime.as.ui.bot.test.epp5.OperateEPP5;
+import org.jboss.tools.runtime.as.ui.bot.test.ewp5.DetectEWP5;
+import org.jboss.tools.runtime.as.ui.bot.test.ewp5.OperateEWP5;
import org.jboss.tools.runtime.as.ui.bot.test.jboss71.DetectJBoss71;
import org.jboss.tools.runtime.as.ui.bot.test.jboss71.OperateJBoss71;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
@@ -9,7 +21,19 @@
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
DetectJBoss71.class,
- OperateJBoss71.class
+ OperateJBoss71.class,
+ DetectEAP6.class,
+ OperateEAP6.class,
+ DetectEAP5.class,
+ OperateEAP5.class,
+ DetectEAP4.class,
+ OperateEAP4.class,
+ DetectEPP4.class,
+ OperateEPP4.class,
+ DetectEPP5.class,
+ OperateEPP5.class,
+ DetectEWP5.class,
+ OperateEWP5.class
})
public class AllTestsSuite {
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-05-17 11:36:43 UTC (rev 41108)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -33,6 +33,11 @@
return new SearchingForRuntimesDialog();
}
+ public void removePath(final String path){
+ SWTBotFactory.getBot().table().click(0, 0);
+ SWTBotFactory.getBot().button("Remove").click();
+ }
+
public void ok(){
SWTBotFactory.getBot().button("OK").click();
}
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java 2012-05-17 11:36:43 UTC (rev 41108)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -3,16 +3,25 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.waits.ICondition;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Server;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+import org.jboss.tools.ui.bot.ext.logging.WidgetsLogger;
public class SearchingForRuntimesDialog {
public List<Server> getServers(){
List<Server> servers = new ArrayList<Server>();
- SWTBotTree tree = SWTBotFactory.getBot().tree();
+ WidgetsLogger.log();
+ SWTBot bot = SWTBotFactory.getBot().shell("Searching for runtimes...").bot();
+ bot.waitUntil(new RuntimeSearchedFinished(bot), TaskDuration.LONG.getTimeout());
+ SWTBotTree tree = bot.tree();
+
for (int i = 0; i < tree.rowCount(); i++){
Server server = new Server();
server.setName(tree.cell(i, 0));
@@ -27,4 +36,32 @@
public void ok(){
SWTBotFactory.getBot().button("OK").click();
}
+
+ private static class RuntimeSearchedFinished implements ICondition {
+
+ private SWTBot bot;
+
+ public RuntimeSearchedFinished(SWTBot bot) {
+ this.bot = bot;
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ }
+
+ @Override
+ public boolean test() throws Exception {
+ try {
+ bot.label("Searching runtimes is finished.");
+ return true;
+ } catch (WidgetNotFoundException e){
+ return false;
+ }
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return "The runtime search has not finished in the specified amount of time";
+ }
+ }
}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/DetectEAP4.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/DetectEAP4.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/DetectEAP4.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,25 @@
+package org.jboss.tools.runtime.as.ui.bot.test.eap4;
+
+import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
+import org.jboss.tools.runtime.as.ui.bot.test.entity.Server;
+import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate;
+
+public class DetectEAP4 extends DetectServerTemplate {
+
+ public static final String SERVER_ID = "jboss-eap-4.3";
+
+ @Override
+ protected String getServerID() {
+ return SERVER_ID;
+ }
+
+ @Override
+ protected Server getExpectedServer() {
+ Server server = new Server();
+ server.setName(getServerID());
+ server.setType("EAP");
+ server.setVersion("4.3");
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID()));
+ return server;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/OperateEAP4.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/OperateEAP4.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/OperateEAP4.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,11 @@
+package org.jboss.tools.runtime.as.ui.bot.test.eap4;
+
+import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;
+
+public class OperateEAP4 extends OperateServerTemplate {
+
+ @Override
+ protected String getServerName() {
+ return DetectEAP4.SERVER_ID;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/DetectEAP5.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/DetectEAP5.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/DetectEAP5.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,25 @@
+package org.jboss.tools.runtime.as.ui.bot.test.eap5;
+
+import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
+import org.jboss.tools.runtime.as.ui.bot.test.entity.Server;
+import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate;
+
+public class DetectEAP5 extends DetectServerTemplate {
+
+ public static final String SERVER_ID = "jboss-eap-5.1";
+
+ @Override
+ protected String getServerID() {
+ return SERVER_ID;
+ }
+
+ @Override
+ protected Server getExpectedServer() {
+ Server server = new Server();
+ server.setName(getServerID());
+ server.setType("EAP");
+ server.setVersion("5.1");
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID()));
+ return server;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/OperateEAP5.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/OperateEAP5.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/OperateEAP5.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,11 @@
+package org.jboss.tools.runtime.as.ui.bot.test.eap5;
+
+import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;
+
+public class OperateEAP5 extends OperateServerTemplate {
+
+ @Override
+ protected String getServerName() {
+ return DetectEAP5.SERVER_ID;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/DetectEAP6.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/DetectEAP6.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/DetectEAP6.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,25 @@
+package org.jboss.tools.runtime.as.ui.bot.test.eap6;
+
+import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
+import org.jboss.tools.runtime.as.ui.bot.test.entity.Server;
+import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate;
+
+public class DetectEAP6 extends DetectServerTemplate {
+
+ public static final String SERVER_ID = "jboss-eap-6.0";
+
+ @Override
+ protected String getServerID() {
+ return SERVER_ID;
+ }
+
+ @Override
+ protected Server getExpectedServer() {
+ Server server = new Server();
+ server.setName(getServerID());
+ server.setType("EAP");
+ server.setVersion("6.0");
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID()));
+ return server;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/OperateEAP6.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/OperateEAP6.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/OperateEAP6.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,11 @@
+package org.jboss.tools.runtime.as.ui.bot.test.eap6;
+
+import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;
+
+public class OperateEAP6 extends OperateServerTemplate {
+
+ @Override
+ protected String getServerName() {
+ return DetectEAP6.SERVER_ID;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/DetectEPP4.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/DetectEPP4.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/DetectEPP4.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,25 @@
+package org.jboss.tools.runtime.as.ui.bot.test.epp4;
+
+import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
+import org.jboss.tools.runtime.as.ui.bot.test.entity.Server;
+import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate;
+
+public class DetectEPP4 extends DetectServerTemplate {
+
+ public static final String SERVER_ID = "jboss-epp-4.3";
+
+ @Override
+ protected String getServerID() {
+ return SERVER_ID;
+ }
+
+ @Override
+ protected Server getExpectedServer() {
+ Server server = new Server();
+ server.setName(getServerID());
+ server.setType("EPP");
+ server.setVersion("4.3");
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID()));
+ return server;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/OperateEPP4.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/OperateEPP4.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/OperateEPP4.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,16 @@
+package org.jboss.tools.runtime.as.ui.bot.test.epp4;
+
+import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;
+
+public class OperateEPP4 extends OperateServerTemplate {
+
+ @Override
+ protected String getServerName() {
+ return DetectEPP4.SERVER_ID;
+ }
+
+ @Override
+ protected void assertNoException(String message) {
+ // do not check the exception - it will be there
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/DetectEPP5.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/DetectEPP5.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/DetectEPP5.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,25 @@
+package org.jboss.tools.runtime.as.ui.bot.test.epp5;
+
+import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
+import org.jboss.tools.runtime.as.ui.bot.test.entity.Server;
+import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate;
+
+public class DetectEPP5 extends DetectServerTemplate {
+
+ public static final String SERVER_ID = "jboss-epp-5.2";
+
+ @Override
+ protected String getServerID() {
+ return SERVER_ID;
+ }
+
+ @Override
+ protected Server getExpectedServer() {
+ Server server = new Server();
+ server.setName(getServerID());
+ server.setType("EPP");
+ server.setVersion("5.2");
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID()));
+ return server;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/OperateEPP5.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/OperateEPP5.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/OperateEPP5.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,11 @@
+package org.jboss.tools.runtime.as.ui.bot.test.epp5;
+
+import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;
+
+public class OperateEPP5 extends OperateServerTemplate {
+
+ @Override
+ protected String getServerName() {
+ return DetectEPP5.SERVER_ID;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/DetectEWP5.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/DetectEWP5.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/DetectEWP5.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,25 @@
+package org.jboss.tools.runtime.as.ui.bot.test.ewp5;
+
+import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
+import org.jboss.tools.runtime.as.ui.bot.test.entity.Server;
+import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate;
+
+public class DetectEWP5 extends DetectServerTemplate {
+
+ public static final String SERVER_ID = "jboss-ewp-5.1";
+
+ @Override
+ protected String getServerID() {
+ return SERVER_ID;
+ }
+
+ @Override
+ protected Server getExpectedServer() {
+ Server server = new Server();
+ server.setName(getServerID());
+ server.setType("EWP");
+ server.setVersion("5.1");
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID()));
+ return server;
+ }
+}
Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/OperateEWP5.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/OperateEWP5.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/OperateEWP5.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -0,0 +1,11 @@
+package org.jboss.tools.runtime.as.ui.bot.test.ewp5;
+
+import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;
+
+public class OperateEWP5 extends OperateServerTemplate {
+
+ @Override
+ protected String getServerName() {
+ return DetectEWP5.SERVER_ID;
+ }
+}
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectServerTemplate.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectServerTemplate.java 2012-05-17 11:36:43 UTC (rev 41108)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectServerTemplate.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -35,7 +35,7 @@
preferences.open();
preferences.addPath(RuntimeProperties.getInstance().getRuntimePath(getServerID()));
searchingForRuntimesDialog = preferences.search();
-
+
assertThat(searchingForRuntimesDialog.getServers().size(), is(1));
assertThat(searchingForRuntimesDialog.getServers().get(0), new ServerMatcher(getExpectedServer()));
}
@@ -43,6 +43,7 @@
@After
public void closePreferences(){
searchingForRuntimesDialog.ok();
+ preferences.removePath(RuntimeProperties.getInstance().getRuntimePath(getServerID()));
preferences.ok();
}
}
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/OperateServerTemplate.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/OperateServerTemplate.java 2012-05-17 11:36:43 UTC (rev 41108)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/OperateServerTemplate.java 2012-05-17 11:37:44 UTC (rev 41109)
@@ -23,41 +23,46 @@
protected abstract String getServerName();
@Test
- public void startJBoss71(){
+ public void operateServer(){
+ startServer();
+ restartServer();
+ stopServer();
+ deleteServer();
+ }
+
+ public void startServer(){
serversView.startServer(getServerName());
-
- assertNoException();
- assertServerState("Started");
+
+ assertNoException("Starting server");
+ assertServerState("Starting server", "Started");
+
}
- @Test
- public void restartJBoss71(){
+ public void restartServer(){
serversView.restartServer(getServerName());
- assertNoException();
- assertServerState("Started");
+ assertNoException("Restarting server");
+ assertServerState("Restarting server", "Started");
}
- @Test
- public void stopJBoss71(){
+ public void stopServer(){
serversView.stopServer(getServerName());
- assertNoException();
- assertServerState("Stopped");
+ assertNoException("Stopping server");
+ assertServerState("Stopping server", "Stopped");
}
- @Test
- public void deleteJBoss71(){
+ public void deleteServer(){
serversView.deleteServer(getServerName());
- assertFalse(serversView.serverExists(getServerName()));
+ assertFalse("Deleting server", serversView.serverExists(getServerName()));
}
- private void assertNoException() {
- assertThat("Exception:", not(new ConsoleOutputMatcher()));
+ protected void assertNoException(String message) {
+ assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
}
- private void assertServerState(String state) {
- assertThat(serversView.getServerStatus(getServerName()), is(state));
+ protected void assertServerState(String message, String state) {
+ assertThat(message, serversView.getServerStatus(getServerName()), is(state));
}
}
12 years, 8 months
JBoss Tools SVN: r41108 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-05-17 07:36:43 -0400 (Thu, 17 May 2012)
New Revision: 41108
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java
Log:
Added check if the server is already running and if not an exception is thrown.
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java 2012-05-17 11:35:42 UTC (rev 41107)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java 2012-05-17 11:36:43 UTC (rev 41108)
@@ -14,6 +14,7 @@
import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.ServerServers;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ui.bot.ext.logging.WidgetsLogger;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
public class ServersView extends ViewBase {
@@ -152,6 +153,12 @@
log.error(ex);
}
}
+ try {
+ bot.shell("Server already running on localhost");
+ throw new RuntimeException("Another server is running on localhost");
+ } catch (WidgetNotFoundException e) {
+ // ok, nothing to do
+ }
util.waitForNonIgnoredJobs(Timing.time(600 * 1000));
util.waitForAll(Timing.time3S());
}
12 years, 8 months
JBoss Tools SVN: r41107 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-05-17 07:35:42 -0400 (Thu, 17 May 2012)
New Revision: 41107
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
Log:
removed version from org.eclipse.swtbot.forms.finder
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2012-05-17 09:48:42 UTC (rev 41106)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2012-05-17 11:35:42 UTC (rev 41107)
@@ -52,7 +52,7 @@
org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.swtbot.forms.finder;bundle-version="2.0.5"
+ org.eclipse.swtbot.forms.finder
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.gef,
12 years, 8 months
JBoss Tools SVN: r41106 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-17 05:48:42 -0400 (Thu, 17 May 2012)
New Revision: 41106
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
Log:
JBIDE-11875 extension points to be deleted
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2012-05-17 09:26:50 UTC (rev 41105)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2012-05-17 09:48:42 UTC (rev 41106)
@@ -8,22 +8,6 @@
name="Project Package"/>
</extension>
- <extension
- point="org.jboss.ide.eclipse.archives.core.archiveTypes">
- <packageType
- class="org.jboss.ide.eclipse.archives.webtools.archivetypes.WarArchiveType"
- id="org.jboss.ide.eclipse.as.core.packages.warArchive"
- label="WAR"/>
- <packageType
- class="org.jboss.ide.eclipse.archives.webtools.archivetypes.EjbArchiveType"
- id="org.jboss.ide.eclipse.as.core.packages.ejbPackageType"
- label="EJB JAR"/>
- <packageType
- class="org.jboss.ide.eclipse.archives.webtools.archivetypes.EarArchiveType"
- id="org.jboss.ide.eclipse.as.core.packages.earPackageType"
- label="EAR"/>
- </extension>
-
<!-- Adapters and clients to make stuff 'runnable' on server -->
<extension
point="org.eclipse.wst.server.core.moduleArtifactAdapters">
12 years, 8 months
JBoss Tools SVN: r41104 - in trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests: examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-05-16 23:14:06 -0400 (Wed, 16 May 2012)
New Revision: 41104
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
Log:
Commented out editing test - JBIDE-11616
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-05-17 01:12:26 UTC (rev 41103)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-05-17 03:14:06 UTC (rev 41104)
@@ -14,8 +14,10 @@
import org.jboss.tools.esb.ui.bot.tests.examples.HelloWorldAction;
import org.jboss.tools.esb.ui.bot.tests.examples.HelloWorldFileAction;
import org.jboss.tools.esb.ui.bot.tests.examples.SmooksCSV2XML;
+import org.jboss.tools.esb.ui.bot.tests.examples.SmooksXML2POJO;
import org.jboss.tools.esb.ui.bot.tests.examples.SmooksXML2XMLSimple;
import org.jboss.tools.esb.ui.bot.tests.examples.SmooksXML2XMLDateManipulation;
+import org.jboss.tools.esb.ui.bot.tests.examples.SimpleEAPTest;
import org.jboss.tools.esb.ui.bot.tests.examples.WebServiceConsumer1;
import org.jboss.tools.esb.ui.bot.tests.examples.WebServiceProducer;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
@@ -27,15 +29,17 @@
CreateRuntimeFromSOA.class,
NewProjectUsingRuntime.class,
NewProjectUsingBundledInEAP.class,
- Editing.class,
+ //Editing.class, // https://issues.jboss.org/browse/JBIDE-11616
HelloWorld.class,
HelloWorldAction.class,
HelloWorldFileAction.class,
- WebServiceConsumer1.class,
- WebServiceProducer.class,
SmooksCSV2XML.class,
+ SmooksXML2POJO.class,
SmooksXML2XMLDateManipulation.class,
- SmooksXML2XMLSimple.class
+ SmooksXML2XMLSimple.class,
+ WebServiceConsumer1.class,
+ WebServiceProducer.class
+ //SimpleEAPTest.class
})
@RunWith(RequirementAwareSuite.class)
public class ESBAllBotTests {
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-17 01:12:26 UTC (rev 41103)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-17 03:14:06 UTC (rev 41104)
@@ -61,7 +61,7 @@
openESBConfig();
/* Temporary fix to workaround JBDS-2011 */
- System.out.println ("DEBUG - name = " + getExampleProjectName() );
+ //System.out.println ("DEBUG - name = " + getExampleProjectName() );
if (!getExampleProjectName().equals("transform_CSV2XML")) {
assertProblemsView();
}
12 years, 8 months
JBoss Tools SVN: r41103 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-16 21:12:26 -0400 (Wed, 16 May 2012)
New Revision: 41103
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java
Log:
JBIDE-11552
https://issues.jboss.org/browse/JBIDE-11552
File javax.enterprise.inject.spi.Extension can contain comments - lines that start with #.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2012-05-16 23:47:31 UTC (rev 41102)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2012-05-17 01:12:26 UTC (rev 41103)
@@ -258,9 +258,10 @@
Set<String> result = new HashSet<String>();
String text = ((FileAnyImpl)o).getAsText();
if(text == null || text.length() == 0) return EMPTY_RUNTIMES;
- StringTokenizer st = new StringTokenizer(text, " \r\n\t");
+ StringTokenizer st = new StringTokenizer(text, "\r\n\t"); //$NON-NLS-1$
while(st.hasMoreTokens()) {
String t = st.nextToken().trim();
+ if(t.length() == 0 || t.startsWith("#")) continue;
if(t.length() > 0) result.add(t);
}
return result;
12 years, 8 months