Author: thomas.diesler(a)jboss.com Date: 2009-04-14 07:56:30 -0400 (Tue, 14 Apr 2009) New Revision: 87274 Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java Log: Verify bundle STOPPED log message Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-14 11:27:44 UTC (rev 87273) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-14 11:56:30 UTC (rev 87274) @@ -23,6 +23,7 @@ //$Id$ +import java.util.Iterator; import java.util.List; import org.jboss.osgi.service.log.LogEntryCache; @@ -55,8 +56,8 @@ // Setup the LogEntryCache final LogEntryCache logEntryCache = new LogEntryCache(); - logEntryCache.addFilter(new LogEntryFilter("example-log(.*)", LogService.LOG_INFO, "BundleEvent(.*)")); - logEntryCache.addFilter(new LogEntryFilter(null, -1, "\\[ServiceA\\](.*)")); + logEntryCache.addFilter(new LogEntryFilter("example-log(.*)", LogService.LOG_INFO, "\\[ServiceActivator\\](.*)")); + logEntryCache.addFilter(new LogEntryFilter(null, 0, "\\[ServiceA\\](.*)")); // Track the RemoteLogReaderService to add the LogEntryCache as LogListener ServiceTracker tracker = new ServiceTracker(sysContext, RemoteLogReaderService.class.getName(), null) @@ -88,17 +89,14 @@ // Uneploy the RemoteLogListener from the remote OSGiFramework. undeployBundle("bundles/jboss-osgi-service-remote-log.jar"); - - System.out.println(logEntryCache.getLog()); // Verify the received log entries List<LogEntry> entries = logEntryCache.getLog(); - assertEquals("Number of entries", 6, entries.size()); - assertEquals("BundleEvent INSTALLED", entries.get(0).getMessage()); - assertEquals("BundleEvent RESOLVED", entries.get(1).getMessage()); - assertEquals("[ServiceA] 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()); + Iterator<LogEntry> itLog = entries.iterator(); + + assertEquals("Number of entries", 3, entries.size()); + assertEquals("[ServiceA] new Service", itLog.next().getMessage()); + assertEquals("[ServiceActivator] BundleEvent STARTED", itLog.next().getMessage()); + assertEquals("[ServiceActivator] BundleEvent STOPPING", itLog.next().getMessage()); } } \ No newline at end of file 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-14 11:27:44 UTC (rev 87273) +++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-04-14 11:56:30 UTC (rev 87274) @@ -24,6 +24,7 @@ //$Id$ import java.net.URL; +import java.util.Iterator; import java.util.List; import org.jboss.osgi.service.log.LogEntryCache; @@ -85,18 +86,19 @@ // Verify that the bundle is active assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundleA.getState()); - // Verify the received log entries - List<LogEntry> entries = logEntryCache.getLog(true); - - // Verify the the log entries - assertEquals("Number of entries", 2, entries.size()); - assertEquals("[ServiceA] new Service", entries.get(0).getMessage()); - assertEquals("[ServiceActivator] BundleEvent STARTED", entries.get(1).getMessage()); - // Uninstall the test bundle bundleA.uninstall(); // Uninstall the 3rd party LogService logServiceBundle.uninstall(); + + // Verify the received log entries + List<LogEntry> entries = logEntryCache.getLog(); + Iterator<LogEntry> itLog = entries.iterator(); + + assertEquals("Number of entries", 3, entries.size()); + assertEquals("[ServiceA] new Service", itLog.next().getMessage()); + assertEquals("[ServiceActivator] BundleEvent STARTED", itLog.next().getMessage()); + assertEquals("[ServiceActivator] BundleEvent STOPPING", itLog.next().getMessage()); } } \ No newline at end of file