You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2004/11/20 14:30:19 UTC
cvs commit: logging-log4j/tests/input/ndc NDC1.properties
ceki 2004/11/20 05:30:19
Modified: tests/src/java/org/apache/log4j AsyncAppenderTestCase.java
NDCTestCase.java
Added: tests/witness/ndc NDC.1
tests/input/ndc NDC1.properties
Removed: tests/input NDC1.properties
tests/witness NDC.1
Log:
Moving input and witness files
Revision Changes Path
1.6 +3 -2 logging-log4j/tests/src/java/org/apache/log4j/AsyncAppenderTestCase.java
Index: AsyncAppenderTestCase.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/AsyncAppenderTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AsyncAppenderTestCase.java 24 May 2004 16:10:54 -0000 1.5
+++ AsyncAppenderTestCase.java 20 Nov 2004 13:30:19 -0000 1.6
@@ -95,9 +95,10 @@
// rename the method to suite() to have all tests executed. Rebame the method
// to Xsuite to have only selected tests executed.
- public static Test Xsuite() {
+ public static Test XXsuite() {
TestSuite suite = new TestSuite();
- suite.addTest(new AsyncAppenderTestCase("closeTest"));
+ suite.addTest(new AsyncAppenderTestCase("test1"));
+ //suite.addTest(new AsyncAppenderTestCase("closeTest"));
return suite;
}
1.2 +14 -53 logging-log4j/tests/src/java/org/apache/log4j/NDCTestCase.java
Index: NDCTestCase.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/NDCTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NDCTestCase.java 27 Mar 2004 06:48:23 -0000 1.1
+++ NDCTestCase.java 20 Nov 2004 13:30:19 -0000 1.2
@@ -1,58 +1,19 @@
/*
- * ============================================================================
- * The Apache Software License, Version 1.1
- * ============================================================================
- *
- * Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any, must
- * include the following acknowledgment: "This product includes software
- * developed by the Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself, if
- * and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "log4j" and "Apache Software Foundation" must not be used to
- * endorse or promote products derived from this software without prior
- * written permission. For written permission, please contact
- * apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache", nor may
- * "Apache" appear in their name, without prior written permission of the
- * Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * on behalf of the Apache Software Foundation. For more information on the
- * Apache Software Foundation, please see <http://www.apache.org/>.
+ * Copyright 1999,2004 The Apache Software Foundation.
*
+ * Licensed 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.
*/
-/* Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
package org.apache.log4j;
import junit.framework.Test;
@@ -84,9 +45,9 @@
}
public void test1() throws Exception {
- PropertyConfigurator.configure("input/NDC1.properties");
+ PropertyConfigurator.configure("input/ndc/NDC1.properties");
common();
- assertTrue(Compare.compare(TEMP, "witness/NDC.1"));
+ assertTrue(Compare.compare(TEMP, "witness/ndc/NDC.1"));
}
static void common() {
1.1 logging-log4j/tests/witness/ndc/NDC.1
Index: NDC.1
===================================================================
DEBUG null - m1
INFO null - m2
WARN null - m3
ERROR null - m4
FATAL null - m5
DEBUG n1 - m1
INFO n1 - m2
WARN n1 - m3
ERROR n1 - m4
FATAL n1 - m5
DEBUG n1 n2 n3 - m1
INFO n1 n2 n3 - m2
WARN n1 n2 n3 - m3
ERROR n1 n2 n3 - m4
FATAL n1 n2 n3 - m5
DEBUG n1 n2 - m1
INFO n1 n2 - m2
WARN n1 n2 - m3
ERROR n1 n2 - m4
FATAL n1 n2 - m5
DEBUG null - m1
INFO null - m2
WARN null - m3
ERROR null - m4
FATAL null - m5
1.1 logging-log4j/tests/input/ndc/NDC1.properties
Index: NDC1.properties
===================================================================
log4j.rootCategory=DEBUG, testAppender
log4j.appender.testAppender=org.apache.log4j.FileAppender
log4j.appender.testAppender.file=output/temp
log4j.appender.testAppender.Append=false
log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.testAppender.layout.ConversionPattern=%-5p %x - %m%n
# Prevent internal log4j DEBUG messages from polluting the output.
log4j.logger.org.apache.log4j.PropertyConfigurator=INFO
log4j.logger.org.apache.log4j.config.PropertySetter=INFO
log4j.logger.org.apache.log4j.FileAppender=INFO
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org