issue 237

git-svn-id: http://morphia.googlecode.com/svn/trunk@1692 7223e496-fac8-11de-aa3c-59de0406b4f5

logging-slf4j/src/test/java/com/google/code/morphia/logging/slf4j/TestSLF4JLogrTest.java

@@ -15,7 +15,7 @@
 
 import com.google.code.morphia.Key;
 import com.google.code.morphia.annotations.Id;
-import com.google.code.morphia.logging.MorphiaLogrFactory;
+import com.google.code.morphia.logging.MorphiaLoggerFactory;
 
 /**
  * @author us@thomas-daily.de
@@ -41,7 +41,7 @@ public void setUp()
         this.baos = new ByteArrayOutputStream();
         System.setErr(new PrintStream(this.baos));
 
-        MorphiaLogrFactory.registerLogger(SLF4JLogrImplFactory.class);
+        MorphiaLoggerFactory.registerLogger(SLF4JLogrImplFactory.class);
 
         super.setUp();
     }

morphia/src/main/java/com/google/code/morphia/logging/MorphiaLoggerFactory.java

@@ -50,8 +50,12 @@ public static final Logr get(Class<?> c) {
 	/** Register a LoggerFactory; last one registered is used. **/
 	public static void registerLogger(Class<? extends LogrFactory> factoryClass) {
 		if (MorphiaLoggerFactory.loggerFactory == null)
-			MorphiaLoggerFactory.factories.add(0, factoryClass.getName());
+			MorphiaLoggerFactory.factories.add(factoryClass.getName());
 		else
 			throw new IllegalStateException("LoggerImplFactory must be registered before logging is initialized.");
 	}
+
+	public static void reset() {
+		loggerFactory = null;
+	}
 }

morphia/src/test/java/com/google/code/morphia/logging/MorphiaLogrFactoryTest.java

@@ -0,0 +1,133 @@
+/**
+ * 
+ */
+package com.google.code.morphia.logging;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+import com.google.code.morphia.TestBase;
+
+/**
+ * @author us@thomas-daily.de
+ * 
+ */
+public class MorphiaLogrFactoryTest extends TestBase {
+
+	static {
+
+		MorphiaLoggerFactory.reset();
+		MorphiaLoggerFactory.registerLogger(TestLoggerFactory.class);
+	}
+
+	public MorphiaLogrFactoryTest() {
+
+	}
+
+	@Test
+	public void testChoice() throws Exception {
+		Logr logr = MorphiaLoggerFactory.get(Object.class);
+		String className = logr.getClass().getName();
+		Assert.assertTrue(className.startsWith(TestLoggerFactory.class.getName() + "$"));
+	}
+
+	@Override
+	public void tearDown() {
+		MorphiaLoggerFactory.reset();
+		super.tearDown();
+	}
+
+	static class TestLoggerFactory implements LogrFactory {
+		public Logr get(Class<?> c) {
+			return new Logr() {
+
+				public void warning(String msg, Throwable t) {
+
+				}
+
+				public void warning(String format, Object... arg) {
+
+				}
+
+				public void warning(String msg) {
+
+				}
+
+				public void trace(String msg, Throwable t) {
+
+				}
+
+				public void trace(String format, Object... arg) {
+
+				}
+
+				public void trace(String msg) {
+
+				}
+
+				public boolean isWarningEnabled() {
+
+					return false;
+				}
+
+				public boolean isTraceEnabled() {
+
+					return false;
+				}
+
+				public boolean isInfoEnabled() {
+
+					return false;
+				}
+
+				public boolean isErrorEnabled() {
+
+					return false;
+				}
+
+				public boolean isDebugEnabled() {
+
+					return false;
+				}
+
+				public void info(String msg, Throwable t) {
+
+				}
+
+				public void info(String format, Object... arg) {
+
+				}
+
+				public void info(String msg) {
+
+				}
+
+				public void error(String msg, Throwable t) {
+
+				}
+
+				public void error(String format, Object... arg) {
+
+				}
+
+				public void error(String msg) {
+
+				}
+
+				public void debug(String msg, Throwable t) {
+
+				}
+
+				public void debug(String format, Object... arg) {
+
+				}
+
+				public void debug(String msg) {
+
+				}
+			};
+		}
+
+	}
+}