Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-09-24 01:44:47 -0400
committerBorislav Kapukaranov2012-09-24 01:45:13 -0400
commit50bb78e09ec0118964c4b322d1c3656cef761777 (patch)
tree2cac807314a3114a0fc577bbae9e05c45ef8090e
parent5db89ef62026097c6c7e2ecf53987b092a718481 (diff)
downloadorg.eclipse.virgo.kernel-50bb78e09ec0118964c4b322d1c3656cef761777.tar.gz
org.eclipse.virgo.kernel-50bb78e09ec0118964c4b322d1c3656cef761777.tar.xz
org.eclipse.virgo.kernel-50bb78e09ec0118964c4b322d1c3656cef761777.zip
Fixes some unit tests
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java2
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/StubBundleArtefactBridge.java6
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java
index fccc28e5..207b4803 100644
--- a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java
+++ b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java
@@ -91,7 +91,7 @@ public class BundleBridgeTests {
@Test
public void testGenerateArtefact() throws ArtifactGenerationException {
File jarsDirectory = new File(
- System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar");
+ System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.commons.dbcp/1.4.0.v201204271417/org.apache.commons.dbcp-1.4.0.v201204271417.jar");
File directoriesDirectory = new File("./src/test/resources/directories");
Set<ArtifactDescriptor> artefacts = new HashSet<ArtifactDescriptor>();
diff --git a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/StubBundleArtefactBridge.java b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/StubBundleArtefactBridge.java
index 971e4f06..0e0d4455 100644
--- a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/StubBundleArtefactBridge.java
+++ b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/StubBundleArtefactBridge.java
@@ -64,11 +64,11 @@ final public class StubBundleArtefactBridge implements ArtifactBridge {
private final static RepositoryAwareArtifactDescriptor TEST_DIRECTORY_ARTEFACT = new StubRepositoryAwareArtifactDescriptor(TEST_DIRECTORY_URI, "y.different", new Version("1.2.3"), TEST_ATTRIBUTE_SET_DIRECTORY);
- private final static URI TEST_FILE_URI = new File(System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/" + "com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar").toURI();
+ private final static URI TEST_FILE_URI = new File(System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.commons.dbcp/1.4.0.v201204271417/org.apache.commons.dbcp-1.4.0.v201204271417.jar").toURI();
- private static final Set<Attribute> TEST_ATTRIBUTE_SET = createAttributeSet("com.springsource.org.apache.commons.dbcp", new Version("1.2.2.osgi"), TEST_FILE_URI);
+ private static final Set<Attribute> TEST_ATTRIBUTE_SET = createAttributeSet("org.apache.commons.dbcp", new Version("1.4.0.v201204271417"), TEST_FILE_URI);
- private final static RepositoryAwareArtifactDescriptor TEST_ARTEFACT = new StubRepositoryAwareArtifactDescriptor(TEST_FILE_URI, "com.springsource.org.apache.commons.dbcp", new Version("1.2.2.osgi"), TEST_ATTRIBUTE_SET);
+ private final static RepositoryAwareArtifactDescriptor TEST_ARTEFACT = new StubRepositoryAwareArtifactDescriptor(TEST_FILE_URI, "org.apache.commons.dbcp", new Version("1.4.0.v201204271417"), TEST_ATTRIBUTE_SET);
private static Set<Attribute> createAttributeSet(String name, Version version, URI uri) {
Set<Attribute> attributes = new HashSet<Attribute>();
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java
index 4fa31f47..b1b47825 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java
@@ -43,7 +43,7 @@ public class CommonsDbcpTests extends AbstractDeployerIntegrationTest {
@Test
public void testCommonsDbcpClassLoading() throws Exception {
- this.deployer.deploy(new File(System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar").toURI());
+ this.deployer.deploy(new File(System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.commons.dbcp/1.4.0.v201204271417/org.apache.commons.dbcp-1.4.0.v201204271417.jar").toURI());
this.deployer.deploy(new File("src/test/resources/com.springsource.platform.test.commons-dbcp.jar").toURI());
ApplicationContextUtils.assertApplicationContextContainsExpectedBeanDefinitions(ApplicationContextUtils.getApplicationContext(this.context, "com.springsource.server.test.commons-dbcp"), "dataSourceTest");
}

Back to the top