moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

added commons-logging to integration test to make profiling easier - just match the timestamps of the log with the timestamps of the profiling monitor

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1744001 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2016-05-16 09:49:17 +00:00
parent dde2a25283
commit 12425ac107
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.xml
View File

@ -90,6 +90,9 @@ under the License.
</condition>
<!-- Fix for strange woodstox references in gump build -->
<property name="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
<!-- need to override POILogger property before commons logging works -->
<property name="org.apache.commons.logging.Log" value="org.apache.commons.logging.impl.Log4JLogger"/>
<!-- Main: -->
<property name="main.resource1.dir" value="src/resources/main"/>
@ -282,6 +285,7 @@ under the License.
<propertyref name="user.language"/>
<propertyref name="user.country"/>
<propertyref name="javax.xml.stream.XMLInputFactory"/>
<propertyref name="org.apache.commons.logging.Log"/>
</propertyset>
<path id="main.classpath">
@ -341,6 +345,7 @@ under the License.
</path>
<path id="test.integration.classpath">
<pathelement location="${integration.src.test}"/>
<path refid="scratchpad.classpath"/>
<path refid="ooxml.classpath"/>
<pathelement location="${main.output.test.dir}"/>
@ -1453,6 +1458,8 @@ under the License.
<target name="test-integration" depends="compile-integration,-test-integration-check,jacocotask"
unless="integration.test.notRequired" xmlns:jacoco="antlib:org.jacoco.ant">
<propertyreset name="org.apache.poi.util.POILogger" value="org.apache.poi.util.CommonsLogger"/>
<delete dir="build" includes="test-integration.log*"/>
<jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-integration.exec">
<junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
failureproperty="integration.test.failed" showoutput="true">

1
src/integrationtest/commons-logging.properties Normal file
View File

@ -0,0 +1 @@
log4j.configuration=log4j.properties

25
src/integrationtest/log4j.properties Normal file
View File

@ -0,0 +1,25 @@
log4j.rootLogger=info, R
log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=build/test-integration.log
log4j.appender.R.MaxFileSize=1000KB
# Keep one backup file
log4j.appender.R.MaxBackupIndex=5
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
log4j.logger.org.apache.poi.poifs.nio.FileBackedDataSource=ERROR
log4j.logger.org.apache.poi.hdgf.chunks.Chunk=FATAL
log4j.logger.org.apache.poi.hpsf.CodePageString=ERROR
log4j.logger.org.apache.poi.hdgf.chunks.ChunkFactory=ERROR
log4j.logger.org.apache.poi.hslf.model.textproperties.BitMaskTextProp=ERROR
log4j.logger.org.apache.poi.util.JvmBugs=ERROR
log4j.logger.org.apache.poi.hslf.usermodel.HSLFTextParagraph=ERROR
log4j.logger.org.apache.poi.openxml4j.opc.ZipPackage=ERROR
log4j.logger.org.apache.poi.POIDocument=WARN
log4j.logger.org.apache.poi.openxml4j.opc.OPCPackage=ERROR
log4j.logger.org.apache.poi.xssf.usermodel.XSSFWorkbook=ERROR
log4j.logger.org.apache.poi.hslf.usermodel.HSLFGroupShape=WARN
log4j.logger.org.apache.poi.hslf.record.Record=ERROR