Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/repo/admin/Log4JHierarchyInitTest.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.admin;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @see Log4JHierarchyInit
+ * 
+ * @author Derek Hulley
+ * @since 2.2.3
+ */
+public class Log4JHierarchyInitTest extends TestCase
+{
+    private static ApplicationContext ctx = new ClassPathXmlApplicationContext(
+            new String[] {"classpath:log4j/log4j-test-context.xml"}
+            );
+
+    public void setUp() throws Exception
+    {
+    }
+    
+    public void testSetUp() throws Throwable
+    {
+        // Check that the bean is present
+        ctx.getBean("log4JHierarchyInit");
+        // Make sure that the default log4j.properties is being picked up
+        Log log = LogFactory.getLog("log4j.logger.org.alfresco");
+        assertFalse("Expect log level ERROR for 'org.alfresco'.", log.isWarnEnabled());
+    }
+    
+    public void testAddingLog4jProperties() throws Throwable
+    {
+        Log log = LogFactory.getLog(this.getClass());
+        // We expect DEBUG to be on
+        assertTrue("DEBUG was not enabled for logger " + this.getClass(), log.isDebugEnabled());
+    }
+}