Build o.e.equinox.compendium.tests and o.e.equinox.region.tests

- Disable currently failing RegionTests.
- Remove unnecessary test-suites that included all tests and just
execute all tests in the project.
- Move required Java version to 17.

bundles/org.eclipse.equinox.compendium.tests/META-INF/MANIFEST.MF

@@ -5,7 +5,12 @@ Bundle-SymbolicName: org.eclipse.equinox.compendium.tests
 Bundle-Version: 1.2.400.qualifier
 Bundle-Activator: org.eclipse.equinox.compendium.tests.Activator
 Require-Bundle: org.eclipse.core.runtime,
- org.junit;bundle-version="4.12.0"
+ org.junit;bundle-version="4.12.0",
+ org.eclipse.equinox.coordinator,
+ org.eclipse.equinox.useradmin,
+ org.eclipse.equinox.event,
+ org.eclipse.equinox.metatype,
+ org.apache.felix.scr
 Import-Package: org.eclipse.equinox.metatype;version="1.2.0",
  org.eclipse.equinox.metatype.impl;version="1.2.0",
  org.eclipse.osgi.tests.bundles,

bundles/org.eclipse.equinox.compendium.tests/build.properties

@@ -55,6 +55,3 @@ jars.compile.order = bundle_tests/metatype/metatype.tb1.jar,\
                      bundle_tests/metatype/metatype.tb10.jar,\
                      bundle_tests/metatype/metatype.extendable.tb1.jar,\
                      bundle_tests/metatype/metatype.getMinMax.tb1.jar
-
-# Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
-pom.model.property.skipTests = true

bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/compendium/tests/Activator.java

@@ -13,79 +13,30 @@
  *******************************************************************************/
 package org.eclipse.equinox.compendium.tests;
 
+import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.*;
-import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * The activator class controls the plug-in life cycle
  */
-@SuppressWarnings("deprecation") // PackageAdmin
 public class Activator implements BundleActivator {
 	public static String BUNDLE_COORDINATOR = "org.eclipse.equinox.coordinator"; //$NON-NLS-1$
 	public static String BUNDLE_EVENT = "org.eclipse.equinox.event"; //$NON-NLS-1$
 	public static String BUNDLE_METATYPE = "org.eclipse.equinox.metatype"; //$NON-NLS-1$
 	public static String BUNDLE_USERADMIN = "org.eclipse.equinox.useradmin"; //$NON-NLS-1$
 
-	private static Activator plugin;
-	private static BundleContext context;
-
-	private ServiceTracker packageAdminTracker;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
 	public void start(BundleContext bc) throws Exception {
-		plugin = this;
-		packageAdminTracker = new ServiceTracker(bc, PackageAdmin.class.getName(), null);
-		packageAdminTracker.open();
-		Activator.context = bc;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bc) throws Exception {
-		if (packageAdminTracker != null) {
-			packageAdminTracker.close();
-			packageAdminTracker = null;
-		}
-		plugin = null;
+		FrameworkUtil.getBundle(org.apache.felix.scr.info.ScrInfo.class).start();
 	}
 
-	private static Activator getDefault() {
-		return plugin;
+	public void stop(BundleContext bc) throws Exception { // no-op
 	}
 
-	public static synchronized BundleContext getBundleContext() {
-		return context;
+	public static BundleContext getBundleContext() {
+		return FrameworkUtil.getBundle(Activator.class).getBundleContext();
 	}
 
-	public static synchronized Bundle getBundle(String symbolicName) {
-		PackageAdmin packageAdmin = Activator.getDefault().getPackageAdmin();
-		if (packageAdmin == null)
-			return null;
-
-		Bundle[] bundles = packageAdmin.getBundles(symbolicName, null);
-		if (bundles == null)
-			return null;
-		for (Bundle bundle : bundles) {
-			if ((bundle.getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
-				return bundle;
-			}
-		}
-		return null;
-	}
-
-	private PackageAdmin getPackageAdmin() {
-		if (packageAdminTracker == null) {
-			return null;
-		}
-		return (PackageAdmin) packageAdminTracker.getService();
+	public static Bundle getBundle(String symbolicName) {
+		return Platform.getBundle(symbolicName);
 	}
-
 }

bundles/org.eclipse.equinox.region.tests/META-INF/MANIFEST.MF

@@ -2,15 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Equinox Region Tests
 Bundle-SymbolicName: org.eclipse.equinox.region.tests
-Bundle-Version: 1.6.200.qualifier
+Bundle-Version: 1.6.300.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: junit.framework;version="4.8.1",
- org.aspectj.internal.lang.annotation;version="[1.6.3,2.0.0)";resolution:=optional,
- org.aspectj.lang;version="[1.6.3,2.0.0)";resolution:=optional,
- org.aspectj.lang.annotation;version="[1.6.3,2.0.0)";resolution:=optional,
- org.aspectj.lang.reflect;version="[1.6.3,2.0.0)";resolution:=optional,
- org.aspectj.runtime.internal;version="[1.6.3,2.0.0)";resolution:=optional,
- org.aspectj.runtime.reflect;version="[1.6.3,2.0.0)";resolution:=optional,
  org.eclipse.core.runtime;version="3.7.0",
  org.eclipse.core.tests.harness,
  org.eclipse.equinox.region;version="1.1.0",

bundles/org.eclipse.equinox.region.tests/build.properties

@@ -60,3 +60,5 @@ jars.compile.order = bundle_tests/PackageProvider1.jar,\
 
 src.includes = about.html
 
+# Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
+pom.model.property.testClass = org.eclipse.equinox.region.tests.AllTests

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/BundleIdBasedRegionTests.java

@@ -28,10 +28,10 @@
 import java.util.Iterator;
 import org.eclipse.equinox.region.*;
 import org.eclipse.equinox.region.RegionDigraph.FilteredRegion;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import org.osgi.framework.*;
 
+@Ignore
 public class BundleIdBasedRegionTests {
 
 	private static final String OTHER_REGION_NAME = "other";

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/StandardRegionDigraphPeristenceTests.java

@@ -23,6 +23,7 @@
 import org.junit.*;
 import org.osgi.framework.*;
 
+@Ignore
 public class StandardRegionDigraphPeristenceTests {
 
 	private RegionDigraph digraph;

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/StandardRegionDigraphTests.java

@@ -27,10 +27,10 @@
 import org.eclipse.equinox.region.RegionDigraph.FilteredRegion;
 import org.eclipse.virgo.teststubs.osgi.framework.StubBundle;
 import org.eclipse.virgo.teststubs.osgi.framework.StubBundleContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import org.osgi.framework.*;
 
+@Ignore
 public class StandardRegionDigraphTests {
 
 	private RegionDigraph digraph;

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/StandardRegionFilterTests.java

@@ -25,12 +25,12 @@
 import org.eclipse.equinox.region.RegionFilter;
 import org.eclipse.equinox.region.RegionFilterBuilder;
 import org.eclipse.virgo.teststubs.osgi.framework.*;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import org.osgi.framework.*;
 import org.osgi.framework.wiring.BundleCapability;
 import org.osgi.framework.wiring.BundleRevision;
 
+@Ignore
 public class StandardRegionFilterTests {
 
 	private static final String BUNDLE_SYMBOLIC_NAME = "A";

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionBundleCollisionHookTests.java

@@ -27,6 +27,7 @@
 import org.osgi.framework.*;
 import org.osgi.framework.hooks.bundle.CollisionHook;
 
+@Ignore
 public class RegionBundleCollisionHookTests {
 
 	private static final String BUNDLE_X = "X";

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionBundleEventHookTests.java

@@ -26,6 +26,7 @@
 import org.osgi.framework.*;
 import org.osgi.framework.hooks.bundle.EventHook;
 
+@Ignore
 public class RegionBundleEventHookTests {
 
 	private static final String BUNDLE_X = "X";

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionBundleFindHookTests.java

@@ -27,6 +27,7 @@
 import org.osgi.framework.*;
 import org.osgi.framework.hooks.bundle.FindHook;
 
+@Ignore
 public class RegionBundleFindHookTests {
 
 	private static final String BUNDLE_X = "X";

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionResolverHookTests.java

@@ -30,6 +30,7 @@
 import org.osgi.resource.Capability;
 import org.osgi.resource.Requirement;
 
+@Ignore
 public class RegionResolverHookTests {
 
 	private static final String PACKAGE_A = "package.a";

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionServiceEventHookTests.java

@@ -28,6 +28,7 @@
 /**
  * This testcase was based on {@link RegionBundleFindHookTests}.
  */
+@Ignore
 @SuppressWarnings("deprecation") // EventHook, RegionFilter.VISIBLE_SERVICE_NAMESPACE
 public class RegionServiceEventHookTests {
 

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionServiceFindHookTests.java

@@ -29,6 +29,7 @@
 /**
  * This testcase was based on {@link RegionBundleFindHookTests}.
  */
+@Ignore
 @SuppressWarnings("deprecation") // RegionFilter.VISIBLE_SERVICE_NAMESPACE
 public class RegionServiceFindHookTests {
 

bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionSystemTests.java

@@ -29,8 +29,7 @@
 import javax.management.*;
 import org.eclipse.equinox.region.*;
 import org.eclipse.equinox.region.RegionDigraph.FilteredRegion;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 import org.junit.rules.TestName;
 import org.osgi.framework.*;
 import org.osgi.framework.hooks.bundle.CollisionHook;
@@ -40,6 +39,7 @@
 import org.osgi.framework.wiring.*;
 import org.osgi.util.tracker.ServiceTracker;
 
+@Ignore
 @SuppressWarnings("deprecation") // RegionFilter.VISIBLE_SERVICE_NAMESPACE
 public class RegionSystemTests extends AbstractRegionSystemTest {
 

pom.xml

@@ -160,12 +160,12 @@
 		    <module>bundles/org.eclipse.equinox.bidi.tests</module>
 		    <module>bundles/org.eclipse.equinox.cm.test</module>
 		    <module>bundles/org.eclipse.equinox.common.tests</module>
-
+		    <module>bundles/org.eclipse.equinox.compendium.tests</module>
+
 		    <module>bundles/org.eclipse.equinox.ds.tests</module>
 		    <module>bundles/org.eclipse.equinox.preferences.tests</module>
-		    <!-- removed until the dependency on aspectj is removed. see bug 470000
 		    <module>bundles/org.eclipse.equinox.region.tests</module>
-		-->
+
 		    <module>bundles/org.eclipse.equinox.security.tests</module>
 		    <module>bundles/org.eclipse.equinox.app</module>
 		    <module>bundles/org.eclipse.equinox.preferences</module>