diff options
author | Tavian Barnes <tavianator@tavianator.com> | 2014-10-04 12:52:32 -0400 |
---|---|---|
committer | Tavian Barnes <tavianator@tavianator.com> | 2014-10-04 12:52:32 -0400 |
commit | 3fd5777a58f59218e3229c9ea11d816ecc6ae367 (patch) | |
tree | 53f937505806e010d2bc3134fa5507d0ff78d32c /sangria-log4j/src | |
parent | b0bb30831a334ff30e3e6a13790bbc324db89de5 (diff) | |
parent | 8e24a47b69f940c31ac95451b4584b95de7c8670 (diff) | |
download | sangria-3fd5777a58f59218e3229c9ea11d816ecc6ae367.tar.xz |
Merge branch 'test'
Diffstat (limited to 'sangria-log4j/src')
-rw-r--r-- | sangria-log4j/src/main/java/com/tavianator/sangria/log4j/Log4jLoggerProvider.java | 5 | ||||
-rw-r--r-- | sangria-log4j/src/test/java/com/tavianator/sangria/log4j/SangriaLog4jModuleTest.java | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sangria-log4j/src/main/java/com/tavianator/sangria/log4j/Log4jLoggerProvider.java b/sangria-log4j/src/main/java/com/tavianator/sangria/log4j/Log4jLoggerProvider.java index dae2323..34262d7 100644 --- a/sangria-log4j/src/main/java/com/tavianator/sangria/log4j/Log4jLoggerProvider.java +++ b/sangria-log4j/src/main/java/com/tavianator/sangria/log4j/Log4jLoggerProvider.java @@ -19,6 +19,7 @@ package com.tavianator.sangria.log4j; import javax.inject.Singleton; +import com.google.inject.Inject; import com.google.inject.spi.InjectionPoint; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -34,6 +35,10 @@ import com.tavianator.sangria.contextual.ContextSensitiveProvider; */ @Singleton class Log4jLoggerProvider implements ContextSensitiveProvider<Logger> { + @Inject + Log4jLoggerProvider() { + } + @Override public Logger getInContext(InjectionPoint injectionPoint) { return LogManager.getLogger(injectionPoint.getDeclaringType().getRawType()); diff --git a/sangria-log4j/src/test/java/com/tavianator/sangria/log4j/SangriaLog4jModuleTest.java b/sangria-log4j/src/test/java/com/tavianator/sangria/log4j/SangriaLog4jModuleTest.java index d91cf90..a3ecd66 100644 --- a/sangria-log4j/src/test/java/com/tavianator/sangria/log4j/SangriaLog4jModuleTest.java +++ b/sangria-log4j/src/test/java/com/tavianator/sangria/log4j/SangriaLog4jModuleTest.java @@ -29,6 +29,7 @@ import org.apache.logging.log4j.Logger; import org.junit.Before; import org.junit.Test; +import static com.tavianator.sangria.test.SangriaMatchers.*; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -74,7 +75,8 @@ public class SangriaLog4jModuleTest { } @Test - public void testDeDuplication() { - Guice.createInjector(new SangriaLog4jModule(), new SangriaLog4jModule()); + public void testBestPractices() { + assertThat(new SangriaLog4jModule(), is(atomic())); + assertThat(new SangriaLog4jModule(), followsBestPractices()); } } |