You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2021/11/29 03:51:14 UTC
[felix-dev] 04/05: [logback] add LogService tests
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 836d3afebbe6d5d26c318dd0cc46f53fae9315e1
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Sun Nov 28 10:37:50 2021 -0500
[logback] add LogService tests
Signed-off-by: Raymond Augé <ra...@liferay.com>
---
.../apache/felix/logback/test/LogServiceTest.java | 22 ++++++++++++++++++++--
.../apache/felix/logback/test/LogServiceTest.java | 22 ++++++++++++++++++++--
.../apache/felix/logback/test/LogServiceTest.java | 22 ++++++++++++++++++++--
.../apache/felix/logback/test/LogServiceTest.java | 22 ++++++++++++++++++++--
.../felix/logback/test/helper/LogTestHelper.java | 14 +++++++++++++-
5 files changed, 93 insertions(+), 9 deletions(-)
diff --git a/logback/itests/immediate-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java b/logback/itests/immediate-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
index 4efcef9..e6444af 100644
--- a/logback/itests/immediate-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
+++ b/logback/itests/immediate-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
@@ -25,6 +25,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.log.LogService;
import org.osgi.service.log.Logger;
public class LogServiceTest extends LogTestHelper {
@@ -48,11 +49,28 @@ public class LogServiceTest extends LogTestHelper {
String refString = reference.toString();
try {
- assertLog("INFO|Events.Service.org.apache.felix.logback.itests.immediate.equinox.logservice|ServiceEvent REGISTERED " + refString);
+ assertLog("INFO|Events.Service." + getBSN() + "|ServiceEvent REGISTERED " + refString);
}
finally {
registration.unregister();
- assertLog("INFO|Events.Service.org.apache.felix.logback.itests.immediate.equinox.logservice|ServiceEvent UNREGISTERING " + refString);
+ assertLog("INFO|Events.Service." + getBSN() + "|ServiceEvent UNREGISTERING " + refString);
+ }
+ }
+
+ @SuppressWarnings("deprecation")
+ @Test
+ public void logService() {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ ServiceReference<LogService> reference = bundleContext.getServiceReference(LogService.class);
+ LogService logService = bundleContext.getService(reference);
+
+ logService.log(LogService.LOG_INFO, "Test log");
+
+ try {
+ assertLog("INFO|LogService." + getBSN() + "|Test log");
+ }
+ finally {
+ bundleContext.ungetService(reference);
}
}
diff --git a/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java b/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
index c37e26c..e6444af 100644
--- a/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
+++ b/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
@@ -25,6 +25,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.log.LogService;
import org.osgi.service.log.Logger;
public class LogServiceTest extends LogTestHelper {
@@ -48,11 +49,28 @@ public class LogServiceTest extends LogTestHelper {
String refString = reference.toString();
try {
- assertLog("INFO|Events.Service.org.apache.felix.logback.itests.immediate.felix.logservice|ServiceEvent REGISTERED " + refString);
+ assertLog("INFO|Events.Service." + getBSN() + "|ServiceEvent REGISTERED " + refString);
}
finally {
registration.unregister();
- assertLog("INFO|Events.Service.org.apache.felix.logback.itests.immediate.felix.logservice|ServiceEvent UNREGISTERING " + refString);
+ assertLog("INFO|Events.Service." + getBSN() + "|ServiceEvent UNREGISTERING " + refString);
+ }
+ }
+
+ @SuppressWarnings("deprecation")
+ @Test
+ public void logService() {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ ServiceReference<LogService> reference = bundleContext.getServiceReference(LogService.class);
+ LogService logService = bundleContext.getService(reference);
+
+ logService.log(LogService.LOG_INFO, "Test log");
+
+ try {
+ assertLog("INFO|LogService." + getBSN() + "|Test log");
+ }
+ finally {
+ bundleContext.ungetService(reference);
}
}
diff --git a/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java b/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
index 3a5cbdf..e6444af 100644
--- a/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
+++ b/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
@@ -25,6 +25,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.log.LogService;
import org.osgi.service.log.Logger;
public class LogServiceTest extends LogTestHelper {
@@ -48,11 +49,28 @@ public class LogServiceTest extends LogTestHelper {
String refString = reference.toString();
try {
- assertLog("INFO|Events.Service.org.apache.felix.logback.itests.standard.equinox.logservice|ServiceEvent REGISTERED " + refString);
+ assertLog("INFO|Events.Service." + getBSN() + "|ServiceEvent REGISTERED " + refString);
}
finally {
registration.unregister();
- assertLog("INFO|Events.Service.org.apache.felix.logback.itests.standard.equinox.logservice|ServiceEvent UNREGISTERING " + refString);
+ assertLog("INFO|Events.Service." + getBSN() + "|ServiceEvent UNREGISTERING " + refString);
+ }
+ }
+
+ @SuppressWarnings("deprecation")
+ @Test
+ public void logService() {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ ServiceReference<LogService> reference = bundleContext.getServiceReference(LogService.class);
+ LogService logService = bundleContext.getService(reference);
+
+ logService.log(LogService.LOG_INFO, "Test log");
+
+ try {
+ assertLog("INFO|LogService." + getBSN() + "|Test log");
+ }
+ finally {
+ bundleContext.ungetService(reference);
}
}
diff --git a/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java b/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
index 5be53f8..e6444af 100644
--- a/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
+++ b/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
@@ -25,6 +25,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.log.LogService;
import org.osgi.service.log.Logger;
public class LogServiceTest extends LogTestHelper {
@@ -48,11 +49,28 @@ public class LogServiceTest extends LogTestHelper {
String refString = reference.toString();
try {
- assertLog("INFO|Events.Service.org.apache.felix.logback.itests.standard.felix.logservice|ServiceEvent REGISTERED " + refString);
+ assertLog("INFO|Events.Service." + getBSN() + "|ServiceEvent REGISTERED " + refString);
}
finally {
registration.unregister();
- assertLog("INFO|Events.Service.org.apache.felix.logback.itests.standard.felix.logservice|ServiceEvent UNREGISTERING " + refString);
+ assertLog("INFO|Events.Service." + getBSN() + "|ServiceEvent UNREGISTERING " + refString);
+ }
+ }
+
+ @SuppressWarnings("deprecation")
+ @Test
+ public void logService() {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ ServiceReference<LogService> reference = bundleContext.getServiceReference(LogService.class);
+ LogService logService = bundleContext.getService(reference);
+
+ logService.log(LogService.LOG_INFO, "Test log");
+
+ try {
+ assertLog("INFO|LogService." + getBSN() + "|Test log");
+ }
+ finally {
+ bundleContext.ungetService(reference);
}
}
diff --git a/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java b/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java
index f2762a0..aa6b9ec 100644
--- a/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java
+++ b/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java
@@ -20,7 +20,15 @@ package org.apache.felix.logback.test.helper;
import java.util.Iterator;
+import org.apache.felix.logback.test.helper.ls.LogServiceHelper;
import org.junit.BeforeClass;
+import org.junit.Test;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.log.LogService;
+import org.osgi.service.log.Logger;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
@@ -29,7 +37,7 @@ import ch.qos.logback.core.Appender;
import ch.qos.logback.core.read.ListAppender;
-public class LogTestHelper {
+public abstract class LogTestHelper {
protected static ListAppender<ILoggingEvent> listAppender;
protected static PatternLayoutEncoder encoder;
@@ -54,6 +62,10 @@ public class LogTestHelper {
encoder.start();
}
+ public String getBSN() {
+ return FrameworkUtil.getBundle(getClass()).getSymbolicName();
+ }
+
protected void assertLog(String level, String name, long time) {
assertLog(level + "|" + name + "|" + time);
}