- logback-dev - mailman3.qos.ch

svn commit: r68 - logback/core/trunk
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 18:01:58 2006 New Revision: 68 Modified: logback/core/trunk/pom.xml Log: less tests excluded, included assembly tags and a few temp tags (dev, lists) to test mvn site Modified: logback/core/trunk/pom.xml ============================================================================== --- logback/core/trunk/pom.xml (original) +++ logback/core/trunk/pom.xml Thu Jul 13 18:01:58 2006 @@ -1,69 +1,180 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - <groupId>qos.ch</groupId> - <artifactId>logback-core</artifactId> - <packaging>jar</packaging> - <version>0.1-SNAPSHOT</version> - <name>Logback Core Module</name> - - <url>http://logback.qos.ch</url> - - <dependencies> - <dependency> - <groupId>janino</groupId> - <artifactId>janino</artifactId> - <version>2.4.3</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <reportFormat>plain</reportFormat> - <workingDirectory>${basedir}/src/test</workingDirectory> - <excludes> - <exclude>**/AllTest.java</exclude> - <exclude>**/PackageTest.java</exclude> - <exclude>**/RenamingTest.java</exclude> - <exclude>**/SizeBasedRollingTest.java</exclude> - <exclude>**/TimeBasedRollingTest.java</exclude> - </excludes> - </configuration> - </plugin> - - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - -  - </plugins> - - - </build> - +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> +  + <groupId>ch.qos.logback.core</groupId> + <artifactId>logback-core</artifactId> + <packaging>jar</packaging> + <version>0.1-SNAPSHOT</version> + <name>Logback Core Module</name> + + <url>http://logback.qos.ch</url> + <description> + LOGBack: the generic, reliable, fast and flexible logging library for + Java. + </description> + + <dependencies> + <dependency> + <groupId>janino</groupId> + <artifactId>janino</artifactId> + <version>2.4.3</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + <reportFormat>plain</reportFormat> + <trimStackTrace>false</trimStackTrace> +  + <excludes> + <exclude>**/AllTest.java</exclude> + <exclude>**/PackageTest.java</exclude> + </excludes> + </configuration> + </plugin> + +  +  + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.0-beta-1</version> + <configuration> + <descriptor> + src/main/assembly/source.xml + </descriptor> +  + <finalName>LOGBackCore</finalName> + <outputDirectory>target/dist</outputDirectory> + </configuration> + </plugin> + + + +  + </plugins> + + <testResources> + <testResource> + <directory>src/test/input</directory> + <targetPath>src/test/input</targetPath> + </testResource> + <testResource> + <directory>src/test/witness</directory> + <targetPath>src/test/witness</targetPath> + </testResource> + </testResources> + </build> + + +  +  + <mailingLists> + <mailingList> + <name>LOGBack Announce List</name> + <subscribe> + http://qos.ch/mailman/listinfo/logback-announce + </subscribe> + <unsubscribe> + http://qos.ch/mailman/options/logback-announce + </unsubscribe> + <post>logback-announce(a)qos.ch</post> + <archive> + http://www.qos.ch/pipermail/logback-announce/ + </archive> + </mailingList> + <mailingList> + <name>LOGBack User List</name> + <subscribe> + http://qos.ch/mailman/listinfo/logback-user + </subscribe> + <unsubscribe> + http://qos.ch/mailman/options/logback-user + </unsubscribe> + <post>logback-user(a)qos.ch</post> + <archive>http://www.qos.ch/pipermail/logback-user/</archive> + </mailingList> + <mailingList> + <name>LOGBack Dev List</name> + <subscribe> + http://qos.ch/mailman/listinfo/logback-dev + </subscribe> + <unsubscribe> + http://qos.ch/mailman/options/logback-dev + </unsubscribe> + <post>logback-dev(a)qos.ch</post> + <archive>http://www.qos.ch/pipermail/logback-dev/</archive> + </mailingList> + </mailingLists> + +  +  + <developers> + + <developer> + <name>Ceki Gulcu</name> + <email>ceki(a)qos.ch</email> + <organization>QOS.ch</organization> + <organizationUrl>http://www.qos.ch</organizationUrl> + </developer> + + <developer> + <name>Sebastien Pennec</name> + <email>sebastien(a)qos.ch</email> + <organization>QOS.ch</organization> + <organizationUrl>http://www.qos.ch</organizationUrl> + </developer> + + </developers> + +  + + <scm> + <connection> + scm:svn:http://svn.qos.ch/viewcvs/logback/core/trunk/ + </connection> + <developerConnection> + scm:svn:https://svn.qos.ch/repos/logback/core/trunk/ + </developerConnection> + <url>http://svn.qos.ch/viewcvs/logback/core/trunk/</url> + </scm> + + + </project> \ No newline at end of file

