Author: dpalmer Date: 2012-05-30 16:52:42 -0400 (Wed, 30 May 2012) New Revision: 41550 Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java Log: Copied test changes from trunk to the 3.3.x branch Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml =================================================================== --- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2012-05-30 20:50:08 UTC (rev 41549) +++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2012-05-30 20:52:42 UTC (rev 41550) @@ -13,7 +13,7 @@ <packaging>eclipse-test-plugin</packaging> <properties> - <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.soap.home.4.3=${requirement.build.root}/jboss-soa-p.4.3.0 -Djbosstools.test.soap.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0</systemProperties> + <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.soap.home.4.3=${requirement.build.root}/jboss-soa-p.4.3.0/jboss-soa-p.4.3.0/ -Djbosstools.test.soap.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-soa-p.5.0.0/</systemProperties> <coverage.filter>org.jboss.tools.esb.core*</coverage.filter> <emma.instrument.bundles>org.jboss.tools.esb.project.core</emma.instrument.bundles> </properties> @@ -31,4 +31,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java =================================================================== --- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2012-05-30 20:50:08 UTC (rev 41549) +++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2012-05-30 20:52:42 UTC (rev 41550) @@ -226,12 +226,14 @@ IClasspathEntry[] entry = initializer.getEntries(path);//jproject.getRawClasspath(); List<String> jars = new ArrayList<String>(); + /* ldimaggi - display list of jars in the assert text - https://issues.jboss.org/browse/JBDS-2152 */ + String jarsString = null; for(IClasspathEntry ent :entry){ jars.add(ent.getPath().lastSegment()); + jarsString = jarsString + ent.getPath().lastSegment() + " "; } + assertEquals("unable to read User customized ESB runtime, jbossesb-rosetta.jar is not in classpath." + jarsString, true, jars.contains("jbossesb-rosetta.jar")); - assertEquals("unalbe to read User customized ESB runtime, jbossesb-rosetta.jar is not in classpath.", true, jars.contains("jbossesb-rosetta.jar")); - } public void testSOAP50Deployment() throws Exception { @@ -351,7 +353,7 @@ protected void createServer(String runtimeID, String serverID, String location, String configuration) throws CoreException { // if file doesnt exist, abort immediately. - assertTrue(new Path(location).toFile().exists()); + assertTrue("server location " + location + " does not exist", new Path(location).toFile().exists()); currentRuntime = createRuntime(runtimeID, location, configuration); IServerType serverType = ServerCore.findServerType(serverID); Modified: branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java =================================================================== --- branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-30 20:50:08 UTC (rev 41549) +++ branches/jbosstools-3.3.x/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-30 20:52:42 UTC (rev 41550) @@ -222,7 +222,9 @@ * @return */ protected String getRunningSoaVersionTreeLabel() { - String ret = "ESB for SOA-P "; + String ret = "ESB for JBoss Enterprise SOA Platform "; + //String ret = "ESB for SOA-P "; + if (!configuredState.getServer().isConfigured) { throw new NullPointerException("No server was configured for test, but it is required"); }