Author: ceki Date: Fri Oct 24 23:24:53 2008 New Revision: 1874 Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestInfrastructure.java - copied, changed from r1859, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestBase.java Removed: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestBase.java Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java Log: - renamed DBAppenderTestBase DBAppenderTestInfrastructure Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTest.java Fri Oct 24 23:24:53 2008 @@ -12,7 +12,7 @@ import ch.qos.logback.core.db.DriverManagerConnectionSource; import ch.qos.logback.core.util.StatusPrinter; -public class DBAppenderTest extends DBAppenderTestBase { +public class DBAppenderTest extends DBAppenderTestInfrastructure { AccessContext context; DBAppender appender; Copied: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestInfrastructure.java (from r1859, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestBase.java) ============================================================================== --- /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestBase.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderTestInfrastructure.java Fri Oct 24 23:24:53 2008 @@ -9,7 +9,7 @@ import org.hsqldb.Server; -public abstract class DBAppenderTestBase extends TestCase { +public abstract class DBAppenderTestInfrastructure extends TestCase { public static final String DRIVER_CLASS = "org.hsqldb.jdbcDriver"; String serverProps; @@ -19,7 +19,7 @@ Server server; boolean isNetwork = true; - public DBAppenderTestBase(String name) { + public DBAppenderTestInfrastructure(String name) { super(name); } Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/db/PackageTest.java Fri Oct 24 23:24:53 2008 @@ -16,6 +16,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(DBAppenderTest.class); + suite.addTest(new JUnit4TestAdapter(DBAppenderIntegrationTest.class)); return suite; } } \ No newline at end of file