Author: dgolovin Date: 2010-06-07 20:09:50 -0400 (Mon, 07 Jun 2010) New Revision: 22618 Removed: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/EsbPluginsLoadTest.java Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF trunk/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF trunk/esb/tests/org.jboss.tools.esb.core.test/build.properties trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBAllTests.java trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF trunk/esb/tests/org.jboss.tools.esb.project.core.test/build.properties trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix for esb tests Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2010-06-07 23:54:12 UTC (rev 22617) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/META-INF/MANIFEST.MF 2010-06-08 00:09:50 UTC (rev 22618) @@ -31,7 +31,7 @@ org.eclipse.emf.ecore, org.jboss.ide.eclipse.as.classpath.core, org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0", - org.jboss.ide.eclipse.as.core;bundle-version="1.0.0" + org.jboss.ide.eclipse.as.core;bundle-version="1.0.0";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Export-Package: org.jboss.tools.esb.core, Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF 2010-06-07 23:54:12 UTC (rev 22617) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/META-INF/MANIFEST.MF 2010-06-08 00:09:50 UTC (rev 22618) @@ -3,7 +3,6 @@ Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.esb.core.test;singleton:=true Bundle-Version: 1.3.0.qualifier -Bundle-ClassPath: esb-core-tests.jar Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.esb.core.test Require-Bundle: Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/build.properties =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/build.properties 2010-06-07 23:54:12 UTC (rev 22617) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/build.properties 2010-06-08 00:09:50 UTC (rev 22618) @@ -1,14 +1,15 @@ bin.includes = META-INF/,\ - esb-core-tests.jar,\ projects/,\ about.html,\ ant.properties,\ - plugin.properties + plugin.properties,\ + . src.includes = META-INF/,\ ant.properties,\ build.properties,\ src/,\ projects/,\ about.html -source.esb-core-tests.jar = src/ -jars.compile.order = esb-core-tests.jar +jars.compile.order = . +source.. = src/ +output.. = bin/ Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBAllTests.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBAllTests.java 2010-06-07 23:54:12 UTC (rev 22617) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBAllTests.java 2010-06-08 00:09:50 UTC (rev 22618) @@ -17,7 +17,6 @@ public static Test suite() { TestSuite suite = new TestSuite("Test ESB Corel"); - suite.addTestSuite(EsbPluginsLoadTest.class); suite.addTestSuite(ESBModelTest.class); return suite; } Deleted: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/EsbPluginsLoadTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/EsbPluginsLoadTest.java 2010-06-07 23:54:12 UTC (rev 22617) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/EsbPluginsLoadTest.java 2010-06-08 00:09:50 UTC (rev 22618) @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.esb.core.test; - -import org.jboss.tools.tests.AbstractPluginsLoadTest; - -/** - * @author eskimo - */ -public class EsbPluginsLoadTest extends AbstractPluginsLoadTest { - - public EsbPluginsLoadTest() {} - - public void testEsbPluginsAreResolvedAndActivated() { - testBundlesAreLoadedFor("org.jboss.tools.esb.feature"); - } -} Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-06-07 23:54:12 UTC (rev 22617) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-06-08 00:09:50 UTC (rev 22618) @@ -21,4 +21,6 @@ org.eclipse.jst.common.frameworks;bundle-version="1.1.300", org.eclipse.core.commands;bundle-version="3.5.0", org.eclipse.jst.j2ee;bundle-version="1.1.300", - org.jboss.ide.eclipse.as.classpath.core;bundle-version="2.1.0" + org.jboss.ide.eclipse.as.classpath.core, + org.eclipse.jpt.core;bundle-version="2.2.0", + org.jboss.tools.esb.ui;bundle-version="1.3.0" Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/build.properties =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/build.properties 2010-06-07 23:54:12 UTC (rev 22617) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/build.properties 2010-06-08 00:09:50 UTC (rev 22618) @@ -2,4 +2,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.properties + plugin.properties,\ + projects/ Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2010-06-07 23:54:12 UTC (rev 22617) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2010-06-08 00:09:50 UTC (rev 22618) @@ -11,4 +11,73 @@ <artifactId>org.jboss.tools.esb.project.core.test</artifactId> <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <!-- build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <dependencies> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.jst.web_ui.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> + <dependencies> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.wst.web_ui.feature.feature.group</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> + </configuration> + </plugin> + </plugins> + </build--> + <properties> + <requirements>soap,jbossas</requirements> + <projectRoot>${basedir}/../../..</projectRoot> + <requirements.build>${projectRoot}/requirements/target</requirements.build> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <!--environmentVariables> + <jbosstools.test.jboss.home.4.2>${requirements.build}/jboss-soa-p.5.0.0/jboss-as</jbosstools.test.jboss.home.4.2> + <jbosstools.test.jboss.home.5.0>${requirements.build}/jboss-soa-p.5.0.0/jboss-as</jbosstools.test.jboss.home.5.0> + <jbosstools.test.jboss.home.5.1>${requirements.build}/jboss-5.1.0.GA</jbosstools.test.jboss.home.5.1> + <jbosstools.test.soap.home.4.3>${requirements.build}/jboss-soa-p.5.0.0</jbosstools.test.soap.home.4.3> + <jbosstools.test.soap.home.5.0>${requirements.build}/jboss-soa-p.5.0.0</jbosstools.test.soap.home.5.0> + </environmentVariables--> + <argLine>-Djbosstools.test.jboss.home.4.2=${requirements.build}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.0=${requirements.build}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.1=${requirements.build}/jboss-5.1.0.GA -Djbosstools.test.soap.home.4.3=${requirements.build}/jboss-soa-p.5.0.0 -Djbosstools.test.soap.home.5.0=${requirements.build}/jboss-soa-p.5.0.0</argLine> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>prepare-eclipse-base</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant dir="${projectRoot}/requirements" inheritAll="true"> + <property name="requirements" value="${requirements}" /> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2010-06-07 23:54:12 UTC (rev 22617) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2010-06-08 00:09:50 UTC (rev 22618) @@ -126,7 +126,7 @@ public IProject createESBProject(String prjName) throws CoreException { TestProjectProvider provider = new TestProjectProvider(BUNDLE, - "/projects/" + prjName, prjName, true); + null, prjName, true); IProject prj = provider.getProject(); IFacetedProject ifp = ProjectFacetsManager.create(prj); @@ -166,7 +166,7 @@ public void testUserCustomizedESBRuntime() throws Exception{ // project = createESBProject("esbTestProject_2"); TestProjectProvider provider = new TestProjectProvider(BUNDLE, - "/projects/esbTestProject_2" , "esbTestProject_2", true); + null , "esbTestProject_2", true); project = provider.getProject(); IDataModel model = DataModelFactory.createDataModel(new JBossESBFacetDataModelProvider());