add protocol string + tests on LoggerFactory

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/protocols/string/Handler.java

@@ -0,0 +1,25 @@
+package net.lecousin.framework.protocols.string;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+
+import net.lecousin.framework.io.buffering.ByteArrayIO;
+import net.lecousin.framework.io.util.ReadableAsURLConnection;
+
+/**
+ * URL Stream Handler for string protocol.
+ */
+public class Handler extends URLStreamHandler {
+
+	@Override
+	protected URLConnection openConnection(URL u) throws IOException {
+		String encoding = u.getHost();
+		String str = u.getPath().substring(1);
+		byte[] bytes = str.getBytes(encoding);
+		ByteArrayIO io = new ByteArrayIO(bytes, "string protocol");
+		return new ReadableAsURLConnection(io, u, true);
+	}
+	
+}

net.lecousin.core/src/main/java/net/lecousin/framework/protocols/string/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * String protocol string:/xxx/yyy with xxx the encoding to use and yyy the string.
+ */
+package net.lecousin.framework.protocols.string;

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/log/TestLoggers.java

@@ -1,12 +1,12 @@
 package net.lecousin.framework.core.tests.log;
 
 import java.io.File;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import net.lecousin.framework.application.Application;
 import net.lecousin.framework.application.LCCore;
 import net.lecousin.framework.concurrent.Task;
@@ -26,6 +26,9 @@
 import net.lecousin.framework.log.appenders.RollingFileAppender;
 import net.lecousin.framework.util.StringUtil;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class TestLoggers extends LCCoreAbstractTest {
 
 	@Test
@@ -102,7 +105,7 @@ public void test() throws Exception {
 		expected.append(' ');
 		expected.append("test");
 		expected.append(' ');
-		expected.append(79);
+		expected.append(82);
 		expected.append(' ');
 		expected.append("TestLoggers.java");
 		expected.append(' ');
@@ -193,4 +196,38 @@ private static void produceLogs(Logger log) {
 		log.trace("this is trace");
 	}
 
+	@Test
+	public void testInvalidConfig() throws MalformedURLException {
+		testInvalidConfig("");
+		testInvalidConfig("<!-- -->");
+		testInvalidConfig("<root></root>");
+		testInvalidConfig("<LoggingConfiguration><unexpected/></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Appender>");
+		testInvalidConfig("<LoggingConfiguration><Appender></Appender></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Appender class=\"hello\"></Appender></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Appender name=\"hello\"></Appender></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Appender name=\"hello\" class=\"" + getClass().getName() + "\"></Appender></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Logger>");
+		testInvalidConfig("<LoggingConfiguration><Logger toto=\"1\"></Logger></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Logger level=\"UNKNOWN\"></Logger></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Logger name=\"test\" level=\"WARN\"></Logger></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Logger name=\"test\" level=\"WARN\" appender=\"unknown\"></Logger></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Logger name=\"test\" level=\"WARN\" appender=\"console\"><!----><unexpected/></Logger></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Default>");
+		testInvalidConfig("<LoggingConfiguration><Default></Default></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Default toto=\"1\"></Default></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Default appender=\"unknown\"></Default></LoggingConfiguration>");
+		testInvalidConfig("<LoggingConfiguration><Default appender=\"console\"><!----><unexpected/></Default></LoggingConfiguration>");
+	}
+	
+	private static void testInvalidConfig(String config) throws MalformedURLException {
+		URL url = new URL("string://UTF-8/" + config);
+		try (InputStream in = url.openStream()) {
+			LCCore.getApplication().getLoggerFactory().configure(in);
+			throw new AssertionError("Error expected to configure loggers: " + config);
+		} catch (Exception e) {
+			// ok
+		}
+	}
+	
 }

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/protocols/TestStringProtocol.java

@@ -0,0 +1,31 @@
+package net.lecousin.framework.core.tests.protocols;
+
+import java.io.InputStream;
+import java.net.URL;
+
+import net.lecousin.framework.core.test.LCCoreAbstractTest;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestStringProtocol extends LCCoreAbstractTest {
+
+	@Test
+	public void testUTF8() throws Exception {
+		URL url = new URL("string://UTF-8/this is a test");
+		InputStream in = url.openStream();
+		byte[] b = new byte[1024];
+		int off = 0;
+		do {
+			int nb = in.read(b, off, b.length - off);
+			if (nb <= 0) break;
+			off += nb;
+		} while (true);
+		in.close();
+		Assert.assertEquals(14, off);
+		byte[] b2 = new byte[14];
+		System.arraycopy(b, 0, b2, 0, 14);
+		Assert.assertArrayEquals(b2, new byte[] { 't','h','i','s',' ','i','s',' ','a',' ','t','e','s','t' });
+	}
+	
+}