Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #TOMEE-4265: EarClassLoaderTest and EarWebAppFirstClassLoaderTest #1073

Closed
wants to merge 1 commit into from
Closed

Fix #TOMEE-4265: EarClassLoaderTest and EarWebAppFirstClassLoaderTest #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...xws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/EarClassLoaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static Archive<?> ear() {
Maven.configureResolver()
.workOffline()
.withClassPathResolution(true)
.resolve("joda-time:joda-time:2.5")
.resolve("joda-time:joda-time:2.10.10")
.using(new AcceptScopesStrategy(ScopeType.COMPILE, ScopeType.RUNTIME))
.asFile()
)
Expand All @@ -63,6 +63,6 @@ public void checkIfWasCorretlyLoaded() throws IOException {
// embedded case uses the classpath for a lot of reasons
assumeFalse(System.getProperty("openejb.arquillian.adapter", "embedded").contains("embedded"));
final String slurp = IO.slurp(new URL(url.toExternalForm() + (url.getPath().isEmpty() ? "/broken-web/" : "") + "joda"));
assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.5.jar"));
assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.10.10.jar"));
}
}
6 changes: 3 additions & 3 deletions ...rc/test/java/org/apache/openejb/arquillian/tests/jaxws/EarWebAppFirstClassLoaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static Archive<?> ear() {
final File[] joda = Maven.configureResolver()
.workOffline()
.withClassPathResolution(true)
.resolve("joda-time:joda-time:2.5")
.resolve("joda-time:joda-time:2.10.10")
.using(new AcceptScopesStrategy(ScopeType.COMPILE, ScopeType.RUNTIME))
.asFile();
return ShrinkWrap.create(EnterpriseArchive.class, "broken.ear")
Expand All @@ -70,7 +70,7 @@ public static Archive<?> ear() {
public void checkIfWasCorretlyLoaded() throws IOException {
assumeFalse(System.getProperty("openejb.arquillian.adapter", "embedded").contains("embedded"));
final String slurp = IO.slurp(new URL(url.toExternalForm() + (url.getPath().isEmpty() ? "/broken-web/" : "") + "joda"));
assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.5.jar"));
assertFalse(slurp.endsWith("broken/lib/joda-time-2.5.jar")); // useless cause of the previous but to make it obvious
assertTrue(slurp.endsWith("broken-web/WEB-INF/lib/joda-time-2.10.10.jar"));
assertFalse(slurp.endsWith("broken/lib/joda-time-2.10.10.jar")); // useless cause of the previous but to make it obvious
}
}
Loading