Move one testcase with incorrect source location

remove some junit dependencies in example-code
build: do not pass junit-jar to normal compile targets to avoid introducing it as dependency again 
Reformat code, fix warnings, ...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1798202 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 27 insertions, 3 deletions

diff --git a/build.xml b/build.xml
index ee36f08f5c..9d09b55284 100644
--- a/build.xml
+++ b/build.xml
@@ -325,12 +325,15 @@ under the License.
     <path id="main.classpath">
         <pathelement location="${main.commons-logging.jar}"/>
         <pathelement location="${main.commons-codec.jar}"/>
-        <pathelement location="${main.log4j.jar}"/>
+        <pathelement location="${main.commons-collections4.jar}"/>
+    </path>
+
+    <!-- some libraries should only be required for compiling/running tests -->
+    <path id="test.jar.classpath">
         <pathelement location="${main.junit.jar}"/>
         <pathelement location="${main.jmh.jar}"/>
         <pathelement location="${main.jmhAnnotation.jar}"/>
         <pathelement location="${main.hamcrest.jar}"/>
-        <pathelement location="${main.commons-collections4.jar}"/>
     </path>
 
     <path id="scratchpad.classpath">
@@ -375,6 +378,7 @@ under the License.
 
     <path id="test.ooxml.classpath">
         <path refid="ooxml.classpath"/>
+        <path refid="test.jar.classpath"/>
         <pathelement location="${ooxml.output.dir}"/>
         <pathelement location="${ooxml.output.test.dir}"/>
         <pathelement location="${main.output.test.dir}"/>
@@ -385,6 +389,7 @@ under the License.
         <pathelement location="${integration.src.test}"/>
         <path refid="scratchpad.classpath"/>
         <path refid="ooxml.classpath"/>
+        <path refid="test.jar.classpath"/>
         <pathelement location="${main.output.test.dir}"/>
         <pathelement location="${ooxml.output.dir}"/>
         <pathelement location="${integration.output.test.dir}"/>
@@ -420,6 +425,7 @@ under the License.
 
     <path id="test.excelant.classpath">
         <path refid="ooxml.classpath"/>
+        <path refid="test.jar.classpath"/>
         <pathelement location="${ooxml.output.dir}"/>
         <pathelement location="${excelant.output.dir}"/>
         <pathelement location="${excelant.output.test.dir}"/>
@@ -857,6 +863,10 @@ under the License.
                    includeantruntime="false">
                    <!-- debug="${compile.debug}" -->
                 <classpath refid="ooxml.classpath"/>
+
+                <!-- unfortunately JUnit is required here for OOXMLLite, we should rather move OOXMLLite
+                to test or a separate folder to clean up dependencies -->
+                <classpath location="${main.junit.jar}"/>
             </javac>
 
             <jar basedir="${xmlbean.classes.dir}" destfile="@{classes-jar}" excludes="org/apache/**" level="9" />
@@ -918,6 +928,7 @@ under the License.
                includeantruntime="false">
             <classpath>
                 <path refid="main.classpath"/>
+                <path refid="test.jar.classpath"/>
                 <pathelement path="${main.output.dir}"/>
             </classpath>
         </javac>
@@ -981,6 +992,7 @@ under the License.
                includeantruntime="false">
             <classpath>
                 <path refid="scratchpad.classpath"/>
+                <path refid="test.jar.classpath"/>
                 <pathelement location="${scratchpad.output.dir}"/>
                 <pathelement location="${main.output.test.dir}"/>
             </classpath>
@@ -1024,6 +1036,10 @@ under the License.
             <classpath>
                 <path refid="ooxml.classpath"/>
                 <path refid="ooxml.xmlsec.classpath"/>
+
+                <!-- unfortunately JUnit is required here for OOXMLLite, we should rather move OOXMLLite
+                to test or a separate folder to clean up dependencies -->
+                <pathelement location="${main.junit.jar}"/>
             </classpath>
         </javac>
         <!-- compile the tests -->
@@ -1114,6 +1130,7 @@ under the License.
                includeantruntime="false">
             <classpath>
                 <path refid="excelant.classpath"/>
+                <path refid="test.jar.classpath"/>
                 <pathelement location="${excelant.output.dir}"/>
                 <pathelement path="${main.output.test.dir}"/>
             </classpath>
@@ -1135,6 +1152,7 @@ under the License.
             <classpath>
                 <path refid="scratchpad.classpath"/>
                 <path refid="ooxml.classpath"/>
+                <path refid="test.jar.classpath"/>
                 <pathelement location="${ooxml.output.dir}"/>
                 <pathelement location="${main.output.test.dir}"/>
                 <pathelement location="${examples.output.dir}"/>
@@ -1274,6 +1292,7 @@ under the License.
             <junit fork="yes" forkmode="once" printsummary="yes" haltonfailure="${halt.on.test.failure}"
                    failureproperty="main.test.failed" showoutput="true">
                 <classpath refid="test.classpath"/>
+                <classpath refid="test.jar.classpath"/>
                 <syspropertyset refid="junit.properties"/>
                 <jvmarg value="-ea"/>
                 <jvmarg value="-Xmx256m"/>
@@ -1391,6 +1410,7 @@ under the License.
             <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
                    failureproperty="scratchpad.test.failed">
                 <classpath refid="test.scratchpad.classpath"/>
+                <classpath refid="test.jar.classpath"/>
                 <syspropertyset refid="junit.properties"/>
                 <jvmarg value="-ea"/>
                 <!-- jvmarg value="-Duser.timezone=UTC"/ -->
@@ -1443,7 +1463,10 @@ under the License.
             <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="build/jacoco-@{type}.exec">
               <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
                      failureproperty="ooxml.test.failed">
-                  <classpath refid="@{classpath}"/>
+                  <classpath>
+                      <path refid="@{classpath}"/>
+                      <path refid="test.jar.classpath"/>
+                  </classpath>
                   <syspropertyset refid="junit.properties"/>
                     <jvmarg value="${maxpermsize}"/>
                     <jvmarg value="-Xmx768M"/>
@@ -1476,6 +1499,7 @@ under the License.
                      failureproperty="ooxml.xmlsec.test.failed">
                   <classpath>
                       <path refid="@{classpath}"/>
+                      <path refid="test.jar.classpath"/>
                       <path refid="ooxml.xmlsec.classpath"/>
                   </classpath>
                   <syspropertyset refid="junit.properties"/>