Enabled assertions in junit tasks (analagous to JVM arg -ea)

- Disabled a layout test that fails an assertion
- Added an expression to a mocked class to pass assertion

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

diff --git a/build.xml b/build.xml
index 9790aceacc7977ec150aad93ba641c12ce56809c..e8d5223095875a4a0c70a2c12ab52f48170b036d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -787,6 +787,9 @@ list of possible build targets.
         <classpath>
           <path refid="@{classpath}"/>
         </classpath>
+       <assertions>
+         <enable/>
+       </assertions>
         <test name="@{testsuite}" todir="${junit.reports.dir}" outfile="@{outfile}"/>
       </junit>
     </sequential>
@@ -801,6 +804,9 @@ list of possible build targets.
       <classpath>
         <path refid="standard-junit-classpath"/>
       </classpath>
+      <assertions>
+        <enable/>
+      </assertions>
       <batchtest todir="${junit.reports.dir}">
         <fileset dir="${build.unit.tests.dir}" includes="**/*TestCase.class"/>
       </batchtest>

diff --git a/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java b/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
index 29810c4720ae9ccf98935761c170765237e43134..d8d00536e37566eee504204c6c601798d76b39ba 100644 (file)
--- a/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
+++ b/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
@@ -158,6 +158,7 @@ implements Constants {
         when(pList.get(anyInt())).thenReturn(maximumRepeats);
 
         PageSequenceMaster parent = mock(PageSequenceMaster.class);
+        when(parent.getName()).thenReturn("fo:page-sequence-master");
 
         RepeatablePageMasterAlternatives sut = new RepeatablePageMasterAlternatives(parent);
 

diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml
index cd63ad03f5d29b568401aae384d51b94ef7759e4..a14ae6bea7160f3d1140d150c7baee9271e8e8c2 100644 (file)
--- a/test/layoutengine/disabled-testcases.xml
+++ b/test/layoutengine/disabled-testcases.xml
@@ -209,4 +209,9 @@
     <description>The block should cause overflow in the
     last column on the page, rather than be broken.</description>
   </testcase>
+  <testcase>
+    <name>Block Container Reference Orientation Bug</name>
+    <file>block-container_reference-orientation_bug36391.xml</file>
+    <description>An assert is failing</description>
+  </testcase>
 </disabled-testcases>