Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jharting
jharting committed Jul 4, 2013
1 parent f282dba commit 2bd5b6e
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions ...sgi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/event/EventTest.java
View file
Expand Up @@ -39,9 +39,9 @@ public class EventTest {
public static Option[] configure() {
return options(
Environment.CDIOSGiEnvironment(
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("1.0-SNAPSHOT")
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("2.1-SNAPSHOT")
)
);
}
Expand Down
4 changes: 2 additions & 2 deletions ...ster/src/test/java/org/jboss/weld/environment/osgi/tests/framework/BundleScannerTest.java
View file
Expand Up @@ -41,8 +41,8 @@ public class BundleScannerTest {
public static Option[] configure() {
return options(
Environment.CDIOSGiEnvironment(
mavenBundle("org.jboss.weld.osgi.tests", "weld-osgi-scanner").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests", "weld-osgi-innerscanner").version("1.0-SNAPSHOT")
mavenBundle("org.jboss.weld.osgi.tests", "weld-osgi-scanner").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests", "weld-osgi-innerscanner").version("2.1-SNAPSHOT")
)
);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ter/src/test/java/org/jboss/weld/environment/osgi/tests/framework/InfrastructureTest.java
View file
Expand Up @@ -43,7 +43,7 @@ public class InfrastructureTest {
public static Option[] configure() {
return options(
Environment.CDIOSGiEnvironment(
mavenBundle("org.jboss.weld.osgi.tests", "weld-osgi-importing").version("1.0-SNAPSHOT")
mavenBundle("org.jboss.weld.osgi.tests", "weld-osgi-importing").version("2.1-SNAPSHOT")
)
);
}
Expand Down
6 changes: 3 additions & 3 deletions ...tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/framework/UsageTest.java
View file
Expand Up @@ -44,9 +44,9 @@ public class UsageTest {
public static Option[] configure() {
return options(
Environment.CDIOSGiEnvironment(
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("1.0-SNAPSHOT")
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("2.1-SNAPSHOT")
)
);
}
Expand Down
4 changes: 2 additions & 2 deletions ...ests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/jsr299/ExtensionTest.java
View file
Expand Up @@ -38,8 +38,8 @@ public class ExtensionTest {
public static Option[] configure() {
return options(
Environment.CDIOSGiEnvironment(
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests", "weld-osgi-cdi-spi").version("1.0-SNAPSHOT")
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests", "weld-osgi-cdi-spi").version("2.1-SNAPSHOT")
)
);
}
Expand Down
6 changes: 3 additions & 3 deletions ...tester/src/test/java/org/jboss/weld/environment/osgi/tests/osgi/OSGiFacilitationTest.java
View file
Expand Up @@ -44,9 +44,9 @@ public class OSGiFacilitationTest {
public static Option[] configure() {
return options(
Environment.CDIOSGiEnvironment(
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("1.0-SNAPSHOT")
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("2.1-SNAPSHOT")
)
);
}
Expand Down
6 changes: 3 additions & 3 deletions ...ts/tester/src/test/java/org/jboss/weld/environment/osgi/tests/service/MetaFilterTest.java
View file
Expand Up @@ -41,9 +41,9 @@ public class MetaFilterTest {
public static Option[] configure() {
return options(
Environment.CDIOSGiEnvironment(
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("1.0-SNAPSHOT")
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("2.1-SNAPSHOT")
)
);
}
Expand Down
6 changes: 3 additions & 3 deletions ...ter/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServiceConsumingTest.java
View file
Expand Up @@ -41,9 +41,9 @@ public class ServiceConsumingTest {
public static Option[] configure() {
return options(
Environment.CDIOSGiEnvironment(
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("1.0-SNAPSHOT")
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("2.1-SNAPSHOT")
)
);
}
Expand Down
6 changes: 3 additions & 3 deletions ...er/src/test/java/org/jboss/weld/environment/osgi/tests/service/ServicePublishingTest.java
View file
Expand Up @@ -44,9 +44,9 @@ public class ServicePublishingTest {
public static Option[] configure() {
return options(
Environment.CDIOSGiEnvironment(
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("1.0-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("1.0-SNAPSHOT")
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle1").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle2").version("2.1-SNAPSHOT"),
mavenBundle("org.jboss.weld.osgi.tests","weld-osgi-bundle3").version("2.1-SNAPSHOT")
)
);
}
Expand Down
10 changes: 5 additions & 5 deletions ...gi/tests/tester/src/test/java/org/jboss/weld/environment/osgi/tests/util/Environment.java
View file
Expand Up @@ -32,11 +32,11 @@ public class Environment {

public static Option[] CDIOSGiEnvironment(Option... options) {
List<Option> result = new ArrayList<Option>();
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-mandatory").version("1.0-SNAPSHOT"));
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-api").version("1.0-SNAPSHOT"));
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-spi").version("1.0-SNAPSHOT"));
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-extension").version("1.0-SNAPSHOT"));
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-integration").version("1.0-SNAPSHOT"));
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-mandatory").version("2.1-SNAPSHOT"));
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-api").version("2.1-SNAPSHOT"));
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-spi").version("2.1-SNAPSHOT"));
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-extension").version("2.1-SNAPSHOT"));
result.add(mavenBundle("org.jboss.weld.osgi", "weld-osgi-core-integration").version("2.1-SNAPSHOT"));
result.add(junitBundles());
result.add(felix());
Collections.addAll(result, options);
Expand Down

0 comments on commit 2bd5b6e

Please sign in to comment.