FOP-2060: adjoining blocks with break-before="page" break-after="page" cause extra empty page

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

2 files changed, 99 insertions, 0 deletions

diff --git a/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_1.xml b/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_1.xml
new file mode 100644
index 000000000..5cd117b5a
--- /dev/null
+++ b/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_1.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks basic breaks.
+    </p>
+  </info>
+  <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="normal" page-width="3in" page-height="3in">
+      <fo:region-body margin="0.5in"/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="normal">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:block>
+        <fo:block break-after="page">
+          page 1
+          <fo:block break-before="page"/>
+        </fo:block>
+        <fo:block>page 2</fo:block>
+      </fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
+  </fo>
+  <checks>
+    <eval expected="page 1" xpath="//pageViewport[1]//lineArea"/>
+    <eval expected="page 2" xpath="//pageViewport[2]//lineArea"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_2.xml b/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_2.xml
new file mode 100644
index 000000000..ef63ba26e
--- /dev/null
+++ b/test/layoutengine/standard-testcases/no_jump_to_next_page_after_empty_area_2.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks basic breaks.
+    </p>
+  </info>
+  <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="normal" page-width="5in" page-height="3in">
+      <fo:region-body margin="0.5in"/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="normal" white-space-collapse="true">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:block>
+        <fo:block>page 1</fo:block>
+        <fo:block break-before="page" break-after="page">page 2</fo:block>
+        <fo:block break-before="page" break-after="page">page 3</fo:block>
+        <fo:block>page 4</fo:block>
+      </fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
+  </fo>
+  <checks>
+    <eval expected="page 1" xpath="//pageViewport[1]//lineArea"/>
+    <eval expected="page 2" xpath="//pageViewport[2]//lineArea"/>
+    <eval expected="page 3" xpath="//pageViewport[3]//lineArea"/>
+    <eval expected="page 4" xpath="//pageViewport[4]//lineArea"/>
+  </checks>
+</testcase>