1 0

svn commit: r67 - logback/core/trunk/src/main/assembly
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 17:58:35 2006 New Revision: 67 Added: logback/core/trunk/src/main/assembly/ logback/core/trunk/src/main/assembly/jar-with-dependencies.xml logback/core/trunk/src/main/assembly/simple-zip.xml logback/core/trunk/src/main/assembly/source.xml Log: assembly directory Added: logback/core/trunk/src/main/assembly/jar-with-dependencies.xml ============================================================================== --- (empty file) +++ logback/core/trunk/src/main/assembly/jar-with-dependencies.xml Thu Jul 13 17:58:35 2006 @@ -0,0 +1,20 @@ +<assembly> + <id>jar-with-dependencies</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>target/classes</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <unpack>true</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> +</assembly> \ No newline at end of file Added: logback/core/trunk/src/main/assembly/simple-zip.xml ============================================================================== --- (empty file) +++ logback/core/trunk/src/main/assembly/simple-zip.xml Thu Jul 13 17:58:35 2006 @@ -0,0 +1,16 @@ +<assembly> + <id>SimpleZip</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: logback/core/trunk/src/main/assembly/source.xml ============================================================================== --- (empty file) +++ logback/core/trunk/src/main/assembly/source.xml Thu Jul 13 17:58:35 2006 @@ -0,0 +1,26 @@ +<assembly> + <id>src</id> + <formats> + <format>zip</format> + <format>tar.gz</format> + </formats> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src</directory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <unpack>false</unpack> + <scope>test</scope> + </dependencySet> + </dependencySets> +</assembly> \ No newline at end of file

1 0

svn commit: r66 - logback/core/trunk/src/test/witness/rolling
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 17:00:59 2006 New Revision: 66 Added: logback/core/trunk/src/test/witness/rolling/sbr-test2.0 logback/core/trunk/src/test/witness/rolling/sbr-test2.1 logback/core/trunk/src/test/witness/rolling/sbr-test2.l logback/core/trunk/src/test/witness/rolling/sbr-test3.0.gz (contents, props changed) logback/core/trunk/src/test/witness/rolling/sbr-test3.1.gz (contents, props changed) logback/core/trunk/src/test/witness/rolling/sbr-test3.l Log: added witness files for SizeBasedRollingTest Added: logback/core/trunk/src/test/witness/rolling/sbr-test2.0 ============================================================================== --- (empty file) +++ logback/core/trunk/src/test/witness/rolling/sbr-test2.0 Thu Jul 13 17:00:59 2006 @@ -0,0 +1,15 @@ +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy Added: logback/core/trunk/src/test/witness/rolling/sbr-test2.1 ============================================================================== --- (empty file) +++ logback/core/trunk/src/test/witness/rolling/sbr-test2.1 Thu Jul 13 17:00:59 2006 @@ -0,0 +1,15 @@ +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy Added: logback/core/trunk/src/test/witness/rolling/sbr-test2.l ============================================================================== --- (empty file) +++ logback/core/trunk/src/test/witness/rolling/sbr-test2.l Thu Jul 13 17:00:59 2006 @@ -0,0 +1,15 @@ +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy +dummy Added: logback/core/trunk/src/test/witness/rolling/sbr-test3.0.gz ============================================================================== Binary file. No diff available. Added: logback/core/trunk/src/test/witness/rolling/sbr-test3.1.gz ============================================================================== Binary file. No diff available. Added: logback/core/trunk/src/test/witness/rolling/sbr-test3.l ============================================================================== --- (empty file) +++ logback/core/trunk/src/test/witness/rolling/sbr-test3.l Thu Jul 13 17:00:59 2006 @@ -0,0 +1,5 @@ +dummy +dummy +dummy +dummy +dummy

