Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log')
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java12
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllLogServiceTests.java13
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java27
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java26
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java33
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java9
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java55
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java8
8 files changed, 112 insertions, 71 deletions
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java
index 7f796ed6d..e9f4c1b0b 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java
@@ -10,14 +10,10 @@
******************************************************************************/
package org.eclipse.equinox.log.test;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ ExtendedLogServiceTest.class, ExtendedLogReaderServiceTest.class })
public class AllExtendedLogServiceTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test extended log service"); //$NON-NLS-1$
- suite.addTestSuite(ExtendedLogServiceTest.class);
- suite.addTestSuite(ExtendedLogReaderServiceTest.class);
- return suite;
- }
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllLogServiceTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllLogServiceTests.java
index 687defe94..f0e6e5332 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllLogServiceTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllLogServiceTests.java
@@ -10,15 +10,10 @@
******************************************************************************/
package org.eclipse.equinox.log.test;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ LogServiceTest.class, LogReaderServiceTest.class, LogPermissionCollectionTest.class })
public class AllLogServiceTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test log service"); //$NON-NLS-1$
- suite.addTestSuite(LogServiceTest.class);
- suite.addTestSuite(LogReaderServiceTest.class);
- suite.addTestSuite(LogPermissionCollectionTest.class);
- return suite;
- }
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java
index 5f95abd31..c2cf5937c 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/AllTests.java
@@ -1,27 +1,22 @@
/*******************************************************************************
-s
-s This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License 2.0 which accompanies this distribution, and is
- * available at
+ * Copyright (c) 2007, 2016 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
- * Contributors: IBM Corporation - initial API and implementation
+ * Contributors:
+ * IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.equinox.log.test;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+@RunWith(Suite.class)
+@Suite.SuiteClasses({AllLogServiceTests.class, AllExtendedLogServiceTests.class})
public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.equinox.log.test"); //$NON-NLS-1$
- suite.addTest(AllLogServiceTests.suite());
- suite.addTest(AllExtendedLogServiceTests.suite());
- return suite;
- }
-
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
index ee57016f5..179e0317f 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
@@ -10,16 +10,21 @@
******************************************************************************/
package org.eclipse.equinox.log.test;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
import org.eclipse.equinox.log.ExtendedLogEntry;
import org.eclipse.equinox.log.ExtendedLogReaderService;
import org.eclipse.equinox.log.ExtendedLogService;
import org.eclipse.equinox.log.LogFilter;
import org.eclipse.equinox.log.SynchronousLogListener;
import org.eclipse.osgi.tests.OSGiTestsActivator;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogEntry;
@@ -30,7 +35,7 @@ import org.osgi.service.log.Logger;
import org.osgi.service.log.admin.LoggerAdmin;
import org.osgi.service.log.admin.LoggerContext;
-public class ExtendedLogReaderServiceTest extends TestCase {
+public class ExtendedLogReaderServiceTest {
private ExtendedLogService log;
private ServiceReference logReference;
@@ -42,11 +47,8 @@ public class ExtendedLogReaderServiceTest extends TestCase {
Map<String, LogLevel> rootLogLevels;
boolean called;
- public ExtendedLogReaderServiceTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
logReference = OSGiTestsActivator.getContext().getServiceReference(ExtendedLogService.class.getName());
readerReference = OSGiTestsActivator.getContext().getServiceReference(ExtendedLogReaderService.class.getName());
loggerAdminReference = OSGiTestsActivator.getContext().getServiceReference(LoggerAdmin.class);
@@ -63,13 +65,15 @@ public class ExtendedLogReaderServiceTest extends TestCase {
rootLoggerContext.setLogLevels(copyLogLevels);
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
rootLoggerContext.setLogLevels(rootLogLevels);
OSGiTestsActivator.getContext().ungetService(loggerAdminReference);
OSGiTestsActivator.getContext().ungetService(logReference);
OSGiTestsActivator.getContext().ungetService(readerReference);
}
+ @Test
public void testaddFilteredListener() throws Exception {
TestListener listener = new TestListener();
reader.addLogListener(listener, new LogFilter() {
@@ -81,6 +85,7 @@ public class ExtendedLogReaderServiceTest extends TestCase {
assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
+ @Test
public void testaddNullFilterr() throws Exception {
TestListener listener = new TestListener();
@@ -92,6 +97,7 @@ public class ExtendedLogReaderServiceTest extends TestCase {
fail();
}
+ @Test
public void testaddFilteredListenerTwice() throws Exception {
TestListener listener = new TestListener();
reader.addLogListener(listener, new LogFilter() {
@@ -112,6 +118,7 @@ public class ExtendedLogReaderServiceTest extends TestCase {
assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
+ @Test
public void testaddNullListener() throws Exception {
try {
reader.addLogListener(null);
@@ -121,6 +128,7 @@ public class ExtendedLogReaderServiceTest extends TestCase {
fail();
}
+ @Test
public void testBadFilter() throws Exception {
TestListener listener = new TestListener();
reader.addLogListener(listener, new LogFilter() {
@@ -133,6 +141,7 @@ public class ExtendedLogReaderServiceTest extends TestCase {
fail();
}
+ @Test
public void testSynchronousLogListener() throws Exception {
final Thread loggerThread = Thread.currentThread();
called = false;
@@ -147,6 +156,7 @@ public class ExtendedLogReaderServiceTest extends TestCase {
assertTrue(called);
}
+ @Test
public void testExtendedLogEntry() throws Exception {
TestListener listener = new TestListener();
reader.addLogListener(listener);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
index 4e8c52268..116b8c43f 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
@@ -12,14 +12,20 @@ s This
*******************************************************************************/
package org.eclipse.equinox.log.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
import org.eclipse.equinox.log.ExtendedLogEntry;
import org.eclipse.equinox.log.ExtendedLogReaderService;
import org.eclipse.equinox.log.ExtendedLogService;
import org.eclipse.equinox.log.LogFilter;
import org.eclipse.osgi.tests.OSGiTestsActivator;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogLevel;
@@ -28,7 +34,7 @@ import org.osgi.service.log.Logger;
import org.osgi.service.log.admin.LoggerAdmin;
import org.osgi.service.log.admin.LoggerContext;
-public class ExtendedLogServiceTest extends TestCase {
+public class ExtendedLogServiceTest {
private Bundle bundle;
private ExtendedLogService log;
@@ -42,11 +48,8 @@ public class ExtendedLogServiceTest extends TestCase {
private TestListener listener;
- public ExtendedLogServiceTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
bundle = OSGiTestsActivator.getContext().getBundle();
logReference = OSGiTestsActivator.getContext().getServiceReference(ExtendedLogService.class.getName());
readerReference = OSGiTestsActivator.getContext().getServiceReference(ExtendedLogReaderService.class.getName());
@@ -67,7 +70,8 @@ public class ExtendedLogServiceTest extends TestCase {
rootLoggerContext.setLogLevels(copyLogLevels);
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
rootLoggerContext.setLogLevels(rootLogLevels);
reader.removeLogListener(listener);
OSGiTestsActivator.getContext().ungetService(loggerAdminReference);
@@ -75,32 +79,38 @@ public class ExtendedLogServiceTest extends TestCase {
OSGiTestsActivator.getContext().ungetService(readerReference);
}
+ @Test
public void testLogContext() throws Exception {
log.log(this, LogService.LOG_INFO, null);
assertTrue(listener.getEntryX().getContext() == this);
}
+ @Test
public void testNullLogContext() throws Exception {
log.log(null, LogService.LOG_INFO, null);
assertTrue(listener.getEntryX().getContext() == null);
}
+ @Test
public void testLogContextWithNullThrowable() throws Exception {
log.log(this, LogService.LOG_INFO, null, null);
assertTrue(listener.getEntryX().getContext() == this);
}
+ @Test
public void testIsLoggableTrue() throws Exception {
if (!log.isLoggable(LogService.LOG_INFO))
fail();
}
+ @Test
public void testNotIsLoggableWithNoListener() throws Exception {
reader.removeLogListener(listener);
if (log.isLoggable(LogService.LOG_INFO))
fail();
}
+ @Test
public void testNotIsLoggableWithListener() throws Exception {
reader.addLogListener(listener, new LogFilter() {
@@ -112,6 +122,7 @@ public class ExtendedLogServiceTest extends TestCase {
fail();
}
+ @Test
public void testNamedLoggerLogNull() throws Exception {
log.getLogger("test").log(null, 0, null, null);
ExtendedLogEntry entry = listener.getEntryX();
@@ -122,6 +133,7 @@ public class ExtendedLogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == null);
}
+ @Test
public void testNullLoggerLogNull() throws Exception {
log.getLogger((String) null).log(null, 0, null, null);
ExtendedLogEntry entry = listener.getEntryX();
@@ -132,6 +144,7 @@ public class ExtendedLogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == null);
}
+ @Test
public void testNamedLoggerLogFull() throws Exception {
String message = "test";
Throwable t = new Throwable("test");
@@ -145,6 +158,7 @@ public class ExtendedLogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == logReference);
}
+ @Test
public void testNamedLoggerLogFullWithNullBundle() throws Exception {
String message = "test";
Throwable t = new Throwable("test");
@@ -158,6 +172,7 @@ public class ExtendedLogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == logReference);
}
+ @Test
public void testNamedLoggerLogFullWithBundle() throws Exception {
String message = "test";
Throwable t = new Throwable("test");
@@ -171,6 +186,7 @@ public class ExtendedLogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == logReference);
}
+ @Test
public void testLoggerIsLoggableTrue() throws Exception {
reader.addLogListener(listener, new LogFilter() {
@@ -184,6 +200,7 @@ public class ExtendedLogServiceTest extends TestCase {
fail();
}
+ @Test
public void testLoggerNotIsLoggableWithListener() throws Exception {
reader.addLogListener(listener, new LogFilter() {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java
index 9550636f3..ca177f212 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java
@@ -10,12 +10,15 @@
******************************************************************************/
package org.eclipse.equinox.log.test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.eclipse.equinox.log.LogPermission;
import org.eclipse.equinox.log.LogPermissionCollection;
+import org.junit.Test;
-public class LogPermissionCollectionTest extends TestCase {
-
+public class LogPermissionCollectionTest {
+ @Test
public void testImplies() {
LogPermission permission = new LogPermission("*", "*"); //$NON-NLS-1$//$NON-NLS-2$
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java
index 497cfbeb1..f7c5cc7d7 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/LogServiceTest.java
@@ -1,23 +1,27 @@
/*******************************************************************************
-s
-s This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License 2.0 which accompanies this distribution, and is
- * available at
+ * Copyright (c) 20107, 2020 IBM Corporation and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0 which
+ * accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: IBM Corporation - initial API and implementation
- *******************************************************************************/
+ ******************************************************************************/
package org.eclipse.equinox.log.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
-import junit.framework.TestCase;
import org.eclipse.osgi.tests.OSGiTestsActivator;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -30,7 +34,7 @@ import org.osgi.service.log.admin.LoggerAdmin;
import org.osgi.service.log.admin.LoggerContext;
@SuppressWarnings("deprecation")
-public class LogServiceTest extends TestCase {
+public class LogServiceTest {
private LogService log;
private ServiceReference logReference;
@@ -42,11 +46,8 @@ public class LogServiceTest extends TestCase {
LoggerContext rootLoggerContext;
Map<String, LogLevel> rootLogLevels;
- public LogServiceTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
logReference = OSGiTestsActivator.getContext().getServiceReference(LogService.class.getName());
readerReference = OSGiTestsActivator.getContext().getServiceReference(LogReaderService.class.getName());
loggerAdminReference = OSGiTestsActivator.getContext().getServiceReference(LoggerAdmin.class);
@@ -66,7 +67,8 @@ public class LogServiceTest extends TestCase {
rootLoggerContext.setLogLevels(copyLogLevels);
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
rootLoggerContext.setLogLevels(rootLogLevels);
reader.removeLogListener(listener);
OSGiTestsActivator.getContext().ungetService(loggerAdminReference);
@@ -74,21 +76,25 @@ public class LogServiceTest extends TestCase {
OSGiTestsActivator.getContext().ungetService(readerReference);
}
+ @Test
public void testLogDebug() throws Exception {
log.log(LogService.LOG_DEBUG, "debug"); //$NON-NLS-1$
assertTrue(listener.getEntryX().getLevel() == LogService.LOG_DEBUG);
}
+ @Test
public void testLogError() throws Exception {
log.log(LogService.LOG_ERROR, "error"); //$NON-NLS-1$
assertTrue(listener.getEntryX().getLevel() == LogService.LOG_ERROR);
}
+ @Test
public void testLogInfo() throws Exception {
log.log(LogService.LOG_INFO, "info"); //$NON-NLS-1$
assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
}
+ @Test
public void testLogWarning() throws Exception {
log.log(LogService.LOG_WARNING, "warning"); //$NON-NLS-1$
assertTrue(listener.getEntryX().getLevel() == LogService.LOG_WARNING);
@@ -99,47 +105,56 @@ public class LogServiceTest extends TestCase {
assertTrue(listener.getEntryX().getLevel() == 0);
}
+ @Test
public void testLogNegativeLevel() throws Exception {
log.log(-1, "negative"); //$NON-NLS-1$
assertTrue(listener.getEntryX().getLevel() == -1);
}
+ @Test
public void testLogMessage() throws Exception {
log.log(LogService.LOG_INFO, "message"); //$NON-NLS-1$
assertTrue(listener.getEntryX().getMessage().equals("message")); //$NON-NLS-1$
}
+ @Test
public void testLogNullMessage() throws Exception {
log.log(LogService.LOG_INFO, null);
assertTrue(listener.getEntryX().getMessage() == null);
}
+ @Test
public void testLogThrowable() throws Exception {
Throwable t = new Throwable("throwable"); //$NON-NLS-1$
log.log(LogService.LOG_INFO, null, t);
assertTrue(listener.getEntryX().getException().getMessage().equals(t.getMessage()));
}
+ @Test
public void testLogNullThrowable() throws Exception {
log.log(LogService.LOG_INFO, null, null);
assertTrue(listener.getEntryX().getException() == null);
}
+ @Test
public void testLogServiceReference() throws Exception {
log.log(logReference, LogService.LOG_INFO, null);
assertTrue(listener.getEntryX().getServiceReference().equals(logReference));
}
+ @Test
public void testNullLogServiceReference() throws Exception {
log.log(null, LogService.LOG_INFO, null);
assertTrue(listener.getEntryX().getServiceReference() == null);
}
+ @Test
public void testLogServiceReferenceWithNullThrowable() throws Exception {
log.log(logReference, LogService.LOG_INFO, null, null);
assertTrue(listener.getEntryX().getServiceReference().equals(logReference));
}
+ @Test
public void testLogNull1() throws Exception {
log.log(0, null);
LogEntry entry = listener.getEntryX();
@@ -149,6 +164,7 @@ public class LogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == null);
}
+ @Test
public void testLogNull2() throws Exception {
log.log(0, null, null);
LogEntry entry = listener.getEntryX();
@@ -158,6 +174,7 @@ public class LogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == null);
}
+ @Test
public void testLogNull3() throws Exception {
log.log(null, 0, null);
LogEntry entry = listener.getEntryX();
@@ -167,6 +184,7 @@ public class LogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == null);
}
+ @Test
public void testLogNull4() throws Exception {
log.log(null, 0, null, null);
LogEntry entry = listener.getEntryX();
@@ -176,6 +194,7 @@ public class LogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == null);
}
+ @Test
public void testLogFull1() throws Exception {
String message = "test"; //$NON-NLS-1$
log.log(LogService.LOG_INFO, message);
@@ -186,6 +205,7 @@ public class LogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == null);
}
+ @Test
public void testLogFull2() throws Exception {
String message = "test"; //$NON-NLS-1$
Throwable t = new Throwable("test"); //$NON-NLS-1$
@@ -197,6 +217,7 @@ public class LogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == null);
}
+ @Test
public void testLogFull3() throws Exception {
String message = "test"; //$NON-NLS-1$
log.log(logReference, LogService.LOG_INFO, message);
@@ -207,6 +228,7 @@ public class LogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == logReference);
}
+ @Test
public void testLogFull4() throws Exception {
String message = "test"; //$NON-NLS-1$
Throwable t = new Throwable("test"); //$NON-NLS-1$
@@ -218,6 +240,7 @@ public class LogServiceTest extends TestCase {
assertTrue(entry.getServiceReference() == logReference);
}
+ @Test
public void testServiceEventLog() throws InterruptedException {
BundleContext context = OSGiTestsActivator.getContext();
ServiceRegistration<Object> reg = context.registerService(Object.class, new Object(), null);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java
index dfd038b70..dc04e7b9c 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/TestListener2.java
@@ -10,16 +10,17 @@
******************************************************************************/
package org.eclipse.equinox.log.test;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
-import junit.framework.TestCase;
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogListener;
-public class TestListener2 extends TestCase implements LogListener {
+public class TestListener2 implements LogListener {
private List<String> list;
private AtomicInteger flag = new AtomicInteger(0);
CountDownLatch latch;
@@ -31,7 +32,8 @@ public class TestListener2 extends TestCase implements LogListener {
@Override
public void logged(LogEntry entry) {
- //logged is never called in parallel. Added a check to see if two threads are accessing the logged method at the same time.
+ // logged is never called in parallel. Added a check to see if two threads are
+ // accessing the logged method at the same time.
assertTrue(flag.compareAndSet(0, 1));
if (entry.getBundle().getSymbolicName().equals("org.eclipse.osgi")) {
list.add(entry.getMessage());

Back to the top