Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Commit 8c6c243

Browse files
committed
Fix resource path
1 parent 9a371c6 commit 8c6c243

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

client/src/test/java/org/perfrepo/client/test/ClientTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public static Archive<?> createDeployment() {
6868
war.delete(ArchivePaths.create("WEB-INF/classes/META-INF/persistence.xml"));
6969
war.delete(ArchivePaths.create("WEB-INF/jboss-web.xml"));
7070

71-
war.add(new FileAsset(new File("target/test-classes/test-persistence.xml")), ArchivePaths.create("WEB-INF/classes/META-INF/persistence.xml"));
72-
war.add(new FileAsset(new File("target/test-classes/test-jboss-web.xml")), ArchivePaths.create("WEB-INF/jboss-web.xml"));
71+
war.add(new FileAsset(new File(ClientTest.class.getResource("/test-persistence.xml").getFile())), ArchivePaths.create("WEB-INF/classes/META-INF/persistence.xml"));
72+
war.add(new FileAsset(new File(ClientTest.class.getResource("/test-jboss-web.xml").getFile())), ArchivePaths.create("WEB-INF/jboss-web.xml"));
7373

7474
return war;
7575
}

web/src/test/java/org/perfrepo/test/TestServiceBeanTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ public class TestServiceBeanTest {
7272

7373
@Deployment
7474
public static Archive<?> createDeployment() {
75+
76+
File testClassFolder = new File(TestServiceBeanTest.class.getResource("/.").getFile());
77+
File testLibsFolder = new File(testClassFolder.getParentFile(), "test-libs");
78+
7579
WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war");
7680
war.addPackages(true, Alert.class.getPackage());
7781
war.addPackages(true, TestService.class.getPackage());
@@ -83,8 +87,8 @@ public static Archive<?> createDeployment() {
8387
war.addPackage(MultiValue.class.getPackage());
8488
war.addPackage(DAO.class.getPackage());
8589
war.addPackages(true, Alert.class.getPackage());
86-
war.addAsLibrary(new File("target/test-libs/antlr-runtime.jar"));
87-
war.addAsLibrary(new File("target/test-libs/maven-artifact.jar"));
90+
war.addAsLibrary(new File(testLibsFolder,"antlr-runtime.jar"));
91+
war.addAsLibrary(new File(testLibsFolder, "maven-artifact.jar"));
8892
war.addAsResource("test-persistence.xml", "META-INF/persistence.xml");
8993
war.addAsResource("users.properties");
9094
war.addAsResource("roles.properties");

0 commit comments

Comments
 (0)