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 2018/07/04 03:09:25 UTC
svn commit: r1835037 - in /felix/trunk/logback/itests:
immediate-felix-logservice/
immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/
standard-felix-logservice/
standard-felix-logservice/src/main/java/org/apache/felix/logback/test/
Author: rotty3000
Date: Wed Jul 4 03:09:25 2018
New Revision: 1835037
URL: http://svn.apache.org/viewvc?rev=1835037&view=rev
Log:
[logback] add tests for felix log service
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun
felix/trunk/logback/itests/immediate-felix-logservice/logback.xml
felix/trunk/logback/itests/immediate-felix-logservice/pom.xml
felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun
felix/trunk/logback/itests/standard-felix-logservice/logback.xml
felix/trunk/logback/itests/standard-felix-logservice/pom.xml
felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
Modified: felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun?rev=1835037&r1=1835036&r2=1835037&view=diff
==============================================================================
--- felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun (original)
+++ felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun Wed Jul 4 03:09:25 2018
@@ -5,24 +5,21 @@
-runfw: org.apache.felix.framework
-runrequires:\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.log.extension)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.felix.logservice)'
-runpath: \
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
slf4j.api;version='[1.7.25,1.7.26)',\
+ org.apache.felix.log;version=latest,\
org.apache.felix.logback;version=latest
-# org.apache.felix.log;version=latest,\
-
-runproperties: \
logback.configurationFile=file:${.}/logback.xml
-runbundles: \
- osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
- org.apache.felix.logback.itests.immediate.felix.logservice;version='[1.0.0,1.0.1)',\
- org.osgi.service.log;version='[1.4.0,1.4.1)',\
- org.osgi.util.function;version='[1.1.0,1.1.1)',\
- org.osgi.util.promise;version='[1.1.0,1.1.1)',\
- org.osgi.util.pushstream;version='[1.0.0,1.0.1)'
+ org.apache.felix.log.extension;version='[1.0.0,1.0.1)',\
+ org.apache.felix.logback.itests.immediate.felix.logservice;version='[1.0.0,1.0.1)',\
+ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
+ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
Modified: felix/trunk/logback/itests/immediate-felix-logservice/logback.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-felix-logservice/logback.xml?rev=1835037&r1=1835036&r2=1835037&view=diff
==============================================================================
--- felix/trunk/logback/itests/immediate-felix-logservice/logback.xml (original)
+++ felix/trunk/logback/itests/immediate-felix-logservice/logback.xml Wed Jul 4 03:09:25 2018
@@ -38,8 +38,8 @@
<logger name="Events.Service" level="ERROR"/>
<logger name="LogService" level="ERROR"/>
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
+ <logger name="Events.Service.org.apache.felix.logback.itests" level="INFO"/>
+ <logger name="LogService.org.apache.felix.logback.itests" level="OFF"/>
<logger name="org.apache.felix.logback.test" level="DEBUG" />
Modified: felix/trunk/logback/itests/immediate-felix-logservice/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-felix-logservice/pom.xml?rev=1835037&r1=1835036&r2=1835037&view=diff
==============================================================================
--- felix/trunk/logback/itests/immediate-felix-logservice/pom.xml (original)
+++ felix/trunk/logback/itests/immediate-felix-logservice/pom.xml Wed Jul 4 03:09:25 2018
@@ -36,6 +36,18 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log.extension</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
Modified: felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java?rev=1835037&r1=1835036&r2=1835037&view=diff
==============================================================================
--- felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java (original)
+++ felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java Wed Jul 4 03:09:25 2018
@@ -20,19 +20,39 @@ package org.apache.felix.logback.test;
import org.apache.felix.logback.test.helper.LogTestHelper;
import org.junit.Test;
-// import org.slf4j.Logger;
-// import org.slf4j.LoggerFactory;
+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.Logger;
public class LogServiceTest extends LogTestHelper {
@Test
public void test() {
- // long time = System.nanoTime();
- // Logger logger = LoggerFactory.getLogger(getClass());
- // if (logger.isInfoEnabled()) {
- // logger.info(time + "");
- // }
- // assertLog("INFO", getClass().getName(), time);
+ long time = System.nanoTime();
+ Logger logger = getLogger(getClass());
+ if (logger.isInfoEnabled()) {
+ logger.info(time + "");
+ }
+ assertLog("INFO", getClass().getName(), time);
+ }
+
+ @Test
+ public void service() {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ ServiceRegistration<Integer> registration = bundleContext.registerService(Integer.class, new Integer(25), null);
+
+ ServiceReference<Integer> reference = registration.getReference();
+ String refString = reference.toString();
+
+ try {
+ assertLog("INFO|Events.Service.org.apache.felix.logback.itests.immediate.felix.logservice|ServiceEvent REGISTERED " + refString);
+ }
+ finally {
+ registration.unregister();
+ assertLog("INFO|Events.Service.org.apache.felix.logback.itests.immediate.felix.logservice|ServiceEvent UNREGISTERING " + refString);
+ }
}
}
Modified: felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun?rev=1835037&r1=1835036&r2=1835037&view=diff
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun (original)
+++ felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun Wed Jul 4 03:09:25 2018
@@ -8,22 +8,19 @@
-runrequires:\
osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.felix.logservice)'
-# osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\
-# osgi.identity;filter:='(osgi.identity=org.apache.felix.logback)',\
-
-runproperties: \
logback.configurationFile=file:${.}/logback.xml
-runbundles: \
- slf4j.api;version='[1.7.25,1.7.26)',\
- ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
- ch.qos.logback.core;version='[1.2.3,1.2.4)',\
- osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
- org.apache.felix.logback.itests.standard.felix.logservice;version='[1.0.0,1.0.1)',\
- org.osgi.service.log;version='[1.4.0,1.4.1)',\
- org.osgi.util.function;version='[1.1.0,1.1.1)',\
- org.osgi.util.promise;version='[1.1.0,1.1.1)',\
- org.osgi.util.pushstream;version='[1.0.0,1.0.1)'
+ slf4j.api;version='[1.7.25,1.7.26)',\
+ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+ org.apache.felix.log;version='[1.1.0,1.1.1)',\
+ org.apache.felix.logback;version='[1.0.0,1.0.1)',\
+ osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
+ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+ org.apache.felix.logback.itests.standard.felix.logservice;version='[1.0.0,1.0.1)'
Modified: felix/trunk/logback/itests/standard-felix-logservice/logback.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/logback.xml?rev=1835037&r1=1835036&r2=1835037&view=diff
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/logback.xml (original)
+++ felix/trunk/logback/itests/standard-felix-logservice/logback.xml Wed Jul 4 03:09:25 2018
@@ -38,8 +38,8 @@
<logger name="Events.Service" level="ERROR"/>
<logger name="LogService" level="ERROR"/>
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
+ <logger name="Events.Service.org.apache.felix.logback.itests" level="INFO"/>
+ <logger name="LogService.org.apache.felix.logback.itests" level="OFF"/>
<logger name="org.apache.felix.logback.test" level="DEBUG" />
Modified: felix/trunk/logback/itests/standard-felix-logservice/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/pom.xml?rev=1835037&r1=1835036&r2=1835037&view=diff
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/pom.xml (original)
+++ felix/trunk/logback/itests/standard-felix-logservice/pom.xml Wed Jul 4 03:09:25 2018
@@ -36,6 +36,12 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
Modified: felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java?rev=1835037&r1=1835036&r2=1835037&view=diff
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java (original)
+++ felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java Wed Jul 4 03:09:25 2018
@@ -20,19 +20,39 @@ package org.apache.felix.logback.test;
import org.apache.felix.logback.test.helper.LogTestHelper;
import org.junit.Test;
-// import org.slf4j.Logger;
-// import org.slf4j.LoggerFactory;
+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.Logger;
public class LogServiceTest extends LogTestHelper {
@Test
public void test() {
- // long time = System.nanoTime();
- // Logger logger = LoggerFactory.getLogger(getClass());
- // if (logger.isInfoEnabled()) {
- // logger.info(time + "");
- // }
- // assertLog("INFO", getClass().getName(), time);
+ long time = System.nanoTime();
+ Logger logger = getLogger(getClass());
+ if (logger.isInfoEnabled()) {
+ logger.info(time + "");
+ }
+ assertLog("INFO", getClass().getName(), time);
+ }
+
+ @Test
+ public void service() {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ ServiceRegistration<Integer> registration = bundleContext.registerService(Integer.class, new Integer(25), null);
+
+ ServiceReference<Integer> reference = registration.getReference();
+ String refString = reference.toString();
+
+ try {
+ assertLog("INFO|Events.Service.org.apache.felix.logback.itests.standard.felix.logservice|ServiceEvent REGISTERED " + refString);
+ }
+ finally {
+ registration.unregister();
+ assertLog("INFO|Events.Service.org.apache.felix.logback.itests.standard.felix.logservice|ServiceEvent UNREGISTERING " + refString);
+ }
}
}