[jbosstools-commits] JBoss Tools SVN: r23203 - in trunk/ws/tests: org.jboss.tools.ws.creation.core.test and 6 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jul 2 15:20:11 EDT 2010
Author: dgolovin
Date: 2010-07-02 15:20:11 -0400 (Fri, 02 Jul 2010)
New Revision: 23203
Added:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/requirements.properties
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTestSuite.java
Removed:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTests.java
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/build.properties
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JBossWSTestProject/.project
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JavaFirstTestProject/.project
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/WebTest/.project
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java
trunk/ws/tests/pom.xml
Log:
ws component maven repo structure updated to match svn repo
creation.core.test are enabled
code coverage are enabled for tests
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2010-07-02 19:13:08 UTC (rev 23202)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2010-07-02 19:20:11 UTC (rev 23203)
@@ -30,9 +30,10 @@
org.eclipse.jdt.core,
org.eclipse.ui.console,
org.eclipse.jface.text,
- org.jboss.ide.eclipse.as.classpath.core
+ org.jboss.ide.eclipse.as.classpath.core,
+ org.jboss.ide.eclipse.as.ui;bundle-version="2.1.0",
+ org.jboss.ide.eclipse.as.wtp.core;bundle-version="2.1.0"
Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: ws-creation-core-test.jar
Export-Package: org.jboss.tools.ws.creation.core.test,
org.jboss.tools.ws.creation.core.test.command
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/build.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/build.properties 2010-07-02 19:13:08 UTC (rev 23202)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/build.properties 2010-07-02 19:20:11 UTC (rev 23203)
@@ -1,6 +1,7 @@
-source.ws-creation-core-test.jar = src/
-output.ws-creation-core-test.jar = bin/
bin.includes = META-INF/,\
- ws-creation-core-test.jar,\
projects/,\
- plugin.properties
+ plugin.properties,\
+ .
+jars.compile.order = .
+source.. = src/
+output.. = bin/
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2010-07-02 19:13:08 UTC (rev 23202)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2010-07-02 19:20:11 UTC (rev 23203)
@@ -7,8 +7,14 @@
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.tools</groupId>
+ <groupId>org.jboss.toolsws.tests</groupId>
<artifactId>org.jboss.tools.ws.creation.core.test</artifactId>
<version>1.0.0</version>
- <packaging>eclipse-plugin</packaging>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <properties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-soa-p.4.3.0/jboss-as</systemProperties>
+ <emma.filter>org.jboss.tools.ws.creation.core*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.ws.creation.core</emma.instrument.bundles>
+ </properties>
</project>
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JBossWSTestProject/.project
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JBossWSTestProject/.project 2010-07-02 19:13:08 UTC (rev 23202)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JBossWSTestProject/.project 2010-07-02 19:20:11 UTC (rev 23203)
@@ -15,11 +15,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JavaFirstTestProject/.project
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JavaFirstTestProject/.project 2010-07-02 19:13:08 UTC (rev 23202)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JavaFirstTestProject/.project 2010-07-02 19:20:11 UTC (rev 23203)
@@ -15,11 +15,7 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
+
</buildSpec>
<natures>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/WebTest/.project
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/WebTest/.project 2010-07-02 19:13:08 UTC (rev 23202)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/WebTest/.project 2010-07-02 19:20:11 UTC (rev 23203)
@@ -20,11 +20,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
Added: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/requirements.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/requirements.properties (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/requirements.properties 2010-07-02 19:20:11 UTC (rev 23203)
@@ -0,0 +1 @@
+requirements=soap
\ No newline at end of file
Copied: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTestSuite.java (from rev 23130, trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTests.java)
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTestSuite.java (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTestSuite.java 2010-07-02 19:20:11 UTC (rev 23203)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.ws.creation.core.test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.jboss.tools.ws.creation.core.test.command.JBossWSClientCommandTest;
+import org.jboss.tools.ws.creation.core.test.command.JBossWSClientSampleCreationCommandTest;
+import org.jboss.tools.ws.creation.core.test.command.JBossWSJavaFirstCommandTest;
+import org.jboss.tools.ws.creation.core.test.command.JBossWSMergeWebXMLCommandTest;
+import org.jboss.tools.ws.creation.core.test.command.JBossWSTopDownCommandTest;
+
+public class JBossWSCreationCoreTestSuite extends TestCase {
+ public static final String PLUGIN_ID = "org.jboss.tools.ws.creation.core.test";
+ public static Test suite ()
+ {
+ TestSuite suite = new TestSuite(JBossWSCreationCoreTestSuite.class.getName());
+ suite.addTestSuite(JBossWSTopDownCommandTest.class);
+ suite.addTestSuite(JBossWSJavaFirstCommandTest.class);
+ suite.addTestSuite(JBossWSClientCommandTest.class);
+ suite.addTestSuite(JBossWSMergeWebXMLCommandTest.class);
+ suite.addTestSuite(JBossWSClientSampleCreationCommandTest.class);
+ return suite;
+ }
+}
\ No newline at end of file
Deleted: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTests.java 2010-07-02 19:13:08 UTC (rev 23202)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/JBossWSCreationCoreTests.java 2010-07-02 19:20:11 UTC (rev 23203)
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.ws.creation.core.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.jboss.tools.ws.creation.core.test.command.JBossWSClientCommandTest;
-import org.jboss.tools.ws.creation.core.test.command.JBossWSClientSampleCreationCommandTest;
-import org.jboss.tools.ws.creation.core.test.command.JBossWSJavaFirstCommandTest;
-import org.jboss.tools.ws.creation.core.test.command.JBossWSMergeWebXMLCommandTest;
-import org.jboss.tools.ws.creation.core.test.command.JBossWSTopDownCommandTest;
-
-public class JBossWSCreationCoreTests extends TestCase {
- public static final String PLUGIN_ID = "org.jboss.tools.ws.creation.core.test";
- public static Test suite ()
- {
- TestSuite suite = new TestSuite(JBossWSCreationCoreTests.class.getName());
- suite.addTestSuite(JBossWSTopDownCommandTest.class);
- suite.addTestSuite(JBossWSJavaFirstCommandTest.class);
- suite.addTestSuite(JBossWSClientCommandTest.class);
- suite.addTestSuite(JBossWSMergeWebXMLCommandTest.class);
- suite.addTestSuite(JBossWSClientSampleCreationCommandTest.class);
- return suite;
- }
-}
\ No newline at end of file
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java 2010-07-02 19:13:08 UTC (rev 23202)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSCommandTest.java 2010-07-02 19:20:11 UTC (rev 23203)
@@ -11,6 +11,7 @@
package org.jboss.tools.ws.creation.core.test.command;
import java.io.File;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
@@ -75,11 +76,10 @@
protected static final int DEFAULT_STARTUP_TIME = 150000;
protected static final int DEFAULT_SHUTDOWN_TIME = 90000;
- protected static final String JBOSSWS_HOME_DEFAULT = "D:/softinstall/jboss-4.2.3GA/jboss-4.2.3.GA";
public static final String JBOSSWS_42_HOME = "jbosstools.test.jboss.home.4.2";
public static final String JBOSS_RUNTIME_42 = "org.jboss.ide.eclipse.as.runtime.42";
public static final String JBOSS_AS_42_HOME = System.getProperty(
- JBOSSWS_42_HOME, JBOSSWS_HOME_DEFAULT);
+ JBOSSWS_42_HOME);
public static final String JBOSS_SERVER_42 = "org.jboss.ide.eclipse.as.42";
protected final Set<IResource> resourcesToCleanup = new HashSet<IResource>();
@@ -115,7 +115,7 @@
// create jbossws web project
- createServer(JBOSS_RUNTIME_42, JBOSS_SERVER_42, JBOSS_AS_42_HOME,
+ createServer(JBOSS_RUNTIME_42, JBOSS_SERVER_42, getJBossWSHomeFolder().getAbsolutePath(),
"default");
// first thing's first. Let's add a server state listener
stateListener = new ServerStateListener();
@@ -281,11 +281,14 @@
protected File getJBossWSHomeFolder() {
- String jbosshome = System.getProperty(JBOSSWS_42_HOME,
- JBOSSWS_HOME_DEFAULT);
+ String jbosshome = System.getProperty(JBOSSWS_42_HOME);
+ if (jbosshome==null) {
+ String message = "{0} system property is not defined. Use -D{0}=/path/to/the/server in command line or in VM Arguments group of Aclipse Application Launch Configuration Arguments tab";
+ throw new IllegalArgumentException(MessageFormat.format(message, JBOSSWS_42_HOME));
+ }
+ String wrongLocationMessage = "{0} system property points to none existing folder";
File runtimelocation = new File(jbosshome);
- assertTrue("Please set JBoss EAP Home in system property:"
- + JBOSSWS_42_HOME, runtimelocation.exists());
+ assertTrue(MessageFormat.format(wrongLocationMessage,JBOSSWS_42_HOME), runtimelocation.exists());
String cmdFileLocation = jbosshome + File.separator + "bin"
+ File.separator + "wsconsume.sh";
Modified: trunk/ws/tests/pom.xml
===================================================================
--- trunk/ws/tests/pom.xml 2010-07-02 19:13:08 UTC (rev 23202)
+++ trunk/ws/tests/pom.xml 2010-07-02 19:20:11 UTC (rev 23203)
@@ -9,6 +9,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.ws.core.test</module>
+ <module>org.jboss.tools.ws.creation.core.test</module>
<module>org.jboss.tools.ws.ui.test</module>
</modules>
</project>
More information about the jbosstools-commits
mailing list