Additional change for bug 200068 - renamed bundle and class used in JUnit to shorten overall path length.
diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/org/eclipse/core/tests/runtime/adapterLoader/TestAdaptableUnknown.class b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/org/eclipse/core/tests/runtime/adapterLoader/TestAdaptableUnknown.class
deleted file mode 100644
index dd51362..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/org/eclipse/core/tests/runtime/adapterLoader/TestAdaptableUnknown.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/META-INF/MANIFEST.MF
similarity index 61%
rename from tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/META-INF/MANIFEST.MF
rename to tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/META-INF/MANIFEST.MF
index 36e3e2a..08001c3 100644
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: AdapterLoader Test Plug-in
-Bundle-SymbolicName: org.eclipse.core.tests.runtime.adapterLoader;singleton:=true
+Bundle-SymbolicName: testAdapter;singleton:=true
Bundle-Version: 1.0.0
Require-Bundle: org.eclipse.core.tests.runtime
-Export-Package: org.eclipse.core.tests.runtime.adapterLoader
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Export-Package: testAdapter
Eclipse-LazyStart: false
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/plugin.xml
similarity index 72%
rename from tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/plugin.xml
rename to tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/plugin.xml
index 8e98226..13a53f2 100644
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/plugin.xml
+++ b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/plugin.xml
@@ -4,7 +4,7 @@
<extension
point="org.eclipse.core.tests.runtime.factoryLoaderTest">
<AdapterClass
- name="org.eclipse.core.tests.runtime.adapterLoader.TestAdaptableUnknown">
+ name="testAdapter.testUnknown">
</AdapterClass>
</extension>
</plugin>
diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/src/org/eclipse/core/tests/runtime/adapterLoader/TestAdaptableUnknown.java b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/src/testAdapter/testUnknown.java
similarity index 85%
rename from tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/src/org/eclipse/core/tests/runtime/adapterLoader/TestAdaptableUnknown.java
rename to tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/src/testAdapter/testUnknown.java
index c1ab728..73c00d1 100644
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0/src/org/eclipse/core/tests/runtime/adapterLoader/TestAdaptableUnknown.java
+++ b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/src/testAdapter/testUnknown.java
@@ -8,8 +8,8 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.core.tests.runtime.adapterLoader;
+package testAdapter;
-public class TestAdaptableUnknown {
+public class testUnknown {
}
diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/testAdapter/testUnknown.class b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/testAdapter/testUnknown.class
new file mode 100644
index 0000000..e065ebf
--- /dev/null
+++ b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/adapters/testAdapter_1.0.0/testAdapter/testUnknown.class
Binary files differ
diff --git a/tests/org.eclipse.core.tests.runtime/plugin.xml b/tests/org.eclipse.core.tests.runtime/plugin.xml
index 9d165de..40dd58d 100644
--- a/tests/org.eclipse.core.tests.runtime/plugin.xml
+++ b/tests/org.eclipse.core.tests.runtime/plugin.xml
@@ -253,7 +253,7 @@
<extension point="org.eclipse.core.runtime.adapters">
<factory class="org.eclipse.core.tests.runtime.TestAdapterFactoryLoader"
adaptableType="org.eclipse.core.tests.runtime.TestAdaptable">
- <adapter type="org.eclipse.core.tests.runtime.adapterLoader.TestAdaptableUnknown"/>
+ <adapter type="testAdapter.testUnknown"/>
</factory>
</extension>
</plugin>
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerTest.java
index 9d5892a..561d5d5 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerTest.java
@@ -24,7 +24,7 @@
public class IAdapterManagerTest extends TestCase {
private static final String NON_EXISTING = "com.does.not.Exist";
private static final String TEST_ADAPTER = "org.eclipse.core.tests.runtime.TestAdapter";
- private static final String TEST_ADAPTER_CL = "org.eclipse.core.tests.runtime.adapterLoader.TestAdaptableUnknown";
+ private static final String TEST_ADAPTER_CL = "testAdapter.testUnknown";
private IAdapterManager manager;
public IAdapterManagerTest(String name) {
@@ -162,6 +162,8 @@
/**
* Test adapting to classes not reachable by the default bundle class loader
* (bug 200068).
+ * NOTE: This test uses .class file compiled with 1.4 JRE. As a result,
+ * the test can not be run on pre-1.4 JRE.
*/
public void testAdapterClassLoader() throws MalformedURLException, BundleException, IOException {
TestAdaptable adaptable = new TestAdaptable();
@@ -169,13 +171,13 @@
assertNull(manager.loadAdapter(adaptable, TEST_ADAPTER_CL));
Bundle bundle = null;
try {
- bundle = BundleTestingHelper.installBundle("0.1", RuntimeTestsPlugin.getContext(), RuntimeTestsPlugin.TEST_FILES_ROOT + "adapters/org.eclipse.core.tests.runtime.adapterLoader_1.0.0");
+ bundle = BundleTestingHelper.installBundle("0.1", RuntimeTestsPlugin.getContext(), RuntimeTestsPlugin.TEST_FILES_ROOT + "adapters/testAdapter_1.0.0");
BundleTestingHelper.refreshPackages(RuntimeTestsPlugin.getContext(), new Bundle[] {bundle});
assertTrue(manager.hasAdapter(adaptable, TEST_ADAPTER_CL));
Object result = manager.loadAdapter(adaptable, TEST_ADAPTER_CL);
assertNotNull(result);
- assertTrue("org.eclipse.core.tests.runtime.adapterLoader.TestAdaptableUnknown".equals(result.getClass().getName()));
+ assertTrue(TEST_ADAPTER_CL.equals(result.getClass().getName()));
} finally {
if (bundle != null)
bundle.uninstall();
