From b7d355b285c30799da3ad704427439df5ec2caa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Wed, 14 Feb 2024 08:51:36 +0100 Subject: [PATCH] tests: suppress deprecated API even deprecated API deserve its tests --- .../tests/StructuredTextSomeMoreTest.java | 1 + .../common/tests/ProgressMonitorWrapperTest.java | 1 + .../registry/ExtensionRegistryStaticTest.java | 8 +++++++- .../common/tests/registry/MultiLanguageTest.java | 16 ++++++++++++++-- .../equinox/compendium/tests/Activator.java | 1 + .../internal/tests/RegionReflectionUtils.java | 1 + .../StandardRegionDigraphPeristenceTests.java | 1 + .../tests/hook/RegionServiceEventHookTests.java | 2 +- .../tests/hook/RegionServiceFindHookTests.java | 1 + .../tests/system/RegionPerformanceTests.java | 1 + .../region/tests/system/RegionSystemTests.java | 1 + .../test.bug287750/test/bug287750/Activator.java | 1 + .../osgi/tests/bundles/AbstractBundleTests.java | 1 + .../tests/bundles/BundleInstallUpdateTests.java | 1 + .../tests/bundles/ClassLoadingBundleTests.java | 1 + .../tests/bundles/PackageAdminBundleTests.java | 1 + .../bundles/SubstituteExportsBundleTests.java | 1 + .../MovableConfigurationAreaTest.java | 1 + .../ReadOnlyConfigurationAreaTest.java | 2 ++ .../tests/hooks/framework/StorageHookTests.java | 2 +- .../tests/internal/plugins/InstallTests.java | 1 + .../tests/listeners/ExceptionHandlerTests.java | 2 ++ .../osgi/tests/perf/BasePerformanceTest.java | 1 + .../osgi/tests/perf/CaseMapPerformanceTest.java | 1 + .../osgi/tests/perf/StatePerformanceTest.java | 1 + .../osgi/tests/resolver/TestAttributes_001.java | 1 + .../eclipse/osgi/tests/resolver/TestBSN_001.java | 1 + .../osgi/tests/resolver/TestCycle_001.java | 1 + .../osgi/tests/resolver/TestCycle_002.java | 1 + .../osgi/tests/resolver/TestCycle_003.java | 1 + .../osgi/tests/resolver/TestCycle_004.java | 1 + .../osgi/tests/resolver/TestCycle_005.java | 1 + .../osgi/tests/resolver/TestCycle_006.java | 1 + .../osgi/tests/resolver/TestDynamic_001.java | 1 + .../osgi/tests/resolver/TestDynamic_002.java | 1 + .../osgi/tests/resolver/TestDynamic_003.java | 1 + .../osgi/tests/resolver/TestDynamic_004.java | 1 + .../osgi/tests/resolver/TestDynamic_005.java | 1 + .../osgi/tests/resolver/TestDynamic_006.java | 1 + .../osgi/tests/resolver/TestGenerated_001.java | 1 + .../osgi/tests/resolver/TestGrouping_001.java | 1 + .../osgi/tests/resolver/TestGrouping_002.java | 1 + .../osgi/tests/resolver/TestGrouping_003.java | 1 + .../osgi/tests/resolver/TestGrouping_006.java | 1 + .../osgi/tests/resolver/TestGrouping_008.java | 1 + .../osgi/tests/resolver/TestOptional_001.java | 1 + .../osgi/tests/resolver/TestOptional_002.java | 1 + .../osgi/tests/resolver/TestPropagation_001.java | 1 + .../osgi/tests/resolver/TestPropagation_003.java | 1 + .../osgi/tests/resolver/TestRFC79_001.java | 1 + .../osgi/tests/resolver/TestRFC79_002.java | 1 + .../osgi/tests/resolver/TestRFC79_003.java | 1 + .../osgi/tests/resolver/TestRFC79_004.java | 1 + .../osgi/tests/resolver/TestRFC79_005.java | 1 + .../osgi/tests/resolver/TestRFC79_006.java | 1 + .../osgi/tests/resolver/TestRFC79_007.java | 1 + .../osgi/tests/resolver/TestVersion_001.java | 1 + .../osgi/tests/resolver/TestVersion_002.java | 1 + .../osgi/tests/resolver/TestVersion_003.java | 1 + .../tests/serviceregistry/ServiceHookTests.java | 1 + .../services/datalocation/FileManagerTests.java | 2 ++ .../datalocation/LocationAreaSessionTest.java | 1 + .../services/resolver/AbstractStateTest.java | 3 +++ .../services/resolver/GenericCapabilityTest.java | 1 + .../tests/services/resolver/NewResolverTest.java | 1 + .../services/resolver/PlatformAdminTest.java | 1 + .../services/resolver/StateComparisonTest.java | 2 ++ .../tests/services/resolver/StateCycleTest.java | 1 + .../services/resolver/StateResolverTest.java | 1 + 69 files changed, 94 insertions(+), 5 deletions(-) diff --git a/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextSomeMoreTest.java b/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextSomeMoreTest.java index e334dd8f527..c2d007d0efc 100644 --- a/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextSomeMoreTest.java +++ b/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextSomeMoreTest.java @@ -86,6 +86,7 @@ public int indexOfSpecial(IStructuredTextExpert expert, String text, StructuredT StructuredTextEnvironment.ORIENT_LTR); @Test + @SuppressWarnings("deprecation") // isProcessingNeeded public void testSomeMore() { assertFalse(env1.isProcessingNeeded()); assertTrue(env2.isProcessingNeeded()); diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/ProgressMonitorWrapperTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/ProgressMonitorWrapperTest.java index 48d5e570e04..f6a85401cd3 100644 --- a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/ProgressMonitorWrapperTest.java +++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/ProgressMonitorWrapperTest.java @@ -24,6 +24,7 @@ /** * Test cases for the Path class. */ +@SuppressWarnings("deprecation") // SubProgressMonitor public class ProgressMonitorWrapperTest { /** diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryStaticTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryStaticTest.java index 31008003850..f85a91fbbec 100644 --- a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryStaticTest.java +++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryStaticTest.java @@ -21,7 +21,11 @@ import java.io.IOException; import java.net.MalformedURLException; import java.util.Arrays; -import org.eclipse.core.runtime.*; + +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.RegistryFactory; import org.eclipse.core.tests.harness.BundleTestingHelper; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -57,6 +61,7 @@ public void testAFromCache() { testExtensionPoint("A"); } + @SuppressWarnings("deprecation") // getNamespace private void testExtensionPoint(String name) { assertNotNull(RegistryFactory.getRegistry().getExtensionPoint("test" + name + ".xpt" + name)); assertEquals(RegistryFactory.getRegistry().getExtensionPoint("test" + name + ".xpt" + name).getLabel(), @@ -242,6 +247,7 @@ public void testF() throws IOException, BundleException { } @Test + @SuppressWarnings("deprecation") // getNamespace public void testG() throws IOException, BundleException { // fragment contributing an extension point to a plugin that do not have // extension or extension point diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/MultiLanguageTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/MultiLanguageTest.java index caf554054c1..0e3452e9117 100644 --- a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/MultiLanguageTest.java +++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/MultiLanguageTest.java @@ -20,8 +20,14 @@ import java.io.File; import java.util.Locale; + import org.eclipse.core.internal.registry.IRegistryConstants; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; +import org.eclipse.core.runtime.IExtensionPoint; +import org.eclipse.core.runtime.IExtensionRegistry; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.RegistryFactory; import org.eclipse.core.runtime.spi.RegistryStrategy; import org.eclipse.core.tests.harness.BundleTestingHelper; import org.eclipse.core.tests.harness.FileSystemHelper; @@ -29,13 +35,19 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.osgi.framework.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkEvent; +import org.osgi.framework.FrameworkListener; +import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.ServiceRegistration; import org.osgi.service.packageadmin.PackageAdmin; import org.osgi.util.tracker.ServiceTracker; /** * Run with no NL argument or with "-nl en". */ +@SuppressWarnings("deprecation") // PackageAdmin public class MultiLanguageTest { class LocaleProviderTest implements LocaleProvider { diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/compendium/tests/Activator.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/compendium/tests/Activator.java index 69d4aca7762..18946f0cb6e 100644 --- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/compendium/tests/Activator.java +++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/compendium/tests/Activator.java @@ -20,6 +20,7 @@ /** * 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$ diff --git a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/RegionReflectionUtils.java b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/RegionReflectionUtils.java index c3b9363e804..2a9fa36afb7 100644 --- a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/RegionReflectionUtils.java +++ b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/RegionReflectionUtils.java @@ -191,6 +191,7 @@ public static ResolverHook newRegionResolverHook(RegionDigraph digraph) { return (ResolverHook) newInstance(regionResolverHook, classParams, constructorArgs); } + @SuppressWarnings("deprecation") // EventHook public static org.osgi.framework.hooks.service.EventHook newRegionServiceEventHook(RegionDigraph digraph) { Class regionServiceEventHook = loadRegionImplClass(RegionServiceEventHook); Class[] classParams = new Class[] { RegionDigraph.class }; diff --git a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/StandardRegionDigraphPeristenceTests.java b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/StandardRegionDigraphPeristenceTests.java index e1d9011652d..84ca2b6077f 100644 --- a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/StandardRegionDigraphPeristenceTests.java +++ b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/StandardRegionDigraphPeristenceTests.java @@ -207,6 +207,7 @@ private void doTest(int iterations) throws IOException { input.close(); } + @SuppressWarnings("deprecation") // VISIBLE_SERVICE_NAMESPACE private RegionFilter createFilter(String... input) throws InvalidSyntaxException { RegionFilterBuilder builder = digraph.createRegionFilterBuilder(); for (String param : input) { diff --git a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionServiceEventHookTests.java b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionServiceEventHookTests.java index 2f59204ce52..91b0ab650f5 100644 --- a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionServiceEventHookTests.java +++ b/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}. */ +@SuppressWarnings("deprecation") // EventHook, RegionFilter.VISIBLE_SERVICE_NAMESPACE public class RegionServiceEventHookTests { private static final String BUNDLE_X = "X"; @@ -57,7 +58,6 @@ public class RegionServiceEventHookTests { private RegionDigraph digraph; - @SuppressWarnings("deprecation") private EventHook serviceEventHook; private Map regions; diff --git a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionServiceFindHookTests.java b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionServiceFindHookTests.java index 1fa116d03a5..517890a6a86 100644 --- a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/internal/tests/hook/RegionServiceFindHookTests.java +++ b/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}. */ +@SuppressWarnings("deprecation") // RegionFilter.VISIBLE_SERVICE_NAMESPACE public class RegionServiceFindHookTests { private static final String BUNDLE_X = "X"; diff --git a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionPerformanceTests.java b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionPerformanceTests.java index dfe9890d775..184561a9257 100644 --- a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionPerformanceTests.java +++ b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionPerformanceTests.java @@ -156,6 +156,7 @@ protected void test() { runner.run(this, fingerPrintName, 10, 2000); } + @SuppressWarnings("deprecation") // VISIBLE_SERVICE_NAMESPACE private void createRegions(final int numRegions) throws BundleException { System.out.println("Starting region create: " + numRegions); long time = System.currentTimeMillis(); diff --git a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionSystemTests.java b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionSystemTests.java index bdb46c7b311..1008d5e8fb1 100644 --- a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionSystemTests.java +++ b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/RegionSystemTests.java @@ -40,6 +40,7 @@ import org.osgi.framework.wiring.*; import org.osgi.util.tracker.ServiceTracker; +@SuppressWarnings("deprecation") // RegionFilter.VISIBLE_SERVICE_NAMESPACE public class RegionSystemTests extends AbstractRegionSystemTest { @Rule diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/test.bug287750/test/bug287750/Activator.java b/bundles/org.eclipse.osgi.tests/bundles_src/test.bug287750/test/bug287750/Activator.java index d2ffe2f5823..a4d4477fe3d 100644 --- a/bundles/org.eclipse.osgi.tests/bundles_src/test.bug287750/test/bug287750/Activator.java +++ b/bundles/org.eclipse.osgi.tests/bundles_src/test.bug287750/test/bug287750/Activator.java @@ -17,6 +17,7 @@ import org.osgi.framework.BundleContext; import org.osgi.service.startlevel.StartLevel; +@SuppressWarnings("deprecation") // StartLevel public class Activator implements BundleActivator { public void start(BundleContext context) throws Exception { diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/AbstractBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/AbstractBundleTests.java index 4f3ed7cd3b8..c2ef43359b9 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/AbstractBundleTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/AbstractBundleTests.java @@ -261,6 +261,7 @@ static public void stop(Framework equinox, int expected) { } } + @SuppressWarnings("deprecation") // STOPPED_BOOTCLASSPATH_MODIFIED static private String getFrameworkEventType(int type) { switch (type) { case FrameworkEvent.ERROR: diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstallUpdateTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstallUpdateTests.java index ab0b8dae0b9..4c3cc373c64 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstallUpdateTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstallUpdateTests.java @@ -115,6 +115,7 @@ public void testUpdateWithStream02() throws Exception { // make sure b1 is still last bundle in bundles list Bundle[] bundles = OSGiTestsActivator.getContext().getBundles(); assertTrue("Wrong bundle at the end: " + bundles[bundles.length - 1], bundles[bundles.length - 1] == b1); //$NON-NLS-1$ + @SuppressWarnings("deprecation") // getBundles Bundle[] tests = installer.getPackageAdmin().getBundles(test.getSymbolicName(), null); assertNotNull("null tests", tests); //$NON-NLS-1$ assertEquals("Wrong number", 1, tests.length); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java index fdfbad56eac..c86b80fe702 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java @@ -84,6 +84,7 @@ import org.osgi.service.packageadmin.PackageAdmin; import org.osgi.service.startlevel.StartLevel; +@SuppressWarnings("deprecation") // StartLevel, PackageAdmin, ExportedPackage public class ClassLoadingBundleTests extends AbstractBundleTests { @Test diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PackageAdminBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PackageAdminBundleTests.java index a8a86e8b4c1..778eb0726fd 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PackageAdminBundleTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/PackageAdminBundleTests.java @@ -41,6 +41,7 @@ import org.osgi.service.packageadmin.ExportedPackage; import org.osgi.service.packageadmin.PackageAdmin; +@SuppressWarnings("deprecation") // PackageAdmin, ExportedPackage public class PackageAdminBundleTests extends AbstractBundleTests { public class TestListener implements SynchronousBundleListener { ArrayList events = new ArrayList(); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SubstituteExportsBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SubstituteExportsBundleTests.java index 046b017cf3c..2b21291dd4d 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SubstituteExportsBundleTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SubstituteExportsBundleTests.java @@ -24,6 +24,7 @@ import org.osgi.service.packageadmin.ExportedPackage; import org.osgi.service.packageadmin.PackageAdmin; +@SuppressWarnings("deprecation") // PackageAdmin, ExportedPackage public class SubstituteExportsBundleTests extends AbstractBundleTests { @Test 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 98ea6e7e5f1..f43ba14a124 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 @@ -99,6 +99,7 @@ public MovableConfigurationAreaTest(String name) { * default the manifest generation area is under the configuration area (which * is read-only here) */ + @SuppressWarnings("deprecation") // installBundle public void testAfterMoving() throws MalformedURLException, IOException, BundleException { // try to install plug-in // ensure it is not installed 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 6f03139e1c1..9985e97ac28 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 @@ -77,6 +77,7 @@ public void test1stSessionFollowUp() throws IOException { * default the manifest generation area is under the configuration area (which * is read-only here) */ + @SuppressWarnings("deprecation") // installBundle public void test2ndSession() throws BundleException, IOException { // try to install plug-in // ensure it is not installed @@ -108,6 +109,7 @@ public void test2ndSessionFollowUp() throws IOException { * the manifest generation area is under the configuration area (which is * read-only here) */ + @SuppressWarnings("deprecation") // installBundle public void test3rdSession() throws BundleException, IOException { // install plug-in // ensure it is not installed diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java index 7996946f8c9..b45b6816fb2 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/StorageHookTests.java @@ -42,6 +42,7 @@ import org.osgi.resource.Capability; import org.osgi.service.packageadmin.PackageAdmin; +@SuppressWarnings("deprecation") // PackageAdmin public class StorageHookTests extends AbstractFrameworkHookTests { private static final String TEST_BUNDLE = "test"; private static final String HOOK_CONFIGURATOR_BUNDLE = "storage.hooks.a"; @@ -257,7 +258,6 @@ public void testAdaptModuleRevisionBuilder() throws Exception { } @Test - @SuppressWarnings("deprecation") public void testFrameworkUtilHelper() throws Exception { initAndStartFramework(); Class frameworkUtilClass = classLoader.loadClass("org.osgi.framework.FrameworkUtil"); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java index 844b04665ec..6d872788dbc 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java @@ -33,6 +33,7 @@ /** * Provisory home for tests that install plugins. */ +@SuppressWarnings("deprecation") // PackageAdmin public class InstallTests { @Test diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java index 88fdbe610b3..df490451a81 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java @@ -57,6 +57,7 @@ public synchronized FrameworkEvent getResult(long timeout) { } @Test + @SuppressWarnings("deprecation") // installBundle public void testNonFatalException() { FrameworkEventListenerWithResult fwkListener = new FrameworkEventListenerWithResult(); OSGiTestsActivator.getContext().addFrameworkListener(fwkListener); @@ -82,6 +83,7 @@ public void testNonFatalException() { } @Test + @SuppressWarnings("deprecation") // installBundle public void testFatalException() { FrameworkEventListenerWithResult fwkListener = new FrameworkEventListenerWithResult(); OSGiTestsActivator.getContext().addFrameworkListener(fwkListener); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java index 855abec4253..06679b63945 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/BasePerformanceTest.java @@ -25,6 +25,7 @@ import org.eclipse.osgi.tests.services.resolver.AbstractStateTest; import org.osgi.framework.Version; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class BasePerformanceTest extends AbstractStateTest { private Random random; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java index b6d9764e1d8..586174d9563 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/CaseMapPerformanceTest.java @@ -23,6 +23,7 @@ import org.junit.rules.TestName; import org.osgi.framework.Constants; +@SuppressWarnings("deprecation") // Headers public class CaseMapPerformanceTest { @Rule public TestName testName = new TestName(); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java index daadaece57c..ce4af778681 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java @@ -27,6 +27,7 @@ public class StatePerformanceTest extends BasePerformanceTest { @Rule public TestName testName = new TestName(); + @SuppressWarnings("deprecation") // writeState State storeAndRetrieve(State toStore) throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); toStore.getFactory().writeState(toStore, baos); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java index 73492cf903a..33bde319fc3 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestAttributes_001.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestAttributes_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java index e4f5736f275..cf853fd4ce3 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestBSN_001.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestBSN_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java index f865d3aecac..6c6f30b769e 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_001.java @@ -24,6 +24,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestCycle_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java index b88c6aeb932..4c1d5a6dd7e 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_002.java @@ -24,6 +24,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestCycle_002 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java index 23ba1eba953..8b499359a65 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_003.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestCycle_003 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java index 41e130ed3f1..8a8c8087f99 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_004.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestCycle_004 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java index b8b2636c3cd..f4b74ea33fe 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_005.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestCycle_005 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java index 8b5980a389c..c101e234ba2 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestCycle_006.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestCycle_006 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java index f9343e113dd..8e7ae231c63 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_001.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestDynamic_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java index dbb18077d40..d4198f18f47 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_002.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestDynamic_002 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java index d12a2b89666..6fbf20f9e92 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_003.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestDynamic_003 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java index 9640b43e5ea..481d203823b 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_004.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestDynamic_004 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java index fe9e53367bd..e7bcb2624ee 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_005.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestDynamic_005 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java index 556ab43e78e..33525c898ee 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestDynamic_006.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestDynamic_006 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java index b0d1c0ae804..803bc78ac13 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGenerated_001.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestGenerated_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java index 52635798627..0cf2b97e43a 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_001.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestGrouping_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java index 86d03684518..16ca81973dd 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_002.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestGrouping_002 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java index 4e99da6d518..abd6fa5283f 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_003.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestGrouping_003 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java index 398435bb8fc..22c0906f9eb 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_006.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestGrouping_006 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java index f0ab9499e99..213e74f70bc 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestGrouping_008.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestGrouping_008 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java index 5ff428a18aa..e7632a1daa9 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_001.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestOptional_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java index c3a3978930d..6942f1edd9b 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestOptional_002.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestOptional_002 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java index d0cf3343306..6ff1b1a17fe 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_001.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestPropagation_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java index 44297e08b64..5cfef65f8f7 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestPropagation_003.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestPropagation_003 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java index 4d0de917996..0dab294f181 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_001.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestRFC79_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java index f90a86ff946..fcabc5daca7 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_002.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestRFC79_002 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java index 4cfe19f9e76..fdf57052edd 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_003.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestRFC79_003 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java index 7a5d8bc4da1..70f675558f8 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_004.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestRFC79_004 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java index e1a86294ae4..71d6cb110bf 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_005.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestRFC79_005 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java index 18d7518fd11..90a5400d624 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_006.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestRFC79_006 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java index 7d5171bcea9..d65dfb9df34 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestRFC79_007.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestRFC79_007 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java index a3d44781974..e42bee2c511 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_001.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestVersion_001 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java index ceccad1dd85..bb6ef6f7496 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_002.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestVersion_002 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java index ae82e556223..5d0c429c14d 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resolver/TestVersion_003.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.osgi.framework.BundleException; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class TestVersion_003 extends AbstractStateTest { BundleDescription bundle_1 = null; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceHookTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceHookTests.java index 4583442a4a6..f558f162a3b 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceHookTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/serviceregistry/ServiceHookTests.java @@ -42,6 +42,7 @@ import org.osgi.framework.hooks.service.FindHook; import org.osgi.framework.hooks.service.ListenerHook; +@SuppressWarnings("deprecation") // EventHook public class ServiceHookTests extends AbstractBundleTests { @Test diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/FileManagerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/FileManagerTests.java index 427273ef705..a0bba22b378 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/FileManagerTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/FileManagerTests.java @@ -358,6 +358,7 @@ public void testMultipleFileManagers() throws IOException { // holds a file lock. This is true on Win32 but not on Linux/Mac unless using // Java 6. // So run this test for windows only. + @SuppressWarnings("deprecation") String ee = System.getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT); if (!"win32".equalsIgnoreCase(System.getProperty("osgi.os")) && ee.indexOf("JavaSE-1.6") == -1) // this is a Windows-only test or JavaSE-1.6 or higher test @@ -510,6 +511,7 @@ public void testCleanupOnOpen() throws IOException { // holds a file lock. This is true on Win32 but not on Linux/Mac unless using // Java 6. // So run this test for windows only or Java 6 or higher. + @SuppressWarnings("deprecation") String ee = System.getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT); if ("win32".equalsIgnoreCase(System.getProperty("osgi.os")) || ee.indexOf("JavaSE-1.6") != -1) { // this is a Windows-only test or JavaSE-1.6 or higher test 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 fb366a40173..1486b9eef2f 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 @@ -143,6 +143,7 @@ static void doLock(String testLocationDir, String type, boolean release, boolean } } + @SuppressWarnings("deprecation") // setURL static void doLock(String testLocationDir, boolean release, boolean succeed) throws InvalidSyntaxException, IOException { assertNotNull("The testLocationDir is not set", testLocationDir); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AbstractStateTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AbstractStateTest.java index 0bc6c53d9f9..de62d9797ed 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AbstractStateTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/AbstractStateTest.java @@ -213,6 +213,7 @@ public void assertIdentical(String tag, State original, State copy) { assertEquals(tag, original, copy); } + @SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public State buildComplexState() throws BundleException { State state = buildEmptyState(); /* @@ -270,6 +271,7 @@ public State buildEmptyState() { return StateObjectFactory.defaultFactory.createState(true); } + @SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public State buildInitialState() throws BundleException { State state = buildEmptyState(); /* @@ -284,6 +286,7 @@ public State buildInitialState() throws BundleException { return state; } + @SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public State buildSimpleState() throws BundleException { State state = buildEmptyState(); /* diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/GenericCapabilityTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/GenericCapabilityTest.java index 162181c8e62..c72736ea2b4 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/GenericCapabilityTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/GenericCapabilityTest.java @@ -387,6 +387,7 @@ public void testGenericsIntraFrags() throws BundleException { assertEquals("2.4.1", genSpecs[3].getSupplier(), selectedFragBCapabilities[0]); } + @SuppressWarnings("deprecation") // Constants.EXPORT_SERVICE @Test public void testGenericsAliases() throws BundleException { State state = buildEmptyState(); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java index cd7f0568869..c39cccdd6b1 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java @@ -29,6 +29,7 @@ public void testSkeleton() { } @Test + @SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public void testBasicScenario1() throws BundleException { State state = buildEmptyState(); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/PlatformAdminTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/PlatformAdminTest.java index f5b1341aac7..db7926be773 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/PlatformAdminTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/PlatformAdminTest.java @@ -42,6 +42,7 @@ public class PlatformAdminTest extends AbstractStateTest { private static final String GENERIC_REQUIRE = "Eclipse-GenericRequire"; //$NON-NLS-1$ private static final String GENERIC_CAPABILITY = "Eclipse-GenericCapability"; //$NON-NLS-1$ + @SuppressWarnings("deprecation") // writeState private State storeAndRetrieve(State toStore) throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); toStore.getFactory().writeState(toStore, baos); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateComparisonTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateComparisonTest.java index a31b5cbbb97..dec4f77ba0b 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateComparisonTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateComparisonTest.java @@ -26,6 +26,7 @@ public class StateComparisonTest extends AbstractStateTest { @Test + @SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public void testAddition() throws BundleException { State state1 = buildEmptyState(); State state2 = state1.getFactory().createState(state1); @@ -73,6 +74,7 @@ public void testRemoval() throws BundleException { } @Test + @SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public void testUpdate() throws BundleException { State state1 = buildSimpleState(); State state2 = state1.getFactory().createState(state1); diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateCycleTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateCycleTest.java index 43e24d8bfe8..33dcc91e2ee 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateCycleTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateCycleTest.java @@ -23,6 +23,7 @@ import org.osgi.framework.BundleException; import org.osgi.framework.Constants; +@SuppressWarnings("deprecation") // StateObjectFactory.createBundleDescription() public class StateCycleTest extends AbstractStateTest { @Test diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java index c492ba8abfd..59b91b14f03 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java @@ -58,6 +58,7 @@ import org.osgi.framework.wiring.BundleWiring; import org.osgi.resource.Capability; +@SuppressWarnings("deprecation") // Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT public class StateResolverTest extends AbstractStateTest { /**