diff options
Diffstat (limited to 'bundles')
3 files changed, 10 insertions, 6 deletions
diff --git a/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF index 9fc3c16dd..c039b684c 100644 --- a/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Core OSGi Tests Bundle-SymbolicName: org.eclipse.osgi.tests;singleton:=true -Bundle-Version: 3.12.0.qualifier +Bundle-Version: 3.13.0.qualifier Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: diff --git a/bundles/org.eclipse.osgi.tests/pom.xml b/bundles/org.eclipse.osgi.tests/pom.xml index 96b163e90..8fe6d1eff 100644 --- a/bundles/org.eclipse.osgi.tests/pom.xml +++ b/bundles/org.eclipse.osgi.tests/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi.tests</artifactId> - <version>3.12.0-SNAPSHOT</version> + <version>3.13.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java index 02127a689..26249d3b0 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java @@ -172,7 +172,7 @@ public class LogReaderServiceTest extends AbstractBundleTests { public void testLogFrameworkEventType() throws Exception { final List<LogEntry> events = new CopyOnWriteArrayList<LogEntry>(); - final CountDownLatch countDown = new CountDownLatch(2); + final CountDownLatch countDown = new CountDownLatch(3); final Bundle b = getContext().getBundle(); LogListener listener = new LogListener() { @Override @@ -189,10 +189,14 @@ public class LogReaderServiceTest extends AbstractBundleTests { b.adapt(Module.class).getContainer().getAdaptor().publishContainerEvent(ContainerEvent.ERROR, b.adapt(Module.class), new Exception()); //publishing an event with WARNING b.adapt(Module.class).getContainer().getAdaptor().publishContainerEvent(ContainerEvent.WARNING, b.adapt(Module.class), new Exception()); + //publishing an event with INFO + b.adapt(Module.class).getContainer().getAdaptor().publishContainerEvent(ContainerEvent.INFO, b.adapt(Module.class), new Exception()); + countDown.await(2, TimeUnit.SECONDS); - assertEquals("Wrong number of events", 2, events.size()); - assertEquals("Wrong type.", LogService.LOG_ERROR, events.get(0).getLevel()); - assertEquals("Wrong type.", LogService.LOG_WARNING, events.get(1).getLevel()); + assertEquals("Wrong number of events", 3, events.size()); + assertEquals("Wrong type.", LogLevel.ERROR, events.get(0).getLogLevel()); + assertEquals("Wrong type.", LogLevel.WARN, events.get(1).getLogLevel()); + assertEquals("Wrong type.", LogLevel.INFO, events.get(2).getLogLevel()); } |