From 460d1251219e741e034efc083c7f8cd6f57c7238 Mon Sep 17 00:00:00 2001 From: Tim Ward Date: Mon, 27 Nov 2017 14:20:17 +0000 Subject: [PATCH] Provide a test for #6548 using the OSGi test suite Motiviation: The OSGi Test suite runs without access to sun.misc.Unsafe, and so is a good place to put a test to avoid regressing #6548. Modification: Added a test-case that failed before https://github.com/netty/netty/pull/7432. Result: Test for fix included. --- .../test/java/io/netty/osgitests/OsgiBundleTest.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java b/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java index f6c20f4e10..b56cd6ca5d 100644 --- a/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java +++ b/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java @@ -17,17 +17,19 @@ package io.netty.osgitests; import static org.junit.Assert.assertFalse; +import static org.ops4j.pax.exam.CoreOptions.frameworkProperty; import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.systemProperty; import static org.ops4j.pax.exam.CoreOptions.wrappedBundle; +import static org.osgi.framework.Constants.FRAMEWORK_BOOTDELEGATION; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -38,6 +40,7 @@ import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; +import io.netty.util.internal.PlatformDependent; @RunWith(PaxExam.class) public class OsgiBundleTest { @@ -86,6 +89,8 @@ public class OsgiBundleTest { public final Option[] config() { final Collection