[jboss-osgi-commits] JBoss-OSGI SVN: r87168 - in projects/jboss-osgi/trunk: testsuite/src/test/java/org/jboss/test/osgi/example/log and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-11 16:57:05 -0400 (Sat, 11 Apr 2009) New Revision: 87168 Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/log/LogEntryFilter.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/bundleA/ServiceA.java Log: Add stop/uninstall coverage Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/log/LogEntryFilter.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/log/LogEntryFilter.java 2009-04-11 19:55:38 UTC (rev 87167) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/log/LogEntryFilter.java 2009-04-11 20:57:05 UTC (rev 87168) @@ -47,7 +47,7 @@ { this.bndRegex = bndRegex; this.msgRegex = msgRegex; - this.level = level; + this.level = level < 1 ? Integer.MAX_VALUE : level; } /** Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-04-11 19:55:38 UTC (rev 87167) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-04-11 20:57:05 UTC (rev 87168) @@ -54,8 +54,9 @@ BundleContext sysContext = framework.getSystemBundleContext(); // Setup the LogEntryStore - LogEntryFilter filter = new LogEntryFilter("example-log(.*)", LogService.LOG_DEBUG, "BundleEvent(.*)"); - final LogEntryCache logEntryCache = new LogEntryCache(filter); + final LogEntryCache logEntryCache = new LogEntryCache(); + logEntryCache.addFilter(new LogEntryFilter("example-log(.*)", LogService.LOG_INFO, "BundleEvent(.*)")); + logEntryCache.addFilter(new LogEntryFilter(null, -1, "addingService(.*)")); // Track the LogReaderService to add the LogEntryCache as LogListener ServiceTracker tracker = new ServiceTracker(sysContext, LogReaderService.class.getName(), null) @@ -80,11 +81,18 @@ Bundle bundleA = sysContext.installBundle(testURL.toExternalForm()); bundleA.start(); + // Stop and uninstall the test bundle + bundleA.stop(); + bundleA.uninstall(); + // Verify the received log entries List<LogEntry> entries = logEntryCache.getLog(); - assertEquals("Number of entries", 3, entries.size()); + assertEquals("Number of entries", 6, entries.size()); assertEquals("BundleEvent INSTALLED", entries.get(0).getMessage()); assertEquals("BundleEvent RESOLVED", entries.get(1).getMessage()); - assertEquals("BundleEvent STARTED", entries.get(2).getMessage()); + assertEquals("addingService: org.apache.felix.log.LogServiceImpl", entries.get(2).getMessage()); + assertEquals("BundleEvent STARTED", entries.get(3).getMessage()); + assertEquals("BundleEvent STOPPED", entries.get(4).getMessage()); + assertEquals("BundleEvent UNINSTALLED", entries.get(5).getMessage()); } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/bundleA/ServiceA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/bundleA/ServiceA.java 2009-04-11 19:55:38 UTC (rev 87167) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/bundleA/ServiceA.java 2009-04-11 20:57:05 UTC (rev 87168) @@ -49,7 +49,7 @@ public Object addingService(ServiceReference sref) { log = (LogService)super.addingService(sref); - log.log(sref, LOG_INFO, "LogService added - " + log.getClass().getName()); + log.log(sref, LOG_INFO, "addingService: " + log.getClass().getName()); return log; } };