svn commit: r1397815 - /felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java

[pd...@apache.org]

Author: pderop
Date: Sat Oct 13 11:54:00 2012
New Revision: 1397815

URL: http://svn.apache.org/viewvc?rev=1397815&view=rev
Log:
- Flush logs.
- Don't log if log level is greated than the one configured in DS_LOGLEVEL

Modified:
    felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java

Modified: felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java?rev=1397815&r1=1397814&r2=1397815&view=diff
==============================================================================
--- felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java (original)
+++ felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java Sat Oct 13 11:54:00 2012
@@ -50,6 +50,7 @@ import java.util.List;
 import java.util.TreeSet;
 
 import javax.inject.Inject;
+
 import junit.framework.TestCase;
 
 import org.apache.felix.scr.Component;
@@ -73,6 +74,7 @@ import org.osgi.service.cm.Configuration
 import org.osgi.service.log.LogEntry;
 import org.osgi.service.log.LogListener;
 import org.osgi.service.log.LogReaderService;
+import org.osgi.service.log.LogService;
 import org.osgi.util.tracker.ServiceTracker;
 
 
@@ -606,6 +608,11 @@ public abstract class ComponentTestBase
 
         public void logged(LogEntry entry)
         {
+            if ( entry.getLevel() > getEnabledLogLevel() )
+            {
+                return;
+            }
+
             if (entry.getLevel() <= 2)
             {
                 m_warnings.add( entry );
@@ -624,12 +631,32 @@ public abstract class ComponentTestBase
                 entry.getException().printStackTrace(pw);
             }
             _out.println(sw.toString());
+            _out.flush();
         }
 
         List foundWarnings()
         {
             return m_warnings;
         }
+        
+        public int getEnabledLogLevel() {
+            if ( DS_LOGLEVEL.regionMatches( true, 0, "err", 0, "err".length() ) )
+            {
+                return LogService.LOG_ERROR;
+            }
+            else if ( DS_LOGLEVEL.regionMatches( true, 0, "warn", 0, "warn".length() ) )
+            {
+                return LogService.LOG_WARNING;
+            }
+            else if ( DS_LOGLEVEL.regionMatches( true, 0, "info", 0, "info".length() ) )
+            {
+                return LogService.LOG_INFO;
+            }
+            else
+            {
+                return LogService.LOG_DEBUG;
+            }
+        }
     }