536590 - Adapt tests to reuse Spring 5.0.7 artefacts
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
index acdfeea..687e293 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
+++ b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
@@ -64,7 +64,7 @@
public void testLoadClassAndGetClassLoader() throws Exception {
Bundle bundle = installSpringCore(this.framework);
assertEquals("incorrect bundle loaded", "org.springframework.core", bundle.getSymbolicName());
- Class<?> cls = bundle.loadClass("org.springframework.core.JdkVersion");
+ Class<?> cls = bundle.loadClass("org.springframework.core.SpringVersion");
assertNotNull(cls);
assertTrue(cls.getClassLoader() instanceof KernelBundleClassLoader);
assertTrue("classloader is screwed", cls.getClassLoader().toString().contains("org.springframework.core"));
@@ -86,7 +86,7 @@
}
});
- bundle.loadClass("org.springframework.core.JdkVersion");
+ bundle.loadClass("org.springframework.core.SpringVersion");
assertEquals(1, count.get());
}
@@ -103,7 +103,7 @@
+ "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.apache.commons.codec/1.10.0/"
+ "8aff50e99bd7e53f8c4f5fe45c2a63f1d47dd19c/org.apache.commons.codec-1.10.0.jar").getAbsolutePath());
return osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/4.3.18.RELEASE"
- + "/94ea91866a78e518943e91488017d8b58d3142ad/org.springframework.core-4.3.18.RELEASE.jar").getAbsolutePath());
+ + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/5.0.7.RELEASE"
+ + "/7dbe6456d86292b3ade3ad3e6b3c1220f16e526/org.springframework.core-5.0.7.RELEASE.jar").getAbsolutePath());
}
}
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
index 8d21c14..8647685 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
+++ b/kernel/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
@@ -76,11 +76,11 @@
LibraryBridge libraryBridge = new LibraryBridge(new StubHashGenerator());
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/4.3.18.RELEASE"
- + "/94ea91866a78e518943e91488017d8b58d3142ad/org.springframework.core-4.3.18.RELEASE.jar")));
+ + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/5.0.7.RELEASE"
+ + "/7dbe6456d86292b3ade3ad3e6b3c1220f16e526/org.springframework.core-5.0.7.RELEASE.jar")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home")
- + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.beans/4.3.18.RELEASE"
- + "/533ebe4038cc80dbff5117214ecc094cb5f62e/org.springframework.beans-4.3.18.RELEASE.jar")));
+ + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.beans/5.0.7.RELEASE"
+ + "/9f0f8285e36850d0dcac345426911dbb77c33ba5/org.springframework.beans-5.0.7.RELEASE.jar")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentOne")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentTwo")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentThree")));
@@ -100,7 +100,7 @@
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
expect(bundleImport.getBundleSymbolicName()).andReturn("org.springframework.core").atLeastOnce();
- expect(bundleImport.getVersion()).andReturn(new VersionRange("[4.2,5)")).atLeastOnce();
+ expect(bundleImport.getVersion()).andReturn(new VersionRange("[5.0.7,6)")).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
@@ -120,7 +120,7 @@
for (ImportedPackage packageImport : packageImports) {
Map<String, String> attributes = packageImport.getAttributes();
assertEquals("org.springframework.core", attributes.get("bundle-symbolic-name"));
- assertEquals(new VersionRange("[4.3.18.RELEASE,4.3.18.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
+ assertEquals(new VersionRange("[5.0.7.RELEASE,5.0.7.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
}
@@ -132,7 +132,7 @@
ImportedLibrary libraryImport = createAndStoreMock(ImportedLibrary.class, mocks);
expect(libraryImport.getLibrarySymbolicName()).andReturn("org.springframework").atLeastOnce();
- expect(libraryImport.getVersion()).andReturn(new VersionRange("[4.3,5)")).atLeastOnce();
+ expect(libraryImport.getVersion()).andReturn(new VersionRange("[5.0,6)")).atLeastOnce();
expect(libraryImport.getResolution()).andReturn(Resolution.MANDATORY).anyTimes();
ImportExpansionHandler handler = new ImportExpansionHandler(repository, packagesExportedBySystemBundle, new MockEventLogger());
@@ -155,7 +155,7 @@
} else {
assertEquals("org.springframework.core", attributes.get("bundle-symbolic-name"));
}
- assertEquals(new VersionRange("[4.3.18.RELEASE,4.3.18.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
+ assertEquals(new VersionRange("[5.0.7.RELEASE,5.0.7.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
}
@@ -446,7 +446,7 @@
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
expect(bundleImport.getBundleSymbolicName()).andReturn("org.springframework.core").atLeastOnce();
- expect(bundleImport.getVersion()).andReturn(new VersionRange("[4.2,5)")).atLeastOnce();
+ expect(bundleImport.getVersion()).andReturn(new VersionRange("[5.0,6)")).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false);
@@ -455,7 +455,7 @@
replayMocks(mocks);
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest(new StringReader(
- "Manifest-Version: 1.0, Bundle-SymbolicName: B\nImport-Package: org.springframework.core;version=\"[4.5,4.6)\""));
+ "Manifest-Version: 1.0, Bundle-SymbolicName: B\nImport-Package: org.springframework.core;version=\"[5.5,5.6)\""));
handler.expandImports(asList(new ImportedLibrary[0]), singletonList(bundleImport), bundleManifest);
verifyMocks(mocks);
@@ -469,14 +469,14 @@
ImportedLibrary libraryImport = createAndStoreMock(ImportedLibrary.class, mocks);
expect(libraryImport.getLibrarySymbolicName()).andReturn("org.springframework").atLeastOnce();
- expect(libraryImport.getVersion()).andReturn(new VersionRange("[4.3,5)")).atLeastOnce();
+ expect(libraryImport.getVersion()).andReturn(new VersionRange("[5.0,6)")).atLeastOnce();
ImportExpansionHandler handler = new ImportExpansionHandler(repository, packagesExportedBySystemBundle, new MockEventLogger());
replayMocks(mocks);
BundleManifest bundleManifest = BundleManifestFactory.createBundleManifest(new StringReader(
- "Manifest-Version: 1.0\nBundle-SymbolicName: B\nImport-Package: org.springframework.core;version=\"[4.5,4.6)\""));
+ "Manifest-Version: 1.0\nBundle-SymbolicName: B\nImport-Package: org.springframework.core;version=\"[5.5,5.6)\""));
handler.expandImports(singletonList(libraryImport), asList(new ImportedBundle[0]), bundleManifest);
verifyMocks(mocks);
@@ -516,13 +516,13 @@
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
expect(bundleImport.getBundleSymbolicName()).andReturn("org.springframework.core").atLeastOnce();
- expect(bundleImport.getVersion()).andReturn(new VersionRange("[4.2,5)")).atLeastOnce();
+ expect(bundleImport.getVersion()).andReturn(new VersionRange("[5.0.7,6)")).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
ImportedLibrary libraryImport = createAndStoreMock(ImportedLibrary.class, mocks);
expect(libraryImport.getLibrarySymbolicName()).andReturn("org.springframework").atLeastOnce();
- expect(libraryImport.getVersion()).andReturn(new VersionRange("[4.2,5)")).atLeastOnce();
+ expect(libraryImport.getVersion()).andReturn(new VersionRange("[5.0.7,6)")).atLeastOnce();
expect(libraryImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
ImportExpansionHandler handler = new ImportExpansionHandler(repository, packagesExportedBySystemBundle, new MockEventLogger());
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd b/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
index d38b3d8..465063b 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
+++ b/kernel/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
@@ -1,4 +1,4 @@
Library-SymbolicName: org.springframework
-Library-Version: 4.3.18
-Import-Bundle: org.springframework.core;version="[4.3.18.RELEASE,4.3.18.RELEASE]",
- org.springframework.beans;version="[4.3.18.RELEASE,4.3.18.RELEASE]"
+Library-Version: 5.0.7
+Import-Bundle: org.springframework.core;version="[5.0.7.RELEASE,5.0.7.RELEASE]",
+ org.springframework.beans;version="[5.0.7.RELEASE,5.0.7.RELEASE]"