From 6064eac40ca2e51c69eea69fc3815fcde4253128 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 21 Jun 2017 07:33:10 -0500 Subject: Bug 518476 - Add test for INFO type Change-Id: I564e48263436f0146c292e1fc53732a6fd209545 Signed-off-by: Thomas Watson --- bundles/org.eclipse.osgi.tests/META-INF/MANIFEST.MF | 2 +- bundles/org.eclipse.osgi.tests/pom.xml | 2 +- .../org/eclipse/equinox/log/test/LogReaderServiceTest.java | 12 ++++++++---- 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 @@ org.eclipse.osgi org.eclipse.osgi.tests - 3.12.0-SNAPSHOT + 3.13.0-SNAPSHOT eclipse-test-plugin 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 events = new CopyOnWriteArrayList(); - 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()); } -- cgit v1.2.3