[slf4j-dev] svn commit: r720 - in slf4j/trunk/slf4j-osgi-integration-test: . src/test/java/org/slf4j/osgi/integration src/test/java/org/slf4j/osgi/integration/logservice src/test/java/org/slf4j/osgi/integration/logservice/test src/test/java/org/slf4j/osgi/integration/simple/test src/test/resources/org/slf4j/osgi/integration/logservice src/test/resources/org/slf4j/osgi/integration/logservice/test
jconlon at slf4j.org
jconlon at slf4j.org
Wed Feb 7 22:35:04 CET 2007
Author: jconlon
Date: Wed Feb 7 22:35:04 2007
New Revision: 720
Added:
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/
slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF
Modified:
slf4j/trunk/slf4j-osgi-integration-test/pom.xml
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java
slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java
Log:
Added testing for OSGi LogService adapter osgi-over-slf4j.
Modified: slf4j/trunk/slf4j-osgi-integration-test/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-osgi-integration-test/pom.xml (original)
+++ slf4j/trunk/slf4j-osgi-integration-test/pom.xml Wed Feb 7 22:35:04 2007
@@ -25,7 +25,21 @@
bundles being tested are specified in the -->
<dependencies>
- <dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java
==============================================================================
--- slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java (original)
+++ slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java Wed Feb 7 22:35:04 2007
@@ -44,6 +44,8 @@
public static final String JCL104_ADAPTER_BUNDLE_ARTIFACT_ID = "jcl104-over-slf4j";
+
+ public static final String LOGSERVICE_ADAPTER_BUNDLE_ARTIFACT_ID = "osgi-over-slf4j";
public static final String JDK14_BINDING_BUNDLE_ARTIFACT_ID = "slf4j-jdk14";
@@ -67,6 +69,8 @@
public static final String JDK_BINDING_BUNDLE_SYM_NAME = SLF4J_GROUP_ID+'.'+JDK14_BINDING_BUNDLE_ARTIFACT_ID;
public static final String JCL_ADAPTER_BUNDLE_SYM_NAME = SLF4J_GROUP_ID+'.'+JCL104_ADAPTER_BUNDLE_ARTIFACT_ID;
+
+ public static final String LOGSERVICE_ADAPTER_BUNDLE_SYM_NAME = SLF4J_GROUP_ID+'.'+LOGSERVICE_ADAPTER_BUNDLE_ARTIFACT_ID;
Added: slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java
==============================================================================
--- (empty file)
+++ slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java Wed Feb 7 22:35:04 2007
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2004-2005 QOS.ch
+ *
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
+ * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ *
+ */
+
+package org.slf4j.osgi.integration.logservice.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.osgi.integration.IntegrationTestConstants;
+import org.slf4j.osgi.integration.nop.test.NopBundleTest;
+import org.springframework.osgi.test.ConfigurableBundleCreatorTests;
+
+/**
+ *
+ * <code>LogServiceBundleTest</code> starts up an OSGi environment (equinox,
+ * knopflerfish, or felix according to the profile selected) and installs the
+ * slf4j.osgi.test.bundle, the slf4j.simple bundle and the bundles they depend
+ * on.
+ *
+ * The test classes in this project will be turned into a virtual bundle which
+ * is also installed and the tests are then run inside the OSGi runtime.
+ *
+ * The tests have access to a BundleContext, which we use to test that all
+ * bundles have been started.
+ *
+ *
+ * @author John Conlon
+ */
+public class LogServiceBundleTest extends ConfigurableBundleCreatorTests implements IntegrationTestConstants{
+
+
+
+
+ /**
+ * The manifest to use for the "virtual bundle" created out of the test
+ * classes and resources in this project
+ *
+ * This is actually the boilerplate manifest with one additional
+ * import-package added. We should provide a simpler customization point for
+ * such use cases that doesn't require duplication of the entire manifest...
+ */
+ protected String getManifestLocation() {
+ return "classpath:org/slf4j/osgi/integration/logservice/test/MANIFEST.MF";
+ }
+
+ /**
+ * The location of the packaged OSGi bundles to be installed for this test.
+ * Values are Spring resource paths. The bundles we want to use are part of
+ * the same multi-project maven build as this project is. Hence we use the
+ * localMavenArtifact helper method to find the bundles produced by the
+ * package phase of the maven build (these tests will run after the
+ * packaging phase, in the integration-test phase).
+ *
+ * JUnit, commons-logging, spring-core and the spring OSGi test bundle are
+ * automatically included so they do not need to be specified here.
+ *
+ * Our test bundles are using package import and export versions to keep
+ * these other logging bundles from getting mixed up with our test bundles.
+ */
+ protected String[] getBundleLocations() {
+ return new String[] {
+ localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME,
+ "aopalliance.osgi", "1.0-SNAPSHOT"),
+ localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME,
+ "spring-context", "2.1-SNAPSHOT"),
+ localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-beans",
+ "2.1-SNAPSHOT"),
+ localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME,
+ "spring-osgi-core", "1.0-SNAPSHOT"),
+ localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop",
+ "2.1-SNAPSHOT"),
+ localMavenArtifact( "org.osgi", "org.osgi.compendium", "4.0" ),
+ localMavenArtifact(SLF4J_GROUP_ID,
+ SIMPLE_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST),
+ localMavenArtifact(SLF4J_GROUP_ID,
+ LOGSERVICE_ADAPTER_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST) };
+ }
+
+ /**
+ * The superclass provides us access to the root bundle context via the
+ * 'getBundleContext' operation. Make sure it is not null.
+ */
+ public void testOSGiStartedOk() {
+ BundleContext bundleContext = getBundleContext();
+ assertNotNull(bundleContext);
+
+ }
+
+ /**
+ * Makes sure our bundles are in the OSGi runtime and their state is Active.
+ *
+ */
+ public void testSlf4jLogServiceBundles() {
+ Logger log = LoggerFactory.getLogger(LogServiceBundleTest.class);
+ assertNotNull(log);
+ BundleContext context = getBundleContext();
+ List symNames = new ArrayList();
+
+ Bundle[] bundles = context.getBundles();
+ log.info("Loaded bundles:");
+ for (int i = 0; i < bundles.length; i++) {
+ Bundle bundle = bundles[i];
+ assertEquals("Bundle " + bundle.getSymbolicName()
+ + " is not active.", Bundle.ACTIVE, bundle.getState());
+ symNames.add(bundle.getSymbolicName());
+ if (bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR) != null) {
+ log.info("Symbolic Name:" + bundle.getSymbolicName()
+ + ", Activator:"
+ + bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR));
+ } else {
+ log.info("Symbolic Name:" + bundle.getSymbolicName());
+ }
+ }
+
+ assertTrue(symNames.contains(SIMPLE_BINDING_BUNDLE_SYM_NAME));
+ assertTrue(symNames.contains(LOGSERVICE_ADAPTER_BUNDLE_SYM_NAME));
+
+ }
+
+ public void testLogService() {
+ Logger log = LoggerFactory.getLogger(NopBundleTest.class);
+ log.debug("Testing LogSerivce");
+ BundleContext context = getBundleContext();
+ ServiceReference ref = context.getServiceReference(LogService.class.getName());
+ assertNotNull("Service Reference is null", ref);
+ LogService logService = null;
+
+ logService = (LogService) context.getService(ref);
+ assertNotNull("Cannot find the probe service", logService);
+
+ exerciseLogService( logService);
+ exerciseLogService( logService,ref);
+
+ context.ungetService(ref);
+ }
+
+ private void exerciseLogService(LogService logService, ServiceReference ref){
+ logService.log(ref, LogService.LOG_DEBUG, "Loaded bundles" );
+ logService.log(ref, LogService.LOG_INFO, "Found LogService. " );
+ logService.log(ref, LogService.LOG_WARNING, "Found LogService. " );
+ logService.log(ref, LogService.LOG_ERROR, "Found LogService. ", new Exception("just a test.") );
+ }
+
+ private void exerciseLogService(LogService logService){
+ logService.log(LogService.LOG_DEBUG, "Loaded bundles" );
+ logService.log(LogService.LOG_INFO, "Found LogService. " );
+ logService.log(LogService.LOG_WARNING, "Found LogService. " );
+ logService.log(LogService.LOG_ERROR, "Found LogService. ", new Exception("just a test.") );
+ }
+
+}
Modified: slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java
==============================================================================
--- slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java (original)
+++ slf4j/trunk/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java Wed Feb 7 22:35:04 2007
@@ -48,7 +48,7 @@
/**
*
- * <code>SimpleBundleTest</code> starts up an OSGi environment (equinox,
+ * <code>LogServiceBundleTest</code> starts up an OSGi environment (equinox,
* knopflerfish, or felix according to the profile selected) and installs the
* slf4j.osgi.test.bundle, the slf4j.simple bundle and the bundles they depend
* on.
Added: slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF
==============================================================================
--- (empty file)
+++ slf4j/trunk/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF Wed Feb 7 22:35:04 2007
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-Name: simple-service-integration-tests
+Bundle-SymbolicName: org.slf4j.osgi.integration.logservice.test
+Bundle-Version: 1.3.0
+Bundle-Vendor: SLF4J ORG
+Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator
+Import-Package: junit.framework,
+ org.osgi.framework;specification-version="1.3.0",
+ org.springframework.core.io;specification-version="2.1.0",
+ org.springframework.osgi.test,
+ org.springframework.osgi.test.runner,
+ org.slf4j,
+ org.osgi.service.log
+
+
+
More information about the slf4j-dev
mailing list