# HG changeset patch # Parent ce81272a8f1d08dc9407668459b9ce37d6095602 # User Jesse Glick NbTestCase.logRoot may be used to refine logLevel to capture logs only from a certain part of the code. diff --git a/maven.model/src/org/netbeans/modules/maven/model/Utilities.java b/maven.model/src/org/netbeans/modules/maven/model/Utilities.java --- a/maven.model/src/org/netbeans/modules/maven/model/Utilities.java +++ b/maven.model/src/org/netbeans/modules/maven/model/Utilities.java @@ -91,7 +91,7 @@ private Utilities() {} - static final Logger logger = Logger.getLogger(Utilities.class.getName()); + private static final Logger logger = Logger.getLogger(Utilities.class.getName()); /** * diff --git a/maven.model/test/unit/src/org/netbeans/modules/maven/model/UtilitiesTest.java b/maven.model/test/unit/src/org/netbeans/modules/maven/model/UtilitiesTest.java --- a/maven.model/test/unit/src/org/netbeans/modules/maven/model/UtilitiesTest.java +++ b/maven.model/test/unit/src/org/netbeans/modules/maven/model/UtilitiesTest.java @@ -44,7 +44,6 @@ import java.util.Collections; import java.util.logging.Level; -import java.util.logging.Logger; import org.netbeans.junit.NbTestCase; import org.netbeans.modules.maven.model.pom.POMModel; import org.openide.filesystems.FileObject; @@ -59,14 +58,16 @@ protected @Override void setUp() throws Exception { clearWorkDir(); - Logger.getLogger("").setLevel(Level.OFF); - Utilities.logger.setLevel(Level.ALL); } protected @Override Level logLevel() { return Level.FINE; } + protected @Override String logRoot() { + return Utilities.class.getName(); + } + public void testPerformPOMModelOperations() throws Exception { FileObject pom = TestFileUtils.writeFile(FileUtil.toFileObject(getWorkDir()), "p0m.xml", "\n" + diff --git a/nbjunit/src/org/netbeans/junit/Log.java b/nbjunit/src/org/netbeans/junit/Log.java --- a/nbjunit/src/org/netbeans/junit/Log.java +++ b/nbjunit/src/org/netbeans/junit/Log.java @@ -247,11 +247,11 @@ - static void configure(Level lev, NbTestCase current) { + static void configure(Level lev, String root, NbTestCase current) { IL il = new IL(false); String c = "handlers=" + Log.class.getName() + "\n" + - ".level=" + lev.intValue() + "\n"; + root + ".level=" + lev.intValue() + "\n"; ByteArrayInputStream is = new ByteArrayInputStream(c.getBytes()); try { diff --git a/nbjunit/src/org/netbeans/junit/NbTestCase.java b/nbjunit/src/org/netbeans/junit/NbTestCase.java --- a/nbjunit/src/org/netbeans/junit/NbTestCase.java +++ b/nbjunit/src/org/netbeans/junit/NbTestCase.java @@ -194,7 +194,7 @@ * Allows easy collecting of log messages send thru java.util.logging API. * Overwrite and return the log level to collect logs to logging file. * If the method returns non-null level, then the level is assigned to - * the Logger.getLogger("") and the messages reported to it + * the Logger.getLogger({@linkplain #logRoot logRoot()}) and the messages reported to it * are then send into regular log file (which is accessible thru {@link NbTestCase#getLog}) * and in case of failure the last few messages is also included * in failure.getMessage(). @@ -209,6 +209,15 @@ } /** + * If overriding {@link #logLevel}, may override this as well to collect messages from only some code. + * @return {@code ""} (default) to collect messages from all loggers; or {@code "my.pkg"} or {@code "my.pkg.Class"} etc. + * @since XXX + */ + protected String logRoot() { + return ""; + } + + /** * Runs the test case, while conditionally skip some according to result of * {@link #canRun} method. */ @@ -223,7 +232,7 @@ } catch(BackingStoreException bex) {} Level lev = logLevel(); if (lev != null) { - Log.configure(lev, NbTestCase.this); + Log.configure(lev, logRoot(), NbTestCase.this); } super.run(result); }