diff --git a/core/pom.xml b/core/pom.xml index 06240a244..e32ac68f3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -64,27 +64,6 @@ - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-to-embedded - generate-test-resources - - run - - - - - - - - - org.codehaus.mojo templating-maven-plugin diff --git a/core/src/test/java/net/adamcin/oakpal/core/sling/DefaultSlingSimulatorTest.java b/core/src/test/java/net/adamcin/oakpal/core/sling/DefaultSlingSimulatorTest.java index 0a2a57d69..2ed1df245 100644 --- a/core/src/test/java/net/adamcin/oakpal/core/sling/DefaultSlingSimulatorTest.java +++ b/core/src/test/java/net/adamcin/oakpal/core/sling/DefaultSlingSimulatorTest.java @@ -112,10 +112,15 @@ public void testReadInstallableResourceFromNode_slingOsgiConfig() throws Excepti @Test public void testReadInstallableResourceFromNode_package() throws Exception { - final File withEmbeddedPackage = TestPackageUtil.prepareTestPackageFromFolder("with-embedded-package.zip", - new File("src/test/resources/with-embedded-package")); - + // first prepare the embedded file, which is copied to the test packages root directory with the given filename + final File embeddedPackageFile = TestPackageUtil.prepareTestPackage("package_1.0.zip"); + // declare the path inside the embedding package final String packagePath = "/apps/with-embedded/install/package_1.0.zip"; + // prepare the outer package, passing the embedded package zip entry name and prepared File location as a map + // of additional entries. + final File withEmbeddedPackage = TestPackageUtil.prepareTestPackageFromFolder("with-embedded-package.zip", + new File("target/test-classes/with-embedded-package"), + Collections.singletonMap("jcr_root" + packagePath, embeddedPackageFile)); VaultPackage vaultPackage = mock(VaultPackage.class); PackageId embeddedId = new PackageId("com.test", "embedded", "1.0"); diff --git a/testing/src/main/java/net/adamcin/oakpal/testing/TestPackageUtil.java b/testing/src/main/java/net/adamcin/oakpal/testing/TestPackageUtil.java index fc5eb134b..051134587 100644 --- a/testing/src/main/java/net/adamcin/oakpal/testing/TestPackageUtil.java +++ b/testing/src/main/java/net/adamcin/oakpal/testing/TestPackageUtil.java @@ -94,13 +94,19 @@ public static File getCaliperPackage() { public static File prepareTestPackageFromFolder(final @NotNull String filename, final @NotNull File srcFolder) throws IOException { + return prepareTestPackageFromFolder(filename, srcFolder, Collections.emptyMap()); + } + + public static File prepareTestPackageFromFolder(final @NotNull String filename, + final @NotNull File srcFolder, + final @NotNull Map additionalEntries) throws IOException { final File absFile = srcFolder.getAbsoluteFile(); if (!absFile.isDirectory()) { throw new IOException("expected directory in srcFolder parameter for test package filename " + filename + ", srcFolder exists " + srcFolder); } File file = new File(testPackagesRoot.toFile(), filename); - buildJarFromDir(absFile, file.getAbsoluteFile(), Collections.emptyMap()); + buildJarFromDir(absFile, file.getAbsoluteFile(), additionalEntries); return file; }