Permalink
Browse files

JBIDE-13845: More changes about org.junit4

  • Loading branch information...
1 parent 9ebb053 commit 6de2ef3b50bc5bbfe845e5430ca17ea600b0c401 @mickaelistria mickaelistria committed Mar 25, 2013
View
1 features/org.jboss.tools.installation-tests.feature/build.properties
@@ -1 +0,0 @@
-bin.includes = feature.xml
View
7 features/org.jboss.tools.installation-tests.feature/feature.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.installation-tests.feature" label="Installation tests plugins" version="4.1.0.qualifier" provider-name="JBoss by Red Hat">
-
- <plugin id="org.jboss.tools.tests.installation" version="0.0.0"/>
-
-</feature>
-
View
16 features/org.jboss.tools.installation-tests.feature/pom.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>installation-tests</artifactId>
- <version>4.1.0.Alpha2-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
- <!-- This is a workaround for Eclipse bug 381377. No feature should be necessary -->
- <groupId>org.jboss.tools.installation-tests.feature</groupId>
- <artifactId>org.jboss.tools.installation-tests.feature</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-</project>
View
3 plugins/org.jboss.tools.tests.installation/META-INF/MANIFEST.MF
@@ -11,5 +11,4 @@ Require-Bundle: org.junit;bundle-version="4.0.0",
org.eclipse.swtbot.swt.finder;bundle-version="2.0.5",
org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.0",
org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.swtbot.junit4_x;bundle-version="2.0.5",
- org.hamcrest;bundle-version="1.1.0"
+ org.eclipse.swtbot.junit4_x;bundle-version="2.0.5"
View
1 pom.xml
@@ -13,7 +13,6 @@
<packaging>pom</packaging>
<modules>
<module>plugins/org.jboss.tools.tests.installation</module>
- <module>features/org.jboss.tools.installation-tests.feature</module>
<module>repository</module>
<module>scripts</module>
</modules>
View
2 repository/category.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature id="org.jboss.tools.installation-tests.feature" version="0.0.0"/>
+ <bundle id="org.jboss.tools.tests.installation" version="0.0.0"/>
</site>
View
2 scripts/src/main/groovy/testInstall.groovy
@@ -92,7 +92,7 @@ void runSWTBotInstallRoutine(File eclipseHome, String productName, String additi
"-Dusage_reporting_enabled=false " +
"-Xms256M -Xmx768M -XX:MaxPermSize=512M");
proc.setJar(new File(eclipseHome, "plugins").listFiles().find {it.getName().startsWith("org.eclipse.equinox.launcher_") && it.getName().endsWith(".jar")} );
- proc.setArgs("-application org.eclipse.swtbot.eclipse.junit4.headless.swtbottestapplication " +
+ proc.setArgs("-application org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication " +
"-testApplication org.eclipse.ui.ide.workbench " +
"-product " + productName + " " +
"-data workspace " +

0 comments on commit 6de2ef3

Please sign in to comment.