From 1fa688703ff0671942c8ab46feb56531643492a2 Mon Sep 17 00:00:00 2001 From: Heiko Klare Date: Thu, 21 Dec 2023 15:29:45 +0100 Subject: [PATCH] Remove abstract OSGiTest class and dependency to CoreTest This removes all dependencies to the to-be-removed JUnit 3-specific CoreTest class. To this end, the OSGiTest class, which only contains utility methods, is removed and the remaining utility fields and methods moved to the existing OSGiTestActivator class. --- .../src/org/eclipse/osgi/tests/OSGiTest.java | 50 ------------------- .../osgi/tests/OSGiTestsActivator.java | 19 ++++++- .../tests/appadmin/ApplicationAdminTest.java | 4 +- .../appadmin/ApplicationRelaunchTest.java | 4 +- .../EclipseStarterConfigIniTest.java | 4 +- .../EclipseStarterConfigurationAreaTest.java | 4 +- .../MovableConfigurationAreaTest.java | 4 +- .../ReadOnlyConfigurationAreaTest.java | 4 +- .../osgi/tests/security/SignedBundleTest.java | 5 +- .../datalocation/LocationAreaSessionTest.java | 4 +- .../tests/util/TextProcessorSessionTest.java | 5 +- 11 files changed, 37 insertions(+), 70 deletions(-) delete mode 100644 bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java deleted file mode 100644 index 473d65ae1d7..00000000000 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.osgi.tests; - -import org.eclipse.core.tests.harness.CoreTest; -import org.eclipse.core.tests.session.ConfigurationSessionTestSuite; -import org.osgi.framework.BundleContext; - -/** - * @since 3.1 - */ -public class OSGiTest extends CoreTest { - - public static final String PI_OSGI_TESTS = "org.eclipse.osgi.tests"; - - public OSGiTest() { - super(); - } - - public OSGiTest(String name) { - super(name); - } - - public BundleContext getContext() { - return OSGiTestsActivator.getContext(); - } - - public static void addRequiredOSGiTestsBundles(ConfigurationSessionTestSuite suite) { - suite.addMinimalBundleSet(); - suite.addThisBundle(); - suite.addBundle(org.osgi.util.function.Function.class); - suite.addBundle(org.osgi.util.measurement.Measurement.class); - suite.addBundle(org.osgi.util.position.Position.class); - suite.addBundle(org.osgi.util.promise.Promise.class); - suite.addBundle(org.osgi.util.xml.XMLParserActivator.class); - suite.addBundle(org.osgi.service.event.Event.class); - } - -} diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java index ce11c84d5ee..a2c7441c7bd 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/OSGiTestsActivator.java @@ -14,16 +14,19 @@ *******************************************************************************/ package org.eclipse.osgi.tests; +import org.eclipse.core.tests.session.ConfigurationSessionTestSuite; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; public class OSGiTestsActivator { - private OSGiTestsActivator() { - } + public static final String PI_OSGI_TESTS = "org.eclipse.osgi.tests"; public static final String TEST_FILES_ROOT = "test_files/"; + private OSGiTestsActivator() { + } + public static Bundle getBundle() { return FrameworkUtil.getBundle(OSGiTestsActivator.class); } @@ -31,4 +34,16 @@ public static Bundle getBundle() { public static BundleContext getContext() { return getBundle().getBundleContext(); } + + public static void addRequiredOSGiTestsBundles(ConfigurationSessionTestSuite suite) { + suite.addMinimalBundleSet(); + suite.addThisBundle(); + suite.addBundle(org.osgi.util.function.Function.class); + suite.addBundle(org.osgi.util.measurement.Measurement.class); + suite.addBundle(org.osgi.util.position.Position.class); + suite.addBundle(org.osgi.util.promise.Promise.class); + suite.addBundle(org.osgi.util.xml.XMLParserActivator.class); + suite.addBundle(org.osgi.service.event.Event.class); + } + } diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java index ee7e748cf94..53ce0b642c2 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.appadmin; -import static org.eclipse.osgi.tests.OSGiTest.PI_OSGI_TESTS; -import static org.eclipse.osgi.tests.OSGiTest.addRequiredOSGiTestsBundles; +import static org.eclipse.osgi.tests.OSGiTestsActivator.PI_OSGI_TESTS; +import static org.eclipse.osgi.tests.OSGiTestsActivator.addRequiredOSGiTestsBundles; import static org.eclipse.osgi.tests.OSGiTestsActivator.getContext; import java.util.ArrayList; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationRelaunchTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationRelaunchTest.java index dfa18ce8111..780174abb8d 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationRelaunchTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationRelaunchTest.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.appadmin; -import static org.eclipse.osgi.tests.OSGiTest.PI_OSGI_TESTS; -import static org.eclipse.osgi.tests.OSGiTest.addRequiredOSGiTestsBundles; +import static org.eclipse.osgi.tests.OSGiTestsActivator.PI_OSGI_TESTS; +import static org.eclipse.osgi.tests.OSGiTestsActivator.addRequiredOSGiTestsBundles; import static org.eclipse.osgi.tests.OSGiTestsActivator.getContext; import java.util.HashMap; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java index 2440c0e7779..6e61ffa3750 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigIniTest.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.configuration; -import static org.eclipse.osgi.tests.OSGiTest.PI_OSGI_TESTS; -import static org.eclipse.osgi.tests.OSGiTest.addRequiredOSGiTestsBundles; +import static org.eclipse.osgi.tests.OSGiTestsActivator.PI_OSGI_TESTS; +import static org.eclipse.osgi.tests.OSGiTestsActivator.addRequiredOSGiTestsBundles; import static org.junit.Assert.assertThrows; import java.io.ByteArrayInputStream; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java index 7a9af01571a..2b1d6636c1c 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/EclipseStarterConfigurationAreaTest.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.configuration; -import static org.eclipse.osgi.tests.OSGiTest.PI_OSGI_TESTS; -import static org.eclipse.osgi.tests.OSGiTest.addRequiredOSGiTestsBundles; +import static org.eclipse.osgi.tests.OSGiTestsActivator.PI_OSGI_TESTS; +import static org.eclipse.osgi.tests.OSGiTestsActivator.addRequiredOSGiTestsBundles; import static org.eclipse.osgi.tests.OSGiTestsActivator.getContext; import java.util.List; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java index 5932a025b3d..d8466cd2d68 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/MovableConfigurationAreaTest.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.configuration; -import static org.eclipse.osgi.tests.OSGiTest.PI_OSGI_TESTS; -import static org.eclipse.osgi.tests.OSGiTest.addRequiredOSGiTestsBundles; +import static org.eclipse.osgi.tests.OSGiTestsActivator.PI_OSGI_TESTS; +import static org.eclipse.osgi.tests.OSGiTestsActivator.addRequiredOSGiTestsBundles; import static org.eclipse.osgi.tests.OSGiTestsActivator.getContext; import java.io.File; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java index b134dbd618d..83b0bc2ce5c 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/configuration/ReadOnlyConfigurationAreaTest.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.configuration; -import static org.eclipse.osgi.tests.OSGiTest.PI_OSGI_TESTS; -import static org.eclipse.osgi.tests.OSGiTest.addRequiredOSGiTestsBundles; +import static org.eclipse.osgi.tests.OSGiTestsActivator.PI_OSGI_TESTS; +import static org.eclipse.osgi.tests.OSGiTestsActivator.addRequiredOSGiTestsBundles; import static org.eclipse.osgi.tests.OSGiTestsActivator.getContext; import java.io.File; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SignedBundleTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SignedBundleTest.java index 1826b879576..f9dbafac5b2 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SignedBundleTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/SignedBundleTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.security; +import static org.eclipse.osgi.tests.OSGiTestsActivator.addRequiredOSGiTestsBundles; + import java.io.File; import java.io.IOException; import java.security.cert.Certificate; @@ -23,7 +25,6 @@ import org.eclipse.osgi.signedcontent.SignedContent; import org.eclipse.osgi.signedcontent.SignedContentEntry; import org.eclipse.osgi.signedcontent.SignerInfo; -import org.eclipse.osgi.tests.OSGiTest; import org.osgi.framework.Bundle; public class SignedBundleTest extends BaseSecurityTest { @@ -74,7 +75,7 @@ public void runTest() { public static Test suite() { ConfigurationSessionTestSuite suite = new ConfigurationSessionTestSuite(BUNDLE_SECURITY_TESTS, "Unit session tests for SignedContent"); - OSGiTest.addRequiredOSGiTestsBundles(suite); + addRequiredOSGiTestsBundles(suite); suite.addTestSuite(SignedBundleTest.class); return suite; } diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java index 14cde6550cc..812e451c3b8 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.services.datalocation; -import static org.eclipse.osgi.tests.OSGiTest.PI_OSGI_TESTS; -import static org.eclipse.osgi.tests.OSGiTest.addRequiredOSGiTestsBundles; +import static org.eclipse.osgi.tests.OSGiTestsActivator.PI_OSGI_TESTS; +import static org.eclipse.osgi.tests.OSGiTestsActivator.addRequiredOSGiTestsBundles; import java.io.File; import java.io.IOException; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorSessionTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorSessionTest.java index eddb4d1efa5..14dd0dafed2 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorSessionTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/util/TextProcessorSessionTest.java @@ -13,10 +13,11 @@ *******************************************************************************/ package org.eclipse.osgi.tests.util; +import static org.eclipse.osgi.tests.OSGiTestsActivator.addRequiredOSGiTestsBundles; + import org.eclipse.core.tests.session.ConfigurationSessionTestSuite; import org.eclipse.core.tests.session.Setup; import org.eclipse.core.tests.session.SetupManager.SetupException; -import org.eclipse.osgi.tests.OSGiTest; public class TextProcessorSessionTest extends ConfigurationSessionTestSuite { private String lang = null; @@ -30,7 +31,7 @@ public class TextProcessorSessionTest extends ConfigurationSessionTestSuite { public TextProcessorSessionTest(String pluginId, Class clazz, String language) { super(pluginId, clazz); lang = language; - OSGiTest.addRequiredOSGiTestsBundles(this); + addRequiredOSGiTestsBundles(this); } /* (non-Javadoc)