Author: dgolovin Date: 2010-05-29 00:00:19 -0400 (Sat, 29 May 2010) New Revision: 22428 Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests vpe component tests fix: - manifests were updated to let tycho find test classes Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-05-29 04:00:19 UTC (rev 22428) @@ -19,7 +19,6 @@ org.mozilla.xpcom;bundle-version="1.9.1", org.jboss.tools.vpe.ui.test Bundle-ActivationPolicy: lazy -Bundle-ClassPath: html-test.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2010-05-29 04:00:19 UTC (rev 22428) @@ -1,5 +1,4 @@ bin.includes = META-INF/,\ - html-test.jar,\ resources/,\ plugin.xml,\ plugin.properties @@ -7,6 +6,8 @@ build.properties,\ src/,\ resources/ -jars.compile.order = html-test.jar -source.html-test.jar = src/ +jars.compile.order = html-test.jar,\ + . output.html-test.jar = bin/ +source.. = src/ +output.. = bin/ Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-05-29 04:00:19 UTC (rev 22428) @@ -17,7 +17,6 @@ org.mozilla.xpcom;bundle-version="1.9.1" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.jsp.test -Bundle-ClassPath: jsp-tests.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties 2010-05-29 04:00:19 UTC (rev 22428) @@ -1,12 +1,11 @@ bin.includes = META-INF/,\ - jsp-tests.jar,\ plugin.xml,\ resources/,\ plugin.properties -jars.compile.order = jsp-tests.jar -source.jsp-tests.jar = src/ -output.jsp-tests.jar = bin/ +jars.compile.order = . src.includes = META-INF/,\ build.properties,\ src/,\ resources/ +source.. = src/ +output.. = bin/ Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-05-29 04:00:19 UTC (rev 22428) @@ -15,7 +15,6 @@ Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.editor.template, org.jboss.tools.vpe.test -Bundle-ClassPath: vpe-tests.jar Import-Package: org.eclipse.ui.part Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties 2010-05-29 04:00:19 UTC (rev 22428) @@ -2,7 +2,6 @@ testOk-plugin.xml,\ testFailure-plugin.xml,\ templates/,\ - vpe-tests.jar,\ scheme/,\ plugin.properties,\ plugin.xml @@ -12,4 +11,6 @@ templates/,\ testFailure-plugin.xml,\ testOk-plugin.xml -source.vpe-tests.jar = src/ +jars.compile.order = . +source.. = src/ +output.. = bin/ Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2010-05-29 04:00:19 UTC (rev 22428) @@ -11,4 +11,17 @@ <artifactId>org.jboss.tools.vpe.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <explodedBundles> + <bundle>org.jboss.tools.vpe.test</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-05-29 04:00:19 UTC (rev 22428) @@ -22,10 +22,10 @@ org.eclipse.jface.text, org.jboss.tools.common.model.ui;bundle-version="2.0.0", org.jboss.tools.tests;bundle-version="2.0.0";visibility:=reexport, - org.jboss.tools.common.resref.core;bundle-version="1.0.0" + org.jboss.tools.common.resref.core;bundle-version="1.0.0", + org.mozilla.xulrunner.gtk.linux.x86;bundle-version="1.9.1";resolution:=optional Bundle-ActivationPolicy: lazy -Bundle-ClassPath: vpe-ui-test.jar, - lib/jmock-2.5.1/jmock-2.5.1.jar, +Bundle-ClassPath: lib/jmock-2.5.1/jmock-2.5.1.jar, lib/jmock-2.5.1/hamcrest-core-1.1.jar, lib/jmock-2.5.1/hamcrest-library-1.1.jar Export-Package: org.hamcrest, Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2010-05-29 04:00:19 UTC (rev 22428) @@ -2,7 +2,7 @@ bin.includes = META-INF/,\ plugin.xml,\ plugin.properties,\ - vpe-ui-test.jar,\ resources/,\ lib/ -source.vpe-ui-test.jar = src/ +jars.compile.order = . +source.. = src/ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-05-29 04:00:19 UTC (rev 22428) @@ -11,4 +11,20 @@ <artifactId>org.jboss.tools.vpe.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <explodedBundles> + <bundle>org.jboss.tools.vpe.ui.test</bundle> + <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle> + <bundle>org.jboss.tools.xulrunner.initializer</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF 2010-05-29 04:00:19 UTC (rev 22428) @@ -14,5 +14,4 @@ Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.xulrunner.test, org.jboss.tools.vpe.xulrunner.view -Bundle-ClassPath: vpe-mozilla-tests.jar Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties 2010-05-29 04:00:19 UTC (rev 22428) @@ -1,11 +1,11 @@ output.. = bin/ bin.includes = META-INF/,\ plugin.xml,\ - vpe-mozilla-tests.jar,\ plugin.properties src.includes = src/,\ plugin.xml,\ build.properties,\ META-INF/,\ plugin.properties -source.vpe-mozilla-tests.jar = src/ +jars.compile.order = . +source.. = src/