From fd6bd8b5dee6807e7890f4eda578a73b4b1bb4dc Mon Sep 17 00:00:00 2001
From: Alex Rudyy <orudyy@apache.org>
Date: Wed, 10 Dec 2014 17:34:24 +0000
Subject: QPID-6265: Change system tests to have one log per file configured
 using Log4j, simplify QBTC

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1644492 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/test-profiles/log4j-test.xml             | 67 ----------------------
 qpid/java/test-profiles/test_resources/log4j.xml   | 53 +++++++++++++++++
 .../test_resources/spawned-broker-log4j.xml        | 59 +++++++++++++++++++
 3 files changed, 112 insertions(+), 67 deletions(-)
 delete mode 100644 qpid/java/test-profiles/log4j-test.xml
 create mode 100644 qpid/java/test-profiles/test_resources/log4j.xml
 create mode 100644 qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml

(limited to 'qpid/java/test-profiles')

diff --git a/qpid/java/test-profiles/log4j-test.xml b/qpid/java/test-profiles/log4j-test.xml
deleted file mode 100644
index a393fa0952..0000000000
--- a/qpid/java/test-profiles/log4j-test.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-    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.
--->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j configuration for unit tests                                   -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <param name="Target" value="System.out"/>
-    <param name="ImmediateFlush" value="true"/>
-    <param name="Follow" value="true"/>
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/>
-    </layout>
-  </appender>
-
-  <logger name="org.apache.qpid">
-    <level value="${amqj.logging.level}"/>
-  </logger>
-
-  <logger name="qpid.message">
-    <level value="INFO"/>
-  </logger>
-
-  <logger name="qpid.protocol">
-    <level value="${amqj.protocol.logging.level}"/>
-  </logger>
-
-  <logger name="org.apache.qpid.test.utils.QpidTestCase">
-    <level value="ALL"/>
-  </logger>
-  
-  <logger name="org.apache.commons">
-    <level value="WARN"/>
-  </logger>
-
-  <logger name="apache.commons.configuration.ConfigurationFactory">
-    <level value="ERROR"/>
-  </logger>
-
-  <root>
-    <level value="${root.logging.level}"/>
-    <appender-ref ref="console" />
-  </root>
-</log4j:configuration>
diff --git a/qpid/java/test-profiles/test_resources/log4j.xml b/qpid/java/test-profiles/test_resources/log4j.xml
new file mode 100644
index 0000000000..8c59ffdd98
--- /dev/null
+++ b/qpid/java/test-profiles/test_resources/log4j.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  --><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="null" threshold="null">
+
+
+
+    <appender class="org.apache.log4j.FileAppender" name="TestAppender">
+        <param name="File" value="${test.output.dir}${file.separator}TEST-${qpid.testClass}${qpid.testMethod}.txt"/>
+        <param name="Append" value="false"/>
+
+
+        <!-- TODO date not interesting for test debugging. log only the time to save width -->
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] (%c{2}) - %m%n"/>
+        </layout>
+    </appender>
+
+
+    <!-- General logging hierarchy -->
+    <logger name="org.apache.qpid">
+        <level value="${amqj.logging.level}"/>
+    </logger>
+
+    <logger name="qpid.message">
+        <level value="INFO"/>
+    </logger>
+
+
+    <!-- Log all info events to file -->
+    <root>
+        <level value="debug"/>
+        <appender-ref ref="TestAppender"/>
+    </root>
+
+</log4j:configuration>
diff --git a/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml b/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml
new file mode 100644
index 0000000000..6bb91f88b1
--- /dev/null
+++ b/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    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.
+-->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j configuration for unit tests                                   -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+  <appender name="console" class="org.apache.log4j.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+    <param name="ImmediateFlush" value="true"/>
+    <param name="Follow" value="true"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/>
+    </layout>
+  </appender>
+
+  <logger name="org.apache.qpid">
+    <level value="${amqj.logging.level}"/>
+  </logger>
+
+  <logger name="qpid.message">
+    <level value="INFO"/>
+  </logger>
+
+  <logger name="qpid.protocol">
+    <level value="${amqj.protocol.logging.level}"/>
+  </logger>
+
+  <logger name="org.apache.commons">
+    <level value="WARN"/>
+  </logger>
+
+  <root>
+    <level value="${root.logging.level}"/>
+    <appender-ref ref="console" />
+  </root>
+</log4j:configuration>
-- 
cgit v1.2.1