[logback-dev] svn commit: r2312 - in logback/trunk: logback-classic/src/test/java/ch/qos/logback/classic logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135 logback-core/src/test/java/ch/qos/logback/core/appender logback-core/src/test/java/ch/qos/logback/core/contention logback-core/src/test/java/ch/qos/logback/core/rolling
noreply.ceki at qos.ch
noreply.ceki at qos.ch
Mon Jun 29 18:44:28 CEST 2009
Author: ceki
Date: Mon Jun 29 18:44:28 2009
New Revision: 2312
Modified:
logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestConstants.java
logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingRunnable.java
logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingToFileThrouhput.java
logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/AbstractAppenderTest.java
logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java
logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/DummyAppenderTest.java
logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java
logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/RunnableWithCounterAndDone.java
logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java
Log:
Use Appender instead of AppenderBase in AbstractAppender related tests
Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestConstants.java
==============================================================================
--- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestConstants.java (original)
+++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestConstants.java Mon Jun 29 18:44:28 2009
@@ -1,11 +1,11 @@
/**
- * LOGBack: the reliable, fast and flexible logging library for Java.
- *
- * Copyright (C) 1999-2006, QOS.ch
- *
- * This library 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.
+ * Logback: the generic, reliable, fast and flexible logging framework.
+ *
+ * Copyright (C) 2000-2009, QOS.ch
+ *
+ * This library 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.
*/
package ch.qos.logback.classic;
Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingRunnable.java
==============================================================================
--- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingRunnable.java (original)
+++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingRunnable.java Mon Jun 29 18:44:28 2009
@@ -1,3 +1,12 @@
+/**
+ * Logback: the generic, reliable, fast and flexible logging framework.
+ *
+ * Copyright (C) 2000-2009, QOS.ch
+ *
+ * This library 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.
+ */
package ch.qos.logback.classic.issue.lbclassic135;
import ch.qos.logback.classic.Logger;
Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingToFileThrouhput.java
==============================================================================
--- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingToFileThrouhput.java (original)
+++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingToFileThrouhput.java Mon Jun 29 18:44:28 2009
@@ -1,3 +1,12 @@
+/**
+ * Logback: the generic, reliable, fast and flexible logging framework.
+ *
+ * Copyright (C) 2000-2009, QOS.ch
+ *
+ * This library 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.
+ */
package ch.qos.logback.classic.issue.lbclassic135;
import ch.qos.logback.classic.Logger;
Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/AbstractAppenderTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/AbstractAppenderTest.java (original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/AbstractAppenderTest.java Mon Jun 29 18:44:28 2009
@@ -1,11 +1,11 @@
/**
- * LOGBack: the reliable, fast and flexible logging library for Java.
- *
- * Copyright (C) 1999-2006, QOS.ch
- *
- * This library 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.
+ * Logback: the generic, reliable, fast and flexible logging framework.
+ *
+ * Copyright (C) 2000-2009, QOS.ch
+ *
+ * This library 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.
*/
package ch.qos.logback.core.appender;
@@ -15,7 +15,7 @@
import org.junit.Test;
-import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
import ch.qos.logback.core.ContextBase;
import ch.qos.logback.core.status.StatusChecker;
@@ -25,19 +25,19 @@
abstract public class AbstractAppenderTest<E> {
- abstract protected AppenderBase<E> getAppender();
- abstract protected AppenderBase<E> getConfiguredAppender();
+ abstract protected Appender<E> getAppender();
+ abstract protected Appender<E> getConfiguredAppender();
@Test
public void testNewAppender() {
// new appenders should be inactive
- AppenderBase appender = getAppender();
+ Appender appender = getAppender();
assertFalse( appender.isStarted());
}
@Test
public void testConfiguredAppender() {
- AppenderBase appender = getConfiguredAppender();
+ Appender appender = getConfiguredAppender();
appender.start();
assertTrue(appender.isStarted());
@@ -48,7 +48,7 @@
@Test
public void testNoStart() {
- AppenderBase<E> appender = getAppender();
+ Appender<E> appender = getAppender();
Context context = new ContextBase();
appender.setContext(context);
appender.setName("doh");
Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java (original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java Mon Jun 29 18:44:28 2009
@@ -1,11 +1,11 @@
/**
- * LOGBack: the reliable, fast and flexible logging library for Java.
- *
- * Copyright (C) 1999-2006, QOS.ch
- *
- * This library 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.
+ * Logback: the generic, reliable, fast and flexible logging framework.
+ *
+ * Copyright (C) 2000-2009, QOS.ch
+ *
+ * This library 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.
*/
package ch.qos.logback.core.appender;
@@ -18,7 +18,7 @@
import org.junit.Before;
import org.junit.Test;
-import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Appender;
import ch.qos.logback.core.ConsoleAppender;
import ch.qos.logback.core.CoreConstants;
import ch.qos.logback.core.layout.DummyLayout;
@@ -53,11 +53,11 @@
}
@Override
- public AppenderBase<Object> getAppender() {
+ public Appender<Object> getAppender() {
return new ConsoleAppender<Object>();
}
- protected AppenderBase<Object> getConfiguredAppender() {
+ protected Appender<Object> getConfiguredAppender() {
ConsoleAppender<Object> ca = new ConsoleAppender<Object>();
ca.setLayout(new NopLayout<Object>());
ca.start();
Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/DummyAppenderTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/DummyAppenderTest.java (original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/DummyAppenderTest.java Mon Jun 29 18:44:28 2009
@@ -9,13 +9,13 @@
*/
package ch.qos.logback.core.appender;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.StringWriter;
import org.junit.Test;
-import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Appender;
import ch.qos.logback.core.layout.DummyLayout;
import ch.qos.logback.core.layout.NopLayout;
@@ -23,11 +23,11 @@
public class DummyAppenderTest {
- protected AppenderBase getAppender() {
+ protected Appender getAppender() {
return new DummyAppender(new StringWriter());
}
- protected AppenderBase getConfiguredAppender() {
+ protected Appender getConfiguredAppender() {
DummyAppender<Object> da = new DummyAppender<Object>(new StringWriter());
da.setLayout(new NopLayout<Object>());
da.start();
Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java (original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java Mon Jun 29 18:44:28 2009
@@ -19,7 +19,7 @@
import org.junit.Test;
-import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
import ch.qos.logback.core.ContextBase;
import ch.qos.logback.core.FileAppender;
@@ -35,11 +35,11 @@
int diff = new Random().nextInt(100);
Context context = new ContextBase();
- protected AppenderBase<Object> getAppender() {
+ protected Appender<Object> getAppender() {
return new FileAppender<Object>();
}
- protected AppenderBase<Object> getConfiguredAppender() {
+ protected Appender<Object> getConfiguredAppender() {
FileAppender<Object> appender = new FileAppender<Object>();
appender.setLayout(new NopLayout<Object>());
appender.setFile("temp.log");
Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/RunnableWithCounterAndDone.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/RunnableWithCounterAndDone.java (original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/RunnableWithCounterAndDone.java Mon Jun 29 18:44:28 2009
@@ -1,3 +1,12 @@
+/**
+ * Logback: the generic, reliable, fast and flexible logging framework.
+ *
+ * Copyright (C) 2000-2009, QOS.ch
+ *
+ * This library 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.
+ */
package ch.qos.logback.core.contention;
/**
Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java
==============================================================================
--- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java (original)
+++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java Mon Jun 29 18:44:28 2009
@@ -1,3 +1,12 @@
+/**
+ * Logback: the generic, reliable, fast and flexible logging framework.
+ *
+ * Copyright (C) 2000-2009, QOS.ch
+ *
+ * This library 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.
+ */
package ch.qos.logback.core.rolling;
@@ -10,7 +19,7 @@
import org.junit.Before;
import org.junit.Test;
-import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
import ch.qos.logback.core.ContextBase;
import ch.qos.logback.core.appender.AbstractAppenderTest;
@@ -41,12 +50,12 @@
@Override
- protected AppenderBase<Object> getAppender() {
+ protected Appender<Object> getAppender() {
return rfa;
}
@Override
- protected AppenderBase<Object> getConfiguredAppender() {
+ protected Appender<Object> getConfiguredAppender() {
rfa.setContext(context);
tbrp.setFileNamePattern("toto-%d.log");
More information about the logback-dev
mailing list