JBoss Tools SVN: r42762 - 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-07-27 10:24:16 -0400 (Fri, 27 Jul 2012)
New Revision: 42762
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java
Log:
Added check for nested XML configs
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-07-27 14:23:49 UTC (rev 42761)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java 2012-07-27 14:24:16 UTC (rev 42762)
@@ -361,6 +361,11 @@
List<XMLConfiguration> configurations = new ArrayList<XMLConfiguration>();
for (final SWTBotTreeItem item : category.getItems()){
String[] columns = item.getText().split(separator);
+ if (columns.length < 2){
+ // it is nested node, we should process it recursively in the future
+ // but for now not crucial, let's skip it
+ continue;
+ }
configurations.add(new XMLConfiguration(columns[0].trim(), columns[1].trim()));
}
return configurations;
13 years, 2 months
JBoss Tools SVN: r42761 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-07-27 10:23:49 -0400 (Fri, 27 Jul 2012)
New Revision: 42761
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/LogWidgetsVisitor.java
Log:
Added support for clabel
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/LogWidgetsVisitor.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/LogWidgetsVisitor.java 2012-07-27 14:14:51 UTC (rev 42760)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/logging/LogWidgetsVisitor.java 2012-07-27 14:23:49 UTC (rev 42761)
@@ -57,7 +57,11 @@
@Override
protected void visitCLabel(CLabel widget) {
- log.info(widget);
+ StringBuilder text = new StringBuilder();
+ text.append("CLabel {");
+ text.append(widget.getText());
+ text.append("}");
+ log.info(text.toString());
}
@Override
13 years, 2 months
JBoss Tools SVN: r42760 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: projects and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-07-27 10:14:51 -0400 (Fri, 27 Jul 2012)
New Revision: 42760
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java
Log:
Added tests for JBoss AS6
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-07-27 14:14:51 UTC (rev 42760)
@@ -30,7 +30,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=/home/ljelinko/work/workspaces/jboss-tools/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/} -Xmx1024m -XX:MaxPermSize=256m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.project 2012-06-14 11:48:13 UTC (rev 41967)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jsp-as7</name>
+ <name>jsp-project</name>
<comment></comment>
<projects>
</projects>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.component 2012-06-14 11:48:13 UTC (rev 41967)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="jsp-as7">
+ <wb-module deploy-name="jsp-project">
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
- <property name="context-root" value="jsp-as7"/>
- <property name="java-output-path" value="/jsp-as7/build/classes"/>
+ <property name="context-root" value="jsp-project"/>
+ <property name="java-output-path" value="/jsp-project/build/classes"/>
</wb-module>
</project-modules>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1 @@
+SERVER=AS,6.1,default,/home/ljelinko/programs/jboss/AS/jboss-6.1.0.Final
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,11 +1,15 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.OperateAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.UndeployJSPProjectAS6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeleteAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProject;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.HotDeployJSPFile;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProject;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -13,11 +17,15 @@
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
CreateAS7Server.class,
+ CreateAS6Server.class,
OperateAS7Server.class,
- DeployJSPProject.class,
+ OperateAS6Server.class,
+ DeployJSPProjectAS7Server.class,
+ DeployJSPProjectAS6Server.class,
HotDeployJSPFile.class,
- UndeployJSPProject.class,
- DeleteAS7Server.class
+ UndeployJSPProjectAS7Server.class,
+ UndeployJSPProjectAS6Server.class,
+ DeleteServer.class
})
public class AllTestsSuite {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,11 +1,11 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeleteAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProject;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.HotDeployJSPFile;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProject;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -14,10 +14,10 @@
@Suite.SuiteClasses({
CreateAS7Server.class,
OperateAS7Server.class,
- DeployJSPProject.class,
+ DeployJSPProjectAS7Server.class,
HotDeployJSPFile.class,
- UndeployJSPProject.class,
- DeleteAS7Server.class
+ UndeployJSPProjectAS7Server.class,
+ DeleteServer.class
})
public class EAPCompatibilitySuite {
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,45 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+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.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Present))
+public class CreateAS6Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ assertThat("1090", is(editor.getJMXPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+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.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Running))
+public class DeployJSPProjectAS6Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+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.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.NotRunning))
+public class OperateAS6Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+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.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS6Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -6,36 +6,31 @@
import java.util.List;
-import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
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.Annotations.ServerType;
import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
/**
- * Creates server and checks its ports (in both the server view and server editor)
- *
+ *
+ * @see CreateServerTemplate
* @author Lucia Jelinkova
*
*/
@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Present))
-public class CreateAS7Server extends SWTTestExt {
+public class CreateAS7Server extends CreateServerTemplate {
- @Test
- public void createServer(){
- ServerEditor editor = new ServerEditor(configuredState.getServer().name);
- editor.open();
-
+ @Override
+ protected void assertEditorPorts() {
assertThat("8080", is(editor.getWebPort()));
- assertThat("9999", is(editor.getManagementPort()));
-
- ServersView view = new ServersView();
- List<XMLConfiguration> configurations = view.getXMLConfiguration(configuredState.getServer().name, "Ports");
+ assertThat("9999", is(editor.getManagementPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "${jboss.management.native.port:9999}")));
- assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));
+ assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));
}
}
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,23 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Deletes the server and checks that it is not present on the server's view.
- *
- * @author Lucia Jelinkova
- *
- */
-public class DeleteAS7Server extends SWTTestExt {
-
- private ServersView serversView = new ServersView();
-
- @Test
- public void deleteServer(){
- serversView.deleteServer(configuredState.getServer().name);
-
- assertFalse(serversView.serverExists(configuredState.getServer().name));
- }
-}
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,63 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.Activator;
-import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
-import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.SWTUtilExt;
-import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
-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.Annotations.ServerType;
-import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Imports pre-prepared JSP project and adds it into the server. Checks:
- *
- * <ul>
- * <li>the console output</li>
- * <li>server's label</li>
- * <li>project is listed under the server</li>
- * <li>the index.jsp of the project</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running))
-public class DeployJSPProject extends SWTTestExt {
-
- public static final String PROJECT_NAME = "jsp-as7";
-
- @Before
- public void importProject(){
- ImportProjectWizard wizard = new ImportProjectWizard();
- wizard.setCopyProjectsIntoWorkspace(true);
- wizard.setProjectPath(SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, "projects"));
- wizard.setProjectNames(PROJECT_NAME);
- wizard.execute();
- }
-
- @Test
- public void deployProject(){
- ServersView serversView = new ServersView();
- serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
-
- // console
- assertThat("Registering web context: /" + PROJECT_NAME, new ConsoleOutputMatcher(TaskDuration.NORMAL));
- assertThat("Exception:", not(new ConsoleOutputMatcher()));
- // view
- assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME));
- assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
- assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
- // web
- serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
- assertThat("Hello tests!", new PageSourceMatcher());
- }
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java (from rev 42147, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+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.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running))
+public class DeployJSPProjectAS7Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "Registering web context: /" + PROJECT_NAME;
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -25,12 +25,12 @@
@Test
public void hotDeployment(){
NewFileWizard wizard = new NewFileWizard();
- wizard.setPath(DeployJSPProject.PROJECT_NAME, "WebContent");
+ wizard.setPath(DeployJSPProjectAS7Server.PROJECT_NAME, "WebContent");
wizard.setFileName("hot.jsp");
wizard.setText(JSP_CONTENT);
wizard.execute();
SWTBotFactory.getBot().sleep(5000);
- assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProject.PROJECT_NAME + "/hot.jsp"));
+ assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
}
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,80 +1,22 @@
package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
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.Annotations.ServerType;
-import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
/**
- * Starts, restarts and stops the server and checks:
- * <ul>
- * <li>the console output</li>
- * <li>server's label</li>
- * <li>welcome page is available (if the result state is started)</li>
- * </ul>
+ *
+ * @see OperateServerTemplate
* @author Lucia Jelinkova
*
*/
@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.NotRunning))
-public class OperateAS7Server extends SWTTestExt {
+public class OperateAS7Server extends OperateServerTemplate {
- private ServersView serversView = new ServersView();
-
- protected String getServerName(){
- return configuredState.getServer().name;
+ @Override
+ public String getWelcomePageText() {
+ return "Welcome to EAP 6";
}
-
- @Test
- public void operateServer(){
- startServer();
- restartServer();
- stopServer();
- }
-
- public void startServer(){
- serversView.startServer(getServerName());
- serversView.openWebPage(configuredState.getServer().name);
-
- assertNoException("Starting server");
- assertServerState("Starting server", "Started");
- assertWebPageContains("Welcome to EAP 6");
- }
-
- public void restartServer(){
- serversView.restartServer(getServerName());
- serversView.openWebPage(configuredState.getServer().name);
-
- assertNoException("Restarting server");
- assertServerState("Restarting server", "Started");
- assertWebPageContains("Welcome to EAP 6");
- }
-
- public void stopServer(){
- serversView.stopServer(getServerName());
- serversView.openWebPage(configuredState.getServer().name);
-
- assertNoException("Stopping server");
- assertServerState("Stopping server", "Stopped");
- }
-
- protected void assertNoException(String message) {
- assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
- }
-
- protected void assertServerState(String message, String state) {
- assertThat(message, serversView.getServerStatus(getServerName()), is(state));
- }
-
- private void assertWebPageContains(String string) {
- serversView.openWebPage(configuredState.getServer().name);
- }
}
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,43 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
-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.Annotations.ServerType;
-import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Removes JSP project from server. Checks:
- *
- * <ul>
- * <li>the console output</li>
- * <li>server's label</li>
- * <li>project is not listed under the server</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProject extends SWTTestExt {
-
- @Test
- public void undeployProject(){
- ServersView serversView = new ServersView();
- serversView.removeProjectFromServer(DeployJSPProject.PROJECT_NAME, configuredState.getServer().name);
-
- // console
- assertThat("Undeployed \"" + DeployJSPProject.PROJECT_NAME + ".war\"", new ConsoleOutputMatcher(TaskDuration.NORMAL));
- assertThat("Exception:", not(new ConsoleOutputMatcher()));
- // view
- assertFalse("Server contains project", serversView.containsProject(configuredState.getServer().name, DeployJSPProject.PROJECT_NAME));
- assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
- assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
- }
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java (from rev 42147, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+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.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS7Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -28,6 +28,14 @@
return SWTBotFactory.getBot().textWithLabel("Web").getText();
}
+ public String getJNDIPort(){
+ return SWTBotFactory.getBot().textWithLabel("JNDI").getText();
+ }
+
+ public String getJMXPort(){
+ return SWTBotFactory.getBot().textWithLabel("JMX RMI").getText();
+ }
+
public String getManagementPort(){
return SWTBotFactory.getBot().textWithLabel("Management").getText();
}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Creates server and checks its ports (in both the server view and server editor)
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class CreateServerTemplate extends SWTTestExt {
+
+ protected ServerEditor editor;
+
+ protected abstract void assertEditorPorts();
+
+ protected abstract void assertViewPorts(List<XMLConfiguration> configurations);
+
+ @Test
+ public void createServer(){
+ editor = new ServerEditor(configuredState.getServer().name);
+ editor.open();
+
+ assertEditorPorts();
+
+ ServersView view = new ServersView();
+ List<XMLConfiguration> configurations = view.getXMLConfiguration(configuredState.getServer().name, "Ports");
+ assertViewPorts(configurations);
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,23 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Deletes the server and checks that it is not present on the server's view.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class DeleteServer extends SWTTestExt {
+
+ private ServersView serversView = new ServersView();
+
+ @Test
+ public void deleteServer(){
+ serversView.deleteServer(configuredState.getServer().name);
+
+ assertFalse(serversView.serverExists(configuredState.getServer().name));
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,60 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.Activator;
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
+import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Imports pre-prepared JSP project and adds it into the server. Checks:
+ *
+ * <ul>
+ * <li>the console output</li>
+ * <li>server's label</li>
+ * <li>project is listed under the server</li>
+ * <li>the index.jsp of the project</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class DeployJSPProjectTemplate extends SWTTestExt {
+
+ public static final String PROJECT_NAME = "jsp-project";
+
+ protected abstract String getConsoleMessage();
+
+ @Before
+ public void importProject(){
+ ImportProjectWizard wizard = new ImportProjectWizard();
+ wizard.setCopyProjectsIntoWorkspace(true);
+ wizard.setProjectPath(SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, "projects"));
+ wizard.setProjectNames(PROJECT_NAME);
+ wizard.execute();
+ }
+
+ @Test
+ public void deployProject(){
+ ServersView serversView = new ServersView();
+ serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
+
+ // console
+ assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
+ assertThat("Exception:", not(new ConsoleOutputMatcher()));
+ // view
+ assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME));
+ assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
+ assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
+ // web
+ serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
+ assertThat("Hello tests!", new PageSourceMatcher());
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,76 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Starts, restarts and stops the server and checks:
+ * <ul>
+ * <li>the console output</li>
+ * <li>server's label</li>
+ * <li>welcome page is available (if the result state is started)</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class OperateServerTemplate extends SWTTestExt {
+
+ protected ServersView serversView = new ServersView();
+
+ public abstract String getWelcomePageText();
+
+ protected String getServerName(){
+ return configuredState.getServer().name;
+ }
+
+ @Test
+ public void operateServer(){
+ startServer();
+ restartServer();
+ stopServer();
+ }
+
+ public void startServer(){
+ serversView.startServer(getServerName());
+ serversView.openWebPage(configuredState.getServer().name);
+
+ assertNoException("Starting server");
+ assertServerState("Starting server", "Started");
+ assertWebPageContains(getWelcomePageText());
+ }
+
+ public void restartServer(){
+ serversView.restartServer(getServerName());
+ serversView.openWebPage(configuredState.getServer().name);
+
+ assertNoException("Restarting server");
+ assertServerState("Restarting server", "Started");
+ assertWebPageContains(getWelcomePageText());
+ }
+
+ public void stopServer(){
+ serversView.stopServer(getServerName());
+ serversView.openWebPage(configuredState.getServer().name);
+
+ assertNoException("Stopping server");
+ assertServerState("Stopping server", "Stopped");
+ }
+
+ protected void assertNoException(String message) {
+ assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
+ }
+
+ protected void assertServerState(String message, String state) {
+ assertThat(message, serversView.getServerStatus(getServerName()), is(state));
+ }
+
+ private void assertWebPageContains(String string) {
+ serversView.openWebPage(configuredState.getServer().name);
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,43 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+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.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Removes JSP project from server. Checks:
+ *
+ * <ul>
+ * <li>the console output</li>
+ * <li>server's label</li>
+ * <li>project is not listed under the server</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class UndeployJSPProjectTemplate extends SWTTestExt {
+
+ protected abstract String getConsoleMessage();
+ @Test
+ public void undeployProject(){
+ ServersView serversView = new ServersView();
+ serversView.removeProjectFromServer(DeployJSPProjectTemplate.PROJECT_NAME, configuredState.getServer().name);
+
+ // console
+ assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
+ assertThat("Exception:", not(new ConsoleOutputMatcher()));
+ // view
+ assertFalse("Server contains project", serversView.containsProject(configuredState.getServer().name, DeployJSPProjectAS7Server.PROJECT_NAME));
+ assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
+ assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -28,7 +28,6 @@
}
pageText = browser.getText();
- System.out.println("Page text: " + pageText);
if ("".equals(item)){
return pageText.equals(item);
}
13 years, 2 months
JBoss Tools SVN: r42759 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-07-27 08:51:04 -0400 (Fri, 27 Jul 2012)
New Revision: 42759
Added:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/NameInputValidator.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java
Log:
https://issues.jboss.org/browse/JBIDE-6267 - updating the command for creating new JSF2 composition component.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java 2012-07-27 12:38:34 UTC (rev 42758)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java 2012-07-27 12:51:04 UTC (rev 42759)
@@ -75,7 +75,9 @@
public class CreateJSF2CompositeCommandHandler extends AbstractHandler {
+ private static final Pattern USED_TAGLIBS_PATTERN = Pattern.compile("<([a-zA-Z]+\\d*)+:"); //$NON-NLS-1$
private final String IMPLEMENTATION = "composite:implementation"; //$NON-NLS-1$
+ private NameInputValidator nameInputValidator;
private JSPMultiPageEditor editor;
@Override
@@ -148,39 +150,15 @@
/*
* Get composite's name and namespace from the popup dialog
*/
+ if (nameInputValidator == null) {
+ nameInputValidator = new NameInputValidator(project);
+ } else {
+ nameInputValidator.setProject(project);
+ }
InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(),
"Creating composite component", //$NON-NLS-1$
"Enter component's namespace and name:", "namespace:name", //$NON-NLS-1$ //$NON-NLS-2$
- new IInputValidator() {
- public String isValid(String newText) {
- String trim = newText.trim();
- String result = null;
- String[] split = trim.split(":", 2); //$NON-NLS-1$
- Pattern p = Pattern.compile("([a-zA-Z]+\\d*)+"); //$NON-NLS-1$
- /*
- * Check the correct format.
- * Matcher will accept only word characters with optional numbers.
- */
- if ((split.length != 2) || trim.startsWith(":") || trim.endsWith(":") //$NON-NLS-1$ //$NON-NLS-2$
- || (split[0].length() == 0) || (split[1].length() == 0)) {
- result = "Component's name should fit in the pattern \"namespace:name\""; //$NON-NLS-1$
- } else if(!p.matcher(split[0]).matches()) {
- result = "Namespace '"+split[0]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
- } else if(!p.matcher(split[1]).matches()) {
- result = "Name '"+split[1]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- String nameSpaceURI = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
- Object fld = JSF2ResourceUtil.findResourcesFolderContainerByNameSpace(project, nameSpaceURI);
- if (fld instanceof IFolder) {
- IResource res = ((IFolder) fld).findMember(split[1]+ ".xhtml"); //$NON-NLS-1$
- if ((res instanceof IFile) && ((IFile)res).exists() ) {
- result = "Component with the same name already exists"; //$NON-NLS-1$
- }
- }
- }
- return result;
- }
- });
+ nameInputValidator);
if (dlg.open() == Window.OK) {
/*
* Create all required files
@@ -224,16 +202,16 @@
if (ed instanceof JSPTextEditor) {
String libraryUri = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
PaletteTaglibInserter PaletteTaglibInserter = new PaletteTaglibInserter();
- Properties p = new Properties();
- p.put("selectionProvider", editor.getSelectionProvider()); //$NON-NLS-1$
- p.setProperty(URIConstants.LIBRARY_URI, libraryUri);
- p.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$
- p.setProperty(URIConstants.DEFAULT_PREFIX, split[0]);
- p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$
- p.setProperty(XModelObjectConstants.REFORMAT, "yes"); //$NON-NLS-1$
- p.setProperty(XModelObjectConstants.START_TEXT,
+ Properties properties = new Properties();
+ properties.put("selectionProvider", editor.getSelectionProvider()); //$NON-NLS-1$
+ properties.setProperty(URIConstants.LIBRARY_URI, libraryUri);
+ properties.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$
+ properties.setProperty(URIConstants.DEFAULT_PREFIX, split[0]);
+ properties.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$
+ properties.setProperty(XModelObjectConstants.REFORMAT, "yes"); //$NON-NLS-1$
+ properties.setProperty(XModelObjectConstants.START_TEXT,
"<%@ taglib uri=\""+libraryUri+"\" prefix=\"" +split[0]+ "\" %>\\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), p);
+ PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), properties);
}
/*
* Add required taglibs to the composite file
@@ -255,8 +233,7 @@
/*
* Parse selected fragment to find used taglibs
*/
- Pattern p = Pattern.compile("<([a-zA-Z]+\\d*)+:"); //$NON-NLS-1$
- Matcher m = p.matcher(replacedText);
+ Matcher m = USED_TAGLIBS_PATTERN.matcher(replacedText);
while (m.find()) {
if (sourceTaglibs.keySet().contains(m.group(1))
&& !requiredTaglibs.keySet().contains(m.group(1))) {
@@ -274,7 +251,7 @@
compositeTaglibs.add(map.item(i).getNodeName());
}
for (String key : requiredTaglibs.keySet()) {
- String xmlns = "xmlns:"+key; //$NON-NLS-1$
+ String xmlns = "xmlns:" + key; //$NON-NLS-1$
if (!compositeTaglibs.contains(xmlns)) {
html.setAttribute(xmlns, requiredTaglibs.get(key));
}
@@ -292,6 +269,7 @@
JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI
.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.openEditor(input, "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor", true); //$NON-NLS-1$
+ part.setFocus();
}
}
}
@@ -313,5 +291,5 @@
}
return null;
}
-
+
}
Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/NameInputValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/NameInputValidator.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/NameInputValidator.java 2012-07-27 12:51:04 UTC (rev 42759)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.web.commands;
+
+import java.util.regex.Pattern;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil;
+
+public class NameInputValidator implements IInputValidator {
+
+ private static final Pattern NAME_PATTERN = Pattern.compile("([a-zA-Z]+\\d*)+"); //$NON-NLS-1$
+ private IProject project;
+
+ public NameInputValidator(IProject project) {
+ super();
+ this.project = project;
+ }
+
+ public void setProject(IProject project) {
+ this.project = project;
+ }
+
+ @Override
+ public String isValid(String newText) {
+ String trim = newText.trim();
+ String result = null;
+ String[] split = trim.split(":", 2); //$NON-NLS-1$
+ /*
+ * Check the correct format.
+ * Matcher will accept only word characters with optional numbers.
+ */
+ if ((split.length != 2) || trim.startsWith(":") || trim.endsWith(":") //$NON-NLS-1$ //$NON-NLS-2$
+ || (split[0].length() == 0) || (split[1].length() == 0)) {
+ result = "Component's name should fit in the pattern \"namespace:name\""; //$NON-NLS-1$
+ } else if(!NAME_PATTERN.matcher(split[0]).matches()) {
+ result = "Namespace '"+split[0]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
+ } else if(!NAME_PATTERN.matcher(split[1]).matches()) {
+ result = "Name '"+split[1]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
+ } else {
+ String nameSpaceURI = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
+ Object fld = JSF2ResourceUtil.findResourcesFolderContainerByNameSpace(project, nameSpaceURI);
+ if (fld instanceof IFolder) {
+ IResource res = ((IFolder) fld).findMember(split[1]+ ".xhtml"); //$NON-NLS-1$
+ if ((res instanceof IFile) && ((IFile)res).exists() ) {
+ result = "Component with the same name already exists"; //$NON-NLS-1$
+ }
+ }
+ }
+ return result;
+ }
+}
13 years, 2 months
JBoss Tools SVN: r42758 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-07-27 08:38:34 -0400 (Fri, 27 Jul 2012)
New Revision: 42758
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/SelectConnectionProfileDialog.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java
Log:
https://issues.jboss.org/browse/JBIDE-7996
Fix disappeared syntetic values from ConnectionProfiles combo
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java 2012-07-27 12:06:03 UTC (rev 42757)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java 2012-07-27 12:38:34 UTC (rev 42758)
@@ -171,6 +171,7 @@
defaultConnectionProfile = dialog.getConnectionProfileName();
fillPropertiesFromConnectionProfile(defaultConnectionProfile);
}
+ shell.dispose();
}
});
gd = new GridData(GridData.FILL_HORIZONTAL);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/SelectConnectionProfileDialog.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/SelectConnectionProfileDialog.java 2012-07-27 12:06:03 UTC (rev 42757)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/SelectConnectionProfileDialog.java 2012-07-27 12:38:34 UTC (rev 42758)
@@ -62,6 +62,7 @@
Label label = new Label(parent, SWT.NULL);
label.setText(Messages.ConnectionProfile);
connectionProfileCtrl = new ConnectionProfileCtrl(parent, 1, ""); //$NON-NLS-1$
+ connectionProfileCtrl.setUseSynteticValue(false);
if (selectedCP != null){
connectionProfileCtrl.selectValue(selectedCP);
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java 2012-07-27 12:06:03 UTC (rev 42757)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java 2012-07-27 12:38:34 UTC (rev 42758)
@@ -56,7 +56,7 @@
protected ComboViewer comboControl;
protected Button buttonNew;
protected Button buttonEdit;
- private boolean useSynteticValues = false;
+ private boolean useSynteticValues = true;
static final String NO_CONNECTIN_NAME = HibernateConsoleMessages.ConnectionProfileCtrl_HibernateConfiguredConnection;
static final String JPA_CONNECTIN_NAME = HibernateConsoleMessages.ConnectionProfileCtrl_JPAConfiguredConnection;
@@ -106,6 +106,7 @@
public void setUseSynteticValue(boolean value){
this.useSynteticValues = value;
+ this.updateInput();
}
public class ButtonPressedAction extends Action implements SelectionListener {
13 years, 2 months
JBoss Tools SVN: r42757 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-27 08:06:03 -0400 (Fri, 27 Jul 2012)
New Revision: 42757
Modified:
trunk/build/target-platform/build.xml
Log:
JBIDE-12356: turn invocation of p2.mirror task to platform independent
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2012-07-27 12:01:39 UTC (rev 42756)
+++ trunk/build/target-platform/build.xml 2012-07-27 12:06:03 UTC (rev 42757)
@@ -210,11 +210,14 @@
<!-- /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data /tmp/workspace -consolelog -application
org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml -Ddebug=true -DfollowStrict=true -DrepoDir=/tmp/REPO/ -->
<target name="run.p2mirror.script" description="build target update site using p2.mirror">
- <exec executable="${WORKINGDIR}/eclipse-${eclipse.version}/eclipse/eclipse" dir="${basedir}" failonerror="true">
+ <java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
+ <classpath>
+ <fileset dir="${WORKINGDIR}/eclipse-${eclipse.version}/eclipse/plugins" includes="org.eclipse.equinox.launcher_*.jar"/>
+ </classpath>
<arg line=" -nosplash -data ${tmpdir}/workspace -consolelog -application org.eclipse.ant.core.antRunner" />
<arg line=" -f ${targetFile}.p2mirror.xml -DfollowStrict=true -DrepoDir=${repoDir}" />
<arg line=" -Ddebug=true -vmargs -Dosgi.locking=none" />
- </exec>
+ </java>
</target>
<target name="update.target.file" description="use XSLT to update .target file from contents of local repo">
13 years, 2 months
JBoss Tools SVN: r42756 - trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-07-27 08:01:39 -0400 (Fri, 27 Jul 2012)
New Revision: 42756
Modified:
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/WorkbenchUtils.java
Log:
Updating to JLS4 (in replacement of deprecated JLS3)
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/WorkbenchUtils.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/WorkbenchUtils.java 2012-07-27 11:46:28 UTC (rev 42755)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/WorkbenchUtils.java 2012-07-27 12:01:39 UTC (rev 42756)
@@ -629,7 +629,6 @@
try {
if (unit.isWorkingCopy()) {
LOGGER.debug("Reconciling unit...");
-
unit.reconcile(AST.JLS4, ICompilationUnit.FORCE_PROBLEM_DETECTION, unit.getOwner(),
new NullProgressMonitor());
// Commit changes
13 years, 2 months
JBoss Tools SVN: r42755 - in trunk/ws: tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-07-27 07:46:28 -0400 (Fri, 27 Jul 2012)
New Revision: 42755
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/WorkbenchUtils.java
Log:
Updating to JLS4 (in replacement of deprecated JLS3)
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java 2012-07-27 11:35:18 UTC (rev 42754)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtils.java 2012-07-27 11:46:28 UTC (rev 42755)
@@ -216,7 +216,7 @@
return null;
}
- ASTParser parser = ASTParser.newParser(AST.JLS3);
+ ASTParser parser = ASTParser.newParser(AST.JLS4);
parser.setKind(ASTParser.K_COMPILATION_UNIT);
parser.setSource(compilationUnit);
parser.setResolveBindings(true);
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/WorkbenchUtils.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/WorkbenchUtils.java 2012-07-27 11:35:18 UTC (rev 42754)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/WorkbenchUtils.java 2012-07-27 11:46:28 UTC (rev 42755)
@@ -630,7 +630,7 @@
if (unit.isWorkingCopy()) {
LOGGER.debug("Reconciling unit...");
- unit.reconcile(AST.JLS3, ICompilationUnit.FORCE_PROBLEM_DETECTION, unit.getOwner(),
+ unit.reconcile(AST.JLS4, ICompilationUnit.FORCE_PROBLEM_DETECTION, unit.getOwner(),
new NullProgressMonitor());
// Commit changes
LOGGER.debug("Commiting working copy...");
13 years, 2 months
JBoss Tools SVN: r42754 - trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: ppalaga
Date: 2012-07-27 07:35:18 -0400 (Fri, 27 Jul 2012)
New Revision: 42754
Modified:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/
Log:
org.jboss.tools.freemarker.ui.bot.test/bin added to svn:ignore.
Property changes on: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test
___________________________________________________________________
Added: svn:ignore
+ bin
13 years, 2 months
JBoss Tools SVN: r42753 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-07-27 07:15:58 -0400 (Fri, 27 Jul 2012)
New Revision: 42753
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
Log:
Created
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-07-27 11:15:58 UTC (rev 42753)
@@ -0,0 +1,24 @@
+package org.jboss.ide.eclipse.as.ui.bot.test;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeleteAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProject;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.HotDeployJSPFile;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProject;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+(a)RunWith(RequirementAwareSuite.class)
+(a)Suite.SuiteClasses({
+ CreateAS7Server.class,
+ OperateAS7Server.class,
+ DeployJSPProject.class,
+ HotDeployJSPFile.class,
+ UndeployJSPProject.class,
+ DeleteAS7Server.class
+})
+public class EAPCompatibilitySuite {
+
+}
13 years, 2 months