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 ca...@apache.org on 2007/05/15 06:44:54 UTC
svn commit: r538056 - in /logging/log4j/branches/v1_2-branch: pom.xml
tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java
Author: carnold
Date: Mon May 14 21:44:53 2007
New Revision: 538056
URL: http://svn.apache.org/viewvc?view=rev&rev=538056
Log:
Bug 37930: Maven now runs most unit tests
Modified:
logging/log4j/branches/v1_2-branch/pom.xml
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java
Modified: logging/log4j/branches/v1_2-branch/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/pom.xml?view=diff&rev=538056&r1=538055&r2=538056
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Mon May 14 21:44:53 2007
@@ -92,7 +92,53 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<workingDirectory>tests</workingDirectory>
- <skip>true</skip>
+ <reportFormat>plain</reportFormat>
+ <forkMode>pertest</forkMode>
+ <includes>
+ <include>org/apache/log4j/LevelTest.java</include>
+ <include>org/apache/log4j/PriorityTest.java</include>
+ <include>org/apache/log4j/CategoryTest.java</include>
+ <include>org/apache/log4j/FileAppenderTest.java</include>
+ <include>org/apache/log4j/LogManagerTest.java</include>
+ <include>org/apache/log4j/helpers.LogLogTest.java</include>
+ <include>org/apache/log4j/LayoutTest.java</include>
+ <include>org/apache/log4j/helpers.DateLayoutTest.java</include>
+ <include>org/apache/log4j/TTCCLayoutTest.java</include>
+ <include>org/apache/log4j/xml.XMLLayoutTest.java</include>
+ <include>org/apache/log4j/HTMLLayoutTest.java</include>
+ <include>org/apache/log4j/PatternLayoutTest.java</include>
+ <include>org/apache/log4j/spi.LoggingEventTest.java</include>
+ <include>org/apache/log4j/spi.ThrowableInformationTest.java</include>
+ <include>org/apache/log4j/spi.LocationInfoTest.java</include>
+ <include>org/apache/log4j/PropertyConfiguratorTest.java</include>
+ <include>org/apache/log4j/MinimumTestCase.java</include>
+ <include>org/apache/log4j/LoggerTestCase.java</include>
+ <include>org/apache/log4j/PatternLayoutTestCase.java</include>
+ <include>org/apache/log4j/HierarchyThresholdTestCase.java</include>
+ <include>org/apache/log4j/xml/DOMTestCase.java</include>
+ <include>org/apache/log4j/xml/CustomLevelTestCase.java</include>
+ <include>org/apache/log4j/customLogger/XLoggerTestCase.java</include>
+ <!-- DefaultInit -->
+ <!-- SocketServer -->
+ <include>org/apache/log4j/xml/XMLLayoutTestCase.java</include>
+ <include>org/apache/log4j/xml/AsyncAppenderTestCase.java</include>
+ <include>org/apache/log4j/varia/LevelMatchFilterTestCase.java</include>
+
+ <!-- ErrorHandlerTestCase is not run in Ant build either
+ <include>org/apache/log4j/varia/ErrorHandlerTestCase.java</include>
+ -->
+ <include>org/apache/log4j/helpers/OptionConverterTestCase.java</include>
+ <include>org/apache/log4j/helpers/BoundedFIFOTestCase.java</include>
+ <include>org/apache/log4j/helpers/CyclicBufferTestCase.java</include>
+ <include>org/apache/log4j/helpers/PatternParserTestCase.java</include>
+ <include>org/apache/log4j/or/ORTestCase.java</include>
+ <include>org/apache/log4j/DRFATestCase.java</include>
+ <include>org/apache/log4j/RFATestCase.java</include>
+ <include>org/apache/log4j/varia/ERFATestCase.java</include>
+ <include>org/apache/log4j/net/SyslogAppenderTest</include>
+ <include>org/apache/log4j/nt/NTEventLogAppenderTest</include>
+ <include>org/apache/log4j/net/SocketAppenderTest</include>
+ </includes>
</configuration>
</plugin>
<plugin>
@@ -133,10 +179,40 @@
<goal>run</goal>
</goals>
</execution>
+ <!-- create tests/output prior to test run -->
+ <execution>
+ <phase>test-compile</phase>
+ <id>mkdir_tests_output</id>
+ <configuration>
+ <tasks>
+ <mkdir dir="tests/output"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>clean</phase>
+ <id>rmdir_tests_output</id>
+ <configuration>
+ <tasks>
+ <delete dir="tests/output"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
<testSourceDirectory>tests/src/java</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>tests/resources</directory>
+ </testResource>
+ </testResources>
</build>
<repositories>
<repository>
Modified: logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java?view=diff&rev=538056&r1=538055&r2=538056
==============================================================================
--- logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java (original)
+++ logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java Mon May 14 21:44:53 2007
@@ -42,6 +42,8 @@
return null;
} else if (in.indexOf("at junit.") >= 0 && in.indexOf("ui.TestRunner") >= 0) {
return null;
+ } else if (in.indexOf("org.apache.maven") >= 0) {
+ return null;
} else if (util.match("/\\sat /", in)) {
return "\t" + in.trim();
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org