Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2011-06-15 10:01:01 -0400
committerChristopher Frost2011-06-15 10:01:01 -0400
commit91b942093903d07eb5ee5f94f74f5aba3f151421 (patch)
treecd522365e62750bed7b6f24b130c92ab3a787830 /org.eclipse.virgo.medic.integrationtest
parent03b14f1b375a78408b648aed0559d5951aa67f72 (diff)
downloadorg.eclipse.virgo.medic-91b942093903d07eb5ee5f94f74f5aba3f151421.tar.gz
org.eclipse.virgo.medic-91b942093903d07eb5ee5f94f74f5aba3f151421.tar.xz
org.eclipse.virgo.medic-91b942093903d07eb5ee5f94f74f5aba3f151421.zip
Plumbing in the ExtendedOsgiLogService to Medic
Diffstat (limited to 'org.eclipse.virgo.medic.integrationtest')
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/java/org/eclipse/virgo/medic/log/test/MedicLoggingIntegrationTests.java2
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties4
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/java/org/eclipse/virgo/medic/log/test/MedicLoggingIntegrationTests.java b/org.eclipse.virgo.medic.integrationtest/src/test/java/org/eclipse/virgo/medic/log/test/MedicLoggingIntegrationTests.java
index 2b8b5e8..b53da04 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/java/org/eclipse/virgo/medic/log/test/MedicLoggingIntegrationTests.java
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/java/org/eclipse/virgo/medic/log/test/MedicLoggingIntegrationTests.java
@@ -45,7 +45,7 @@ public class MedicLoggingIntegrationTests {
assertEquals(1, StubAppender.getAndResetLoggingEvents("bundle2-stub").size());
bundleContext.installBundle("file:src/test/resources/test-bundle_3").start();
- assertEquals(1, StubAppender.getAndResetLoggingEvents("root-stub").size());
+ assertEquals(13, StubAppender.getAndResetLoggingEvents("root-stub").size()); //9 When run in Eclipse
}
@Test
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
index 70a999e..22e90b6 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
@@ -1,6 +1,6 @@
launcher.bundles=\
-file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar@start,\
-file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar@start,\
+file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.runtime/${org.aspectj}/com.springsource.org.aspectj.runtime-${org.aspectj}.jar@start,\
+file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/${org.slf4j}/com.springsource.slf4j.api-${org.slf4j}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.D-20110603095500/org.eclipse.virgo.util.common-3.0.0.D-20110603095500.jar,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.D-20110603095500/org.eclipse.virgo.util.osgi-3.0.0.D-20110603095500.jar,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.0.D-20110603095500/org.eclipse.virgo.util.parser.manifest-3.0.0.D-20110603095500.jar,\

Back to the top