Implement whitespace management extension using fo:multi-switch

Patch from 13/10/28 by Seifeddine Dridi, applied with some modifications.


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

1 files changed, 4 insertions, 40 deletions

diff --git a/test/java/org/apache/fop/KnuthAlgorithmTestCase.java b/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
index 1f11015d1..b5132fee9 100644
--- a/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
+++ b/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
@@ -19,13 +19,12 @@
 
 package org.apache.fop;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.List;
 
-import org.apache.fop.layoutmgr.Alternative;
-import org.apache.fop.layoutmgr.Alternative.FittingStrategy;
-import org.apache.fop.layoutmgr.BestFitPenalty;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
 import org.apache.fop.layoutmgr.BlockKnuthSequence;
 import org.apache.fop.layoutmgr.BreakingAlgorithm;
 import org.apache.fop.layoutmgr.ElementListObserver;
@@ -33,8 +32,6 @@ import org.apache.fop.layoutmgr.KnuthBox;
 import org.apache.fop.layoutmgr.KnuthGlue;
 import org.apache.fop.layoutmgr.KnuthPenalty;
 import org.apache.fop.layoutmgr.KnuthSequence;
-import org.junit.Before;
-import org.junit.Test;
 
 /**
  * Tests the Knuth algorithm implementation.
@@ -66,23 +63,6 @@ public class KnuthAlgorithmTestCase {
         return seq;
     }
 
-    private static KnuthSequence getKnuthSequence2() {
-        KnuthSequence seq = new BlockKnuthSequence();
-        FittingStrategy[] strategies = {FittingStrategy.FIRST_FIT,
-                FittingStrategy.SMALLEST_FIT,
-                FittingStrategy.BIGGEST_FIT};
-        for (int i = 0; i < 3; ++i) {
-            BestFitPenalty bestFitPenalty = new BestFitPenalty(strategies[i], null);
-            bestFitPenalty.addAlternative(new Alternative(null, 25000));
-            bestFitPenalty.addAlternative(new Alternative(null, 5000));
-            bestFitPenalty.addAlternative(new Alternative(null, 29000));
-            seq.add(new KnuthBox(0, null, false));
-            seq.add(bestFitPenalty);
-            seq.add(new KnuthPenalty(0, -KnuthPenalty.INFINITE, false, null, false));
-        }
-        return seq;
-    }
-
     /**
      * Tests a special condition where a negative-length glue occurs directly after a break
      * possibility.
@@ -99,22 +79,6 @@ public class KnuthAlgorithmTestCase {
         assertEquals(5000, parts[0].difference);
         assertEquals(5000, parts[1].difference);
     }
-    /**
-     * Testcase for BestFitPenalty
-     * @throws Exception if an error occurs
-     */
-    @Test
-    public void test2() throws Exception {
-        MyBreakingAlgorithm algo = new MyBreakingAlgorithm(0, 0, true, true, 0);
-        algo.setConstantLineWidth(30000);
-        KnuthSequence seq = getKnuthSequence2();
-        algo.findBreakingPoints(seq, 1, true, BreakingAlgorithm.ALL_BREAKS);
-        Part[] parts = algo.getParts();
-        assertEquals("Sequence must produce 3 parts", 3, parts.length);
-        assertEquals(5000, parts[0].difference);
-        assertEquals(25000, parts[1].difference);
-        assertEquals(1000, parts[2].difference);
-    }
 
     private class Part {
         private int difference;