Author: jochen
Date: Tue Nov  4 14:46:38 2014
New Revision: 1636592

URL: http://svn.apache.org/r1636592
Log:
The test case for logger injection is now working.

Added:
    
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/InitializableObject.java
   (with props)
Modified:
    
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/InjLogger.java
    
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/Log4jLoggerModuleTest.java

Modified: 
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/InjLogger.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/InjLogger.java?rev=1636592&r1=1636591&r2=1636592&view=diff
==============================================================================
--- 
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/InjLogger.java
 (original)
+++ 
commons/sandbox/commons-inject/trunk/src/main/java/org/apache/commons/inject/api/InjLogger.java
 Tue Nov  4 14:46:38 2014
@@ -16,6 +16,10 @@
 */
 package org.apache.commons.inject.api;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
 public @interface InjLogger {
        String id();
 }

Added: 
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/InitializableObject.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/InitializableObject.java?rev=1636592&view=auto
==============================================================================
--- 
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/InitializableObject.java
 (added)
+++ 
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/InitializableObject.java
 Tue Nov  4 14:46:38 2014
@@ -0,0 +1,41 @@
+/**
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+package org.apache.commons.impl;
+
+import org.apache.commons.inject.api.ILifecycleListener;
+import org.apache.commons.inject.api.InjLogger;
+import org.apache.log4j.Logger;
+
+public class InitializableObject implements ILifecycleListener {
+       @InjLogger(id="MyLogger") private Logger log;
+
+       @Override
+       public void start() {
+               log.debug("start: ->");
+               log.debug("start: <-");
+       }
+
+       public void run() {
+               log.debug("run: Running");
+       }
+       
+       @Override
+       public void shutdown() {
+               log.debug("shutdown: ->");
+               log.debug("shutdown: <-");
+       }
+}
\ No newline at end of file

Propchange: 
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/InitializableObject.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: 
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/Log4jLoggerModuleTest.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/Log4jLoggerModuleTest.java?rev=1636592&r1=1636591&r2=1636592&view=diff
==============================================================================
--- 
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/Log4jLoggerModuleTest.java
 (original)
+++ 
commons/sandbox/commons-inject/trunk/src/test/java/org/apache/commons/impl/Log4jLoggerModuleTest.java
 Tue Nov  4 14:46:38 2014
@@ -22,8 +22,6 @@ import java.util.List;
 import org.apache.commons.inject.api.CommonsInject;
 import org.apache.commons.inject.api.IInjector;
 import org.apache.commons.inject.api.ILifecycleController;
-import org.apache.commons.inject.api.ILifecycleListener;
-import org.apache.commons.inject.api.InjLogger;
 import org.apache.commons.inject.api.Log4jLoggerModule;
 import org.apache.commons.inject.api.PostConstructModule;
 import org.apache.commons.inject.api.bind.IBinder;
@@ -65,26 +63,6 @@ public class Log4jLoggerModuleTest {
                });
        }
 
-       public static class InitializableObject implements ILifecycleListener {
-               @InjLogger(id="MyLogger") private Logger log;
-
-               @Override
-               public void start() {
-                       log.debug("start: ->");
-                       log.debug("start: <-");
-               }
-
-               public void run() {
-                       log.debug("run: Running");
-               }
-               
-               @Override
-               public void shutdown() {
-                       log.debug("shutdown: ->");
-                       log.debug("shutdown: <-");
-               }
-       }
-
        @Test
        public void testLoggerModule() {
                configureLog4j();
@@ -104,9 +82,9 @@ public class Log4jLoggerModuleTest {
                controller.shutdown();
                Assert.assertEquals(5, messages.size());
                Assert.assertEquals("DEBUG; start: ->", messages.get(0));
-               Assert.assertEquals("DEBUG; start: ->", messages.get(1));
+               Assert.assertEquals("DEBUG; start: <-", messages.get(1));
                Assert.assertEquals("DEBUG; run: Running", messages.get(2));
                Assert.assertEquals("DEBUG; shutdown: ->", messages.get(3));
-               Assert.assertEquals("DEBUG; shutdown: ->", messages.get(4));
+               Assert.assertEquals("DEBUG; shutdown: <-", messages.get(4));
        }
 }


Reply via email to