Fix log4j-osgi-test tests (#2621)

Author: vy

log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java

@@ -19,7 +19,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.List;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -88,10 +87,6 @@ private Bundle getCoreBundle() throws BundleException {
         return installBundle("org.apache.logging.log4j.core");
     }
 
-    private Bundle get12ApiBundle() throws BundleException {
-        return installBundle("org.apache.logging.log4j.1.2.api");
-    }
-
     private Bundle getApiTestsBundle() throws BundleException {
         return installBundle("org.apache.logging.log4j.api.test");
     }
@@ -162,40 +157,6 @@ public void testClassNotFoundErrorLogger() throws BundleException {
         uninstall(spiFly);
     }
 
-    /**
-     * Tests the loading of the 1.2 Compatibility API bundle, its classes should be loadable from the Core bundle,
-     * and the class loader should be the same between a class from core and a class from compat
-     */
-    @Test
-    public void testLog4J12Fragement() throws BundleException, ReflectiveOperationException {
-
-        final List<Bundle> spiFly = startApacheSpiFly();
-        final Bundle api = getApiBundle();
-        final Bundle kit = getKitBundle();
-        final Bundle plugins = getPluginsBundle();
-        final Bundle core = getCoreBundle();
-        final Bundle compat = get12ApiBundle();
-
-        doOnBundlesAndVerifyState(Bundle::start, Bundle.ACTIVE, api, kit, plugins, core);
-
-        final Class<?> coreClassFromCore = core.loadClass("org.apache.logging.log4j.core.Core");
-        final Class<?> levelClassFrom12API = core.loadClass("org.apache.log4j.Level");
-        final Class<?> levelClassFromAPI = core.loadClass("org.apache.logging.log4j.Level");
-
-        assertEquals(
-                "expected 1.2 API Level to have the same class loader as Core",
-                levelClassFrom12API.getClassLoader(),
-                coreClassFromCore.getClassLoader());
-        Assert.assertNotEquals(
-                "expected 1.2 API Level NOT to have the same class loader as API Level",
-                levelClassFrom12API.getClassLoader(),
-                levelClassFromAPI.getClassLoader());
-
-        doOnBundlesAndVerifyState(Bundle::stop, Bundle.RESOLVED, core, plugins, kit, api);
-        doOnBundlesAndVerifyState(Bundle::uninstall, Bundle.UNINSTALLED, compat, core, plugins, kit, api);
-        uninstall(spiFly);
-    }
-
     private static void doOnBundlesAndVerifyState(
             final ThrowingConsumer<Bundle> operation, final int expectedState, final Bundle... bundles) {
         for (final Bundle bundle : bundles) {

log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java

@@ -50,7 +50,6 @@ public Option[] config() {
                 linkBundle("org.apache.logging.log4j.plugins"),
                 linkBundle("org.apache.logging.log4j.kit"),
                 linkBundle("org.apache.logging.log4j.core"),
-                linkBundle("org.apache.logging.log4j.1.2.api").start(false),
                 // required by Pax Exam's logging
                 linkBundle("org.objectweb.asm"),
                 linkBundle("org.objectweb.asm.commons"),