1 0

svn commit: r65 - logback/core/trunk/src/test/java/ch/qos/logback/core/rolling
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 17:00:28 2006 New Revision: 65 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Log: modified sbr-testx.log paths to sbr-testx.l because of svn ignore config about .log files Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Thu Jul 13 17:00:28 2006 @@ -124,7 +124,7 @@ if (!isWindows()) { assertTrue(Compare.compare("src/test/output/sizeBased-test2.log", - "src/test/witness/rolling/sbr-test2.log")); + "src/test/witness/rolling/sbr-test2.l")); assertTrue(Compare.compare("src/test/output/sizeBased-test2.0", "src/test/witness/rolling/sbr-test2.0")); assertTrue(Compare.compare("src/test/output/sizeBased-test2.1", @@ -171,7 +171,7 @@ if (!isWindows()) { assertTrue(Compare.compare("src/test/output/sbr-test3.log", - "src/test/witness/rolling/sbr-test3.log")); + "src/test/witness/rolling/sbr-test3.l")); assertTrue(Compare.gzCompare("src/test/output/sbr-test3.0.gz", "src/test/witness/rolling/sbr-test3.0.gz")); assertTrue(Compare.gzCompare("src/test/output/sbr-test3.1.gz",

1 0

svn commit: r64 - logback/core/trunk/src/test/java/ch/qos/logback/core/rolling
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 16:35:55 2006 New Revision: 64 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Log: using new paths to access files + deleting old .log files in setUp() Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Thu Jul 13 16:35:55 2006 @@ -10,6 +10,7 @@ package ch.qos.logback.core.rolling; +import java.io.File; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -17,10 +18,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import ch.qos.logback.core.layout.EchoLayout; -import ch.qos.logback.core.rolling.RollingFileAppender; -import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; import ch.qos.logback.core.util.Compare; @@ -56,6 +54,22 @@ } public void setUp() { + //Delete .log files + { + File target = new File("src/test/output/test4.log"); + target.mkdirs(); + target.delete(); + } + { + File target = new File("src/test/output/test5.log"); + target.mkdirs(); + target.delete(); + } + { + File target = new File("src/test/output/test6.log"); + target.mkdirs(); + target.delete(); + } } public void tearDown() { @@ -69,10 +83,8 @@ RollingFileAppender rfa = new RollingFileAppender(); rfa.setLayout(layout); - - TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); - tbrp.setFileNamePattern("output/test1-%d{" + DATE_PATTERN + "}"); + tbrp.setFileNamePattern("src/test/output/test1-%d{" + DATE_PATTERN + "}"); tbrp.start(); rfa.setRollingPolicy(tbrp); rfa.start(); @@ -84,7 +96,7 @@ Calendar cal = Calendar.getInstance(); for (int i = 0; i < 4; i++) { - filenames[i] = "output/test1-" + sdf.format(cal.getTime()); + filenames[i] = "src/test/output/test1-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } @@ -102,7 +114,7 @@ } for (int i = 0; i < 4; i++) { - assertTrue(Compare.compare(filenames[i], "witness/rolling/tbr-test1." + i)); + assertTrue(Compare.compare(filenames[i], "src/test/witness/rolling/tbr-test1." + i)); } } @@ -114,7 +126,7 @@ rfa1.setLayout(layout); TimeBasedRollingPolicy tbrp1 = new TimeBasedRollingPolicy(); - tbrp1.setFileNamePattern("output/test2-%d{" + DATE_PATTERN + "}"); + tbrp1.setFileNamePattern("src/test/output/test2-%d{" + DATE_PATTERN + "}"); tbrp1.start(); rfa1.setRollingPolicy(tbrp1); rfa1.start(); @@ -126,7 +138,7 @@ Calendar cal = Calendar.getInstance(); for (int i = 0; i < 4; i++) { - filenames[i] = "output/test2-" + sdf.format(cal.getTime()); + filenames[i] = "src/test/output/test2-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } @@ -146,7 +158,7 @@ rfa2.setLayout(layout); TimeBasedRollingPolicy tbrp2 = new TimeBasedRollingPolicy(); - tbrp2.setFileNamePattern("output/test2-%d{" + DATE_PATTERN + "}"); + tbrp2.setFileNamePattern("src/test/output/test2-%d{" + DATE_PATTERN + "}"); tbrp2.start(); rfa2.setRollingPolicy(tbrp2); rfa2.start(); @@ -158,7 +170,7 @@ } for (int i = 0; i < 4; i++) { - assertTrue(Compare.compare(filenames[i], "witness/rolling/tbr-test2." + i)); + assertTrue(Compare.compare(filenames[i], "src/test/witness/rolling/tbr-test2." + i)); } } @@ -171,7 +183,7 @@ TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); - tbrp.setFileNamePattern("output/test3-%d{" + DATE_PATTERN + "}.gz"); + tbrp.setFileNamePattern("src/test/output/test3-%d{" + DATE_PATTERN + "}.gz"); tbrp.start(); rfa.setRollingPolicy(tbrp); rfa.start(); @@ -183,11 +195,11 @@ Calendar cal = Calendar.getInstance(); for (int i = 0; i < 3; i++) { - filenames[i] = "output/test3-" + sdf.format(cal.getTime()) + ".gz"; + filenames[i] = "src/test/output/test3-" + sdf.format(cal.getTime()) + ".gz"; cal.add(Calendar.SECOND, 1); } - filenames[3] = "output/test3-" + sdf.format(cal.getTime()); + filenames[3] = "src/test/output/test3-" + sdf.format(cal.getTime()); System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); @@ -203,10 +215,10 @@ } for (int i = 0; i < 3; i++) { - assertTrue(Compare.gzCompare(filenames[i], "witness/rolling/tbr-test3." + i + ".gz")); + assertTrue(Compare.gzCompare(filenames[i], "src/test/witness/rolling/tbr-test3." + i + ".gz")); } - assertTrue(Compare.compare(filenames[3], "witness/rolling/tbr-test3.3")); + assertTrue(Compare.compare(filenames[3], "src/test/witness/rolling/tbr-test3.3")); } /** @@ -215,10 +227,10 @@ public void test4() throws Exception { RollingFileAppender rfa1 = new RollingFileAppender(); rfa1.setLayout(layout); - + TimeBasedRollingPolicy tbrp1 = new TimeBasedRollingPolicy(); - tbrp1.setActiveFileName("output/test4.log"); - tbrp1.setFileNamePattern("output/test4-%d{" + DATE_PATTERN + "}"); + tbrp1.setActiveFileName("src/test/output/test4.log"); + tbrp1.setFileNamePattern("src/test/output/test4-%d{" + DATE_PATTERN + "}"); tbrp1.start(); rfa1.setRollingPolicy(tbrp1); rfa1.start(); @@ -230,10 +242,10 @@ Calendar cal = Calendar.getInstance(); for (int i = 0; i < 3; i++) { - filenames[i] = "output/test4-" + sdf.format(cal.getTime()); + filenames[i] = "src/test/output/test4-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } - filenames[3] = "output/test4.log"; + filenames[3] = "src/test/output/test4.log"; System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); @@ -250,8 +262,8 @@ rfa2.setLayout(layout); TimeBasedRollingPolicy tbrp2 = new TimeBasedRollingPolicy(); - tbrp2.setFileNamePattern("output/test4-%d{" + DATE_PATTERN + "}"); - tbrp2.setActiveFileName("output/test4.log"); + tbrp2.setFileNamePattern("src/test/output/test4-%d{" + DATE_PATTERN + "}"); + tbrp2.setActiveFileName("src/test/output/test4.log"); tbrp2.start(); rfa2.setRollingPolicy(tbrp2); rfa2.start(); @@ -262,7 +274,7 @@ } for (int i = 0; i < 4; i++) { - assertTrue(Compare.compare(filenames[i], "witness/rolling/tbr-test4." + i)); + assertTrue(Compare.compare(filenames[i], "src/test/witness/rolling/tbr-test4." + i)); } } @@ -274,8 +286,8 @@ rfa.setLayout(layout); TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); - tbrp.setFileNamePattern("output/test5-%d{" + DATE_PATTERN + "}"); - tbrp.setActiveFileName("output/test5.log"); + tbrp.setFileNamePattern("src/test/output/test5-%d{" + DATE_PATTERN + "}"); + tbrp.setActiveFileName("src/test/output/test5.log"); tbrp.start(); rfa.setRollingPolicy(tbrp); rfa.start(); @@ -286,11 +298,11 @@ Calendar cal = Calendar.getInstance(); for (int i = 0; i < 3; i++) { - filenames[i] = "output/test5-" + sdf.format(cal.getTime()); + filenames[i] = "src/test/output/test5-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } - filenames[3] = "output/test5.log"; + filenames[3] = "src/test/output/test5.log"; System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); @@ -302,7 +314,7 @@ } for (int i = 0; i < 4; i++) { - assertTrue(Compare.compare(filenames[i], "witness/rolling/tbr-test5." + i)); + assertTrue(Compare.compare(filenames[i], "src/test/witness/rolling/tbr-test5." + i)); } } @@ -314,8 +326,8 @@ rfa.setLayout(layout); TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); - tbrp.setFileNamePattern("output/test6-%d{" + DATE_PATTERN + "}.gz"); - tbrp.setActiveFileName("output/test6.log"); + tbrp.setFileNamePattern("src/test/output/test6-%d{" + DATE_PATTERN + "}.gz"); + tbrp.setActiveFileName("src/test/output/test6.log"); tbrp.start(); rfa.setRollingPolicy(tbrp); rfa.start(); @@ -326,11 +338,11 @@ Calendar cal = Calendar.getInstance(); for (int i = 0; i < 3; i++) { - filenames[i] = "output/test6-" + sdf.format(cal.getTime()) + ".gz"; + filenames[i] = "src/test/output/test6-" + sdf.format(cal.getTime()) + ".gz"; cal.add(Calendar.SECOND, 1); } - filenames[3] = "output/test6.log"; + filenames[3] = "src/test/output/test6.log"; System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); @@ -346,10 +358,10 @@ } for (int i = 0; i < 3; i++) { - assertTrue(Compare.gzCompare(filenames[i], "witness/rolling/tbr-test6." + i + ".gz")); + assertTrue(Compare.gzCompare(filenames[i], "src/test/witness/rolling/tbr-test6." + i + ".gz")); } - assertTrue(Compare.compare(filenames[3], "witness/rolling/tbr-test6.3")); + assertTrue(Compare.compare(filenames[3], "src/test/witness/rolling/tbr-test6.3")); } // public void testWithJoran1() throws Exception {

1 0

svn commit: r63 - logback/core/trunk/src/test/java/ch/qos/logback/core/rolling
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 16:35:16 2006 New Revision: 63 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Log: using new paths to access files + deleting old .log in setUp() Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Thu Jul 13 16:35:16 2006 @@ -21,12 +21,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import ch.qos.logback.core.Layout; import ch.qos.logback.core.layout.DummyLayout; -import ch.qos.logback.core.rolling.FixedWindowRollingPolicy; -import ch.qos.logback.core.rolling.RollingFileAppender; -import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy; import ch.qos.logback.core.util.Compare; @@ -42,8 +38,18 @@ public SizeBasedRollingTest(String name) { super(name); } - + public void setUp() { + { + File target = new File("src/test/output/sizeBased-test2.log"); + target.mkdirs(); + target.delete(); + } + { + File target = new File("src/test/output/sbr-test3.log"); + target.mkdirs(); + target.delete(); + } } public void tearDown() { @@ -64,7 +70,7 @@ SizeBasedTriggeringPolicy sbtp = new SizeBasedTriggeringPolicy(); sbtp.setMaxFileSize(100); sbtp.start(); - fwrp.setFileNamePattern("output/sizeBased-test1.%i"); + fwrp.setFileNamePattern("src/test/output/sizeBased-test1.%i"); try { fwrp.start(); fail("The absence of activeFileName option should have caused an exception."); @@ -77,6 +83,7 @@ * Test basic rolling functionality. */ public void test2() throws Exception { + DummyLayout layout = new DummyLayout(); RollingFileAppender rfa = new RollingFileAppender(); rfa.setName("ROLLING"); @@ -87,39 +94,41 @@ sbtp.setMaxFileSize(100); swrp.setMinIndex(0); - swrp.setActiveFileName("output/sizeBased-test2.log"); + swrp.setActiveFileName("src/test/output/sizeBased-test2.log"); - swrp.setFileNamePattern("output/sizeBased-test2.%i"); + swrp.setFileNamePattern("src/test/output/sizeBased-test2.%i"); swrp.start(); rfa.setRollingPolicy(swrp); rfa.setTriggeringPolicy(sbtp); rfa.start(); - + // Write exactly 10 bytes with each log for (int i = 0; i < 25; i++) { Thread.sleep(100); if (i < 10) { + rfa.doAppend("Hello---" + i); //logger.debug("Hello---" + i); } else if (i < 100) { + rfa.doAppend("Hello---" + i); //logger.debug("Hello--" + i); } } - assertTrue(new File("output/sizeBased-test2.log").exists()); - assertTrue(new File("output/sizeBased-test2.0").exists()); - assertTrue(new File("output/sizeBased-test2.1").exists()); + assertTrue(new File("src/test/output/sizeBased-test2.log").exists()); + assertTrue(new File("src/test/output/sizeBased-test2.0").exists()); + assertTrue(new File("src/test/output/sizeBased-test2.1").exists()); // The File.length() method is not accurate under Windows if (!isWindows()) { - assertTrue(Compare.compare("output/sizeBased-test2.log", - "witness/rolling/sbr-test2.log")); - assertTrue(Compare.compare("output/sizeBased-test2.0", - "witness/rolling/sbr-test2.0")); - assertTrue(Compare.compare("output/sizeBased-test2.1", - "witness/rolling/sbr-test2.1")); + assertTrue(Compare.compare("src/test/output/sizeBased-test2.log", + "src/test/witness/rolling/sbr-test2.log")); + assertTrue(Compare.compare("src/test/output/sizeBased-test2.0", + "src/test/witness/rolling/sbr-test2.0")); + assertTrue(Compare.compare("src/test/output/sizeBased-test2.1", + "src/test/witness/rolling/sbr-test2.1")); } } @@ -136,8 +145,8 @@ sbtp.setMaxFileSize(100); fwrp.setMinIndex(0); - fwrp.setActiveFileName("output/sbr-test3.log"); - fwrp.setFileNamePattern("output/sbr-test3.%i.gz"); + fwrp.setActiveFileName("src/test/output/sbr-test3.log"); + fwrp.setFileNamePattern("src/test/output/sbr-test3.%i.gz"); fwrp.start(); rfa.setRollingPolicy(fwrp); rfa.setTriggeringPolicy(sbtp); @@ -147,24 +156,26 @@ for (int i = 0; i < 25; i++) { Thread.sleep(100); if (i < 10) { + rfa.doAppend("Hello---" + i); //logger.debug("Hello---" + i); } else if (i < 100) { + rfa.doAppend("Hello---" + i); //logger.debug("Hello--" + i); } } - assertTrue(new File("output/sbr-test3.log").exists()); - assertTrue(new File("output/sbr-test3.0.gz").exists()); - assertTrue(new File("output/sbr-test3.1.gz").exists()); + assertTrue(new File("src/test/output/sbr-test3.log").exists()); + assertTrue(new File("src/test/output/sbr-test3.0.gz").exists()); + assertTrue(new File("src/test/output/sbr-test3.1.gz").exists()); if (!isWindows()) { - assertTrue(Compare.compare("output/sbr-test3.log", - "witness/rolling/sbr-test3.log")); - assertTrue(Compare.gzCompare("output/sbr-test3.0.gz", - "witness/rolling/sbr-test3.0.gz")); - assertTrue(Compare.gzCompare("output/sbr-test3.1.gz", - "witness/rolling/sbr-test3.1.gz")); + assertTrue(Compare.compare("src/test/output/sbr-test3.log", + "src/test/witness/rolling/sbr-test3.log")); + assertTrue(Compare.gzCompare("src/test/output/sbr-test3.0.gz", + "src/test/witness/rolling/sbr-test3.0.gz")); + assertTrue(Compare.gzCompare("src/test/output/sbr-test3.1.gz", + "src/test/witness/rolling/sbr-test3.1.gz")); } }

1 0

svn commit: r62 - logback/core/trunk/src/test/java/ch/qos/logback/core/rolling
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 16:34:32 2006 New Revision: 62 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java Log: using new paths to access files + deleting old .log in setUp() Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java Thu Jul 13 16:34:32 2006 @@ -10,17 +10,15 @@ package ch.qos.logback.core.rolling; +import java.io.File; import java.text.SimpleDateFormat; import java.util.Calendar; import junit.framework.TestCase; - import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.Layout; import ch.qos.logback.core.layout.EchoLayout; -import ch.qos.logback.core.rolling.RollingFileAppender; -import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; import ch.qos.logback.core.util.Compare; import ch.qos.logback.core.util.StatusPrinter; @@ -45,6 +43,10 @@ protected void setUp() throws Exception { super.setUp(); layout = new EchoLayout(); + + File target = new File("src/test/output/test.log"); + target.mkdirs(); + target.delete(); } protected void tearDown() throws Exception { @@ -64,8 +66,8 @@ String[] filenames = new String[2]; TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); - tbrp.setFileNamePattern("output/test-%d{" + datePattern + "}"); - tbrp.setActiveFileName("output/test.log"); + tbrp.setFileNamePattern("src/test/output/test-%d{" + datePattern + "}"); + tbrp.setActiveFileName("src/test/output/test.log"); tbrp.setContext(context); tbrp.start(); @@ -79,12 +81,12 @@ Thread.sleep(5000); rfa.doAppend("Hello 1"); - filenames[0] = "output/test-" + sdf.format(cal.getTime()); - filenames[1] = "output/test.log"; + filenames[0] = "src/test/output/test-" + sdf.format(cal.getTime()); + filenames[1] = "src/test/output/test.log"; for (int i = 0; i < filenames.length; i++) { System.out.println("before i="+i); - assertTrue(Compare.compare(filenames[i], "witness/rolling/renaming." + i)); + assertTrue(Compare.compare(filenames[i], "src/test/witness/rolling/renaming." + i)); System.out.println("post i="+i); } }

1 0

svn commit: r61 - logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/helper
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 16:33:53 2006 New Revision: 61 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java Log: using new paths to access files + added some copying/cleaning in setUp() Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java Thu Jul 13 16:33:53 2006 @@ -9,12 +9,20 @@ */ package ch.qos.logback.core.rolling.helper; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - -import ch.qos.logback.core.rolling.helper.Compress; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.util.Compare; +import ch.qos.logback.core.util.StatusPrinter; /** @@ -22,32 +30,70 @@ */ public class CompressTest extends TestCase { - Compress compress = new Compress(); - + Compress compress; + Context context = new ContextBase(); + public CompressTest(String arg0) { super(arg0); + compress = new Compress(); + compress.setContext(context); } - public void setUp() { + public void setUp() throws IOException { + //Copy source files + //Delete output files + { + File source = new File("src/test/input/compress1.copy"); + File dest = new File("src/test/input/compress1.txt"); + copy(source, dest); + File target = new File("src/test/output/compress1.txt.gz"); + target.mkdirs(); + target.delete(); + } + { + File source = new File("src/test/input/compress2.copy"); + File dest = new File("src/test/input/compress2.txt"); + copy(source, dest); + File target = new File("src/test/output/compress2.txt.gz"); + target.mkdirs(); + target.delete(); + } + { + File source = new File("src/test/input/compress3.copy"); + File dest = new File("src/test/input/compress3.txt"); + copy(source, dest); + File target = new File("src/test/output/compress3.txt.zip"); + target.mkdirs(); + target.delete(); + } } public void tearDown() { } public void test1() throws Exception { - compress.GZCompress("input/compress1.txt", "output/compress1.txt.gz"); - assertTrue(Compare.gzCompare("output/compress1.txt.gz", - "witness/compress1.txt.gz")); + compress.GZCompress("src/test/input/compress1.txt", "src/test/output/compress1.txt.gz"); + + StatusPrinter.print(context.getStatusManager()); + assertEquals(0, context.getStatusManager().getCount()); + assertTrue(Compare.gzCompare("src/test/output/compress1.txt.gz", + "src/test/witness/compress1.txt.gz")); } public void test2() throws Exception { - compress.GZCompress("input/compress2.txt", "output/compress2.txt"); - assertTrue(Compare.gzCompare("output/compress2.txt.gz", - "witness/compress2.txt.gz")); + compress.GZCompress("src/test/input/compress2.txt", "src/test/output/compress2.txt"); + + StatusPrinter.print(context.getStatusManager()); + assertEquals(0, context.getStatusManager().getCount()); + assertTrue(Compare.gzCompare("src/test/output/compress2.txt.gz", + "src/test/witness/compress2.txt.gz")); } public void test3() throws Exception { - compress.ZIPCompress("input/compress3.txt", "output/compress3.txt"); + compress.ZIPCompress("src/test/input/compress3.txt", "src/test/output/compress3.txt"); + + StatusPrinter.print(context.getStatusManager()); + assertEquals(0, context.getStatusManager().getCount()); // assertTrue(Compare.compare("output/compress3.txt.zip", // "witness/compress3.txt.zip")); } @@ -59,4 +105,18 @@ suite.addTest(new CompressTest("test3")); return suite; } + + private void copy(File src, File dst) throws IOException { + InputStream in = new FileInputStream(src); + OutputStream out = new FileOutputStream(dst); + byte[] buf = new byte[1024]; + int len; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + in.close(); + out.close(); + } + + }

1 0

svn commit: r60 - logback/core/trunk/src/test/java/ch/qos/logback/core/joran
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 16:32:46 2006 New Revision: 60 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java Log: using new paths to access files Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java Thu Jul 13 16:32:46 2006 @@ -15,7 +15,6 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.action.BadBeginAction; import ch.qos.logback.core.joran.action.BadEndAction; @@ -72,9 +71,9 @@ Interpreter jp = new Interpreter(rs); ExecutionContext ec = jp.getExecutionContext(); ec.setContext(new ContextBase()); - + SAXParser saxParser = createParser(); - saxParser.parse("file:input/joran/exception1.xml", jp); + saxParser.parse("file:src/test/input/joran/exception1.xml", jp); String str = (String) ec.getObjectMap().get("hello"); assertEquals("Hello John Doe.", str); @@ -100,7 +99,8 @@ ExecutionContext ec = jp.getExecutionContext(); SAXParser saxParser = createParser(); - saxParser.parse("file:input/joran/badEnd1.xml", jp); + saxParser.parse("file:src/test/input/joran/badEnd1.xml", jp); + String str = (String) ec.getObjectMap().get("hello"); assertNull(str); Integer i = (Integer) ec.getObjectMap().get(TouchAction.KEY); @@ -119,8 +119,8 @@ ExecutionContext ec = jp.getExecutionContext(); SAXParser saxParser = createParser(); - saxParser.parse("file:input/joran/badEnd2.xml", jp); - + saxParser.parse("file:src/test/input/joran/badEnd2.xml", jp); + String str = (String) ec.getObjectMap().get("hello"); assertEquals("Hello John Doe.", str); Integer i = (Integer) ec.getObjectMap().get(TouchAction.KEY);

1 0

svn commit: r59 - logback/core/trunk/src/main/java/ch/qos/logback/core/status
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 15:38:11 2006 New Revision: 59 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusManager.java Log: added getCount() method Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusManager.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusManager.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusManager.java Thu Jul 13 15:38:11 2006 @@ -16,4 +16,9 @@ public void add(Status status); public Iterator iterator(); public int getLevel(); + /** + * Return the number of entries. + * @return + */ + public int getCount(); }

1 0