Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java')
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java33
1 files changed, 25 insertions, 8 deletions
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() {

Back to the top