Allow feeding LogService config via Properties

And test that Properties-based configuration works.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>

Author: maarzt

src/main/java/org/scijava/log/AbstractLogService.java

@@ -71,10 +71,14 @@ public abstract class AbstractLogService extends AbstractService implements
 	// -- constructor --
 
 	public AbstractLogService() {
+		this(System.getProperties());
+	}
+
+	public AbstractLogService(final Properties properties) {
 		// check SciJava log level system properties for initial logging levels
 
 		// global log level property
-		final String logProp = System.getProperty(LOG_LEVEL_PROPERTY);
+		final String logProp = properties.getProperty(LOG_LEVEL_PROPERTY);
 		final int level = LogLevel.value(logProp);
 		if (level >= 0) setLevel(level);
 
@@ -83,14 +87,13 @@ public AbstractLogService() {
 
 		// populate custom class- and package-specific log level properties
 		final String logLevelPrefix = LOG_LEVEL_PROPERTY + ":";
-		final Properties props = System.getProperties();
-		for (final Object propKey : props.keySet()) {
+		for (final Object propKey : properties.keySet()) {
 			if (!(propKey instanceof String)) continue;
 			final String propName = (String) propKey;
 			if (!propName.startsWith(logLevelPrefix)) continue;
 			final String classOrPackageName =
 				propName.substring(logLevelPrefix.length());
-			setLevel(classOrPackageName, LogLevel.value(props.getProperty(propName)));
+			setLevel(classOrPackageName, LogLevel.value(properties.getProperty(propName)));
 		}
 
 	}

src/test/java/org/scijava/log/LogServiceTest.java

@@ -2,6 +2,7 @@
 
 import org.junit.Test;
 
+import java.util.Properties;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
@@ -116,6 +117,54 @@ private void testIsLevel(int level, Function<LogService, Boolean> isLevel) {
 		assertTrue(isLevel.apply(logService));
 	}
 
+	@Test
+	public void testDefaultLevel() {
+		assertEquals(LogLevel.INFO, new TestableLogService().getLevel());
+	}
+
+	@Test
+	public void testMainSystemProperty() {
+		Properties properties = new Properties();
+		properties.setProperty(LogService.LOG_LEVEL_PROPERTY, "error");
+		int level = new TestableLogService(properties).getLevel();
+		assertEquals(LogLevel.ERROR, level);
+	}
+
+	static class Dummy {
+		public static int getLevel(LogService log) {
+			return log.getLevel();
+		}
+	}
+
+	@Test
+	public void testClassLogLevel() {
+		final TestableLogService log = new TestableLogService();
+		log.setLevel(LogLevel.DEBUG);
+		log.setLevel(Dummy.class.getName(), LogLevel.ERROR);
+		int level = Dummy.getLevel(log);
+		assertEquals(LogLevel.ERROR, level);
+	}
+
+	@Test
+	public void testClassLogLevelViaProperties() {
+		Properties properties = new Properties();
+		properties.setProperty(LogService.LOG_LEVEL_PROPERTY + ":" + Dummy.class.getName(), LogLevel.prefix(LogLevel.ERROR));
+		properties.setProperty(LogService.LOG_LEVEL_PROPERTY + ":" + this.getClass().getName(), LogLevel.prefix(LogLevel.TRACE));
+		final LogService log = new TestableLogService(properties);
+		log.setLevel(LogLevel.DEBUG);
+		int level = Dummy.getLevel(log);
+		assertEquals(LogLevel.ERROR, level);
+	}
+
+	@Test
+	public void testPackageLogLevel() {
+		final LogService log = new TestableLogService();
+		log.setLevel("org.scijava.log", LogLevel.TRACE);
+		log.setLevel("xyz.foo.bar", LogLevel.ERROR);
+		int level = log.getLevel();
+		assertEquals(LogLevel.TRACE, level);
+	}
+
 	// -- Helper classes --
 
 	private static class MyTestClass {
@@ -140,6 +189,14 @@ private static class TestableLogService extends AbstractLogService {
 		String message = null;
 		Throwable exception = null;
 
+		public TestableLogService() {
+			this(new Properties());
+		}
+
+		public TestableLogService(Properties properties) {
+			super(properties);
+		}
+
 		public String message() {
 			return message;
 		}