Skip to content

OAK-12022 : fix composite tests with pax exam 4.14.0 #3247

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

Closed
rishabhdaim wants to merge 1 commit into from
Closed

OAK-12022 : fix composite tests with pax exam 4.14.0 #3247

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
11 changes: 6 additions & 5 deletions oak-store-composite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
<name>Oak Composite Store</name>
<packaging>bundle</packaging>

<properties>
<!-- see https://issues.apache.org/jira/browse/OAK-12022 -->
<pax-exam.version>4.13.1</pax-exam.version>
</properties>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -227,6 +222,12 @@
<artifactId>org.apache.sling.testing.paxexam</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
<version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
Expand Down
58 changes: 48 additions & 10 deletions ...-composite/src/test/java/org/apache/jackrabbit/oak/composite/it/CompositeTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.UUID;

import org.apache.sling.testing.paxexam.SlingOptions;
import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.ModifiableCompositeOption;

Expand All @@ -42,13 +43,12 @@
* WARNING: when running the integration tests in an IDE, make sure to generate the oak-store-composite JAR first, otherwise your latest
* code changes will be ignored. Just run `mvn package` to generate the JAR.
*/
public abstract class CompositeTestSupport extends TestSupport {
public abstract class CompositeTestSupport {

private static final String JACKRABBIT_GROUP_ID = "org.apache.jackrabbit";

protected abstract Path getConfigDir();

@Override
protected ModifiableCompositeOption baseConfiguration() {
String bundlePath = System.getProperty("bundle.filename");
if (bundlePath == null) {
Expand All @@ -57,13 +57,23 @@ protected ModifiableCompositeOption baseConfiguration() {
if (!Files.exists(Paths.get(bundlePath))) {
throw new IllegalArgumentException("The bundle jar to be tested needs to be built first with 'mvn package'");
}
String localRepository = System.getProperty("maven.repo.local", "");
return composite(
super.baseConfiguration(),
systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
CoreOptions.keepCaches(),
CoreOptions.when(!localRepository.isBlank()).useOptions(
systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepository)),
CoreOptions.repository("https://repository.apache.org/snapshots/").id("apache-snapshots").allowSnapshots(),
CoreOptions.workingDirectory(Paths.get("target", "paxexam", getClass().getSimpleName(),
UUID.randomUUID().toString()).toAbsolutePath().toString()),
SlingOptions.backing(),
spiflyOptions(),
jpmsOptions(),
logging("INFO"),
junitBundles(),
felixFileInstall(),
oak(),
testBundle("bundle.filename"),
CoreOptions.bundle(Paths.get(bundlePath).toUri().toString()),
frameworkProperty("repository.home").value("target")
);
}
Expand Down Expand Up @@ -107,17 +117,45 @@ public static Option jackrabbit() {
protected static Option logging(String level) {
return composite(
mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.11.13"),
SlingOptions.spyfly(),
mavenBundle("org.slf4j", "slf4j-api", "2.0.12"),
mavenBundle("org.slf4j", "slf4j-simple", "2.0.12"),
mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").versionAsInProject(),
mavenBundle().groupId("ch.qos.logback").artifactId("logback-core").versionAsInProject(),
mavenBundle().groupId("ch.qos.logback").artifactId("logback-classic").versionAsInProject(),
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(level),
SlingOptions.logback()
systemProperty("logback.configurationFile").value(
Paths.get("src", "test", "resources", "logback.xml").toUri().toString())
);
}

protected static Option spiflyOptions() {
return composite(
mavenBundle("org.apache.aries", "org.apache.aries.util", "1.1.3"),
mavenBundle("org.ow2.asm", "asm", "9.7.1"),
mavenBundle("org.ow2.asm", "asm-tree", "9.7.1"),
mavenBundle("org.ow2.asm", "asm-analysis", "9.7.1"),
mavenBundle("org.ow2.asm", "asm-commons", "9.7.1"),
mavenBundle("org.ow2.asm", "asm-util", "9.7.1"),
mavenBundle("org.apache.aries.spifly", "org.apache.aries.spifly.dynamic.bundle", "1.3.7")
);
}

protected static Option jpmsOptions() {
return composite(
vmOption("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"),
vmOption("--add-opens=java.base/java.lang=ALL-UNNAMED"),
vmOption("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"),
vmOption("--add-opens=java.base/java.io=ALL-UNNAMED"),
vmOption("--add-opens=java.base/java.net=ALL-UNNAMED"),
vmOption("--add-opens=java.base/java.nio=ALL-UNNAMED"),
vmOption("--add-opens=java.base/java.util=ALL-UNNAMED"),
vmOption("--add-opens=java.base/java.util.jar=ALL-UNNAMED"),
vmOption("--add-opens=java.base/java.util.regex=ALL-UNNAMED"),
vmOption("--add-opens=java.base/java.util.zip=ALL-UNNAMED"),
vmOption("--add-opens=java.base/sun.nio.ch=ALL-UNNAMED")
);
}

protected Option felixFileInstall() {
return composite(
mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.9.22"),
mavenBundle("org.apache.felix", "org.apache.felix.fileinstall", "3.7.4"),
systemProperty("felix.fileinstall.dir").value(getConfigDir().toAbsolutePath().toString()),
systemProperty("felix.fileinstall.enableConfigSave").value("false"),
Expand Down
Loading