diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2005-08-02 15:38:43 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2005-08-02 15:38:43 +0000 |
| commit | 953bce4d360e67698e8980df16f6b8637abef520 (patch) | |
| tree | dd4e4df1fe95f24bc6ca103f85613d691d61221f | |
| parent | f2d63aeb05f86bb5d6eb088f9f8c91c552cf560a (diff) | |
| download | xmlgraphics-fop-953bce4d360e67698e8980df16f6b8637abef520.tar.gz xmlgraphics-fop-953bce4d360e67698e8980df16f6b8637abef520.zip | |
Allow "<0" and ">0" expressions for the "p" part on a penalty.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@227027 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | test/java/org/apache/fop/layoutengine/ElementListCheck.java | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/test/java/org/apache/fop/layoutengine/ElementListCheck.java b/test/java/org/apache/fop/layoutengine/ElementListCheck.java index 4c28a0dd9..3dba23ff0 100644 --- a/test/java/org/apache/fop/layoutengine/ElementListCheck.java +++ b/test/java/org/apache/fop/layoutengine/ElementListCheck.java @@ -104,22 +104,36 @@ public class ElementListCheck implements LayoutEngineCheck { } } if (domEl.getAttribute("p").length() > 0) { - int p; - if ("INF".equalsIgnoreCase(domEl.getAttribute("p"))) { - p = KnuthPenalty.INFINITE; - } else if ("INFINITE".equalsIgnoreCase(domEl.getAttribute("p"))) { - p = KnuthPenalty.INFINITE; - } else if ("-INF".equalsIgnoreCase(domEl.getAttribute("p"))) { - p = -KnuthPenalty.INFINITE; - } else if ("-INFINITE".equalsIgnoreCase(domEl.getAttribute("p"))) { - p = -KnuthPenalty.INFINITE; + if ("<0".equals(domEl.getAttribute("p"))) { + if (knuthEl.getP() >= 0) { + fail("Expected p<0" + + " at position " + pos + + " but got: " + knuthEl.getP()); + } + } else if (">0".equals(domEl.getAttribute("p"))) { + if (knuthEl.getP() <= 0) { + fail("Expected p>0" + + " at position " + pos + + " but got: " + knuthEl.getP()); + } } else { - p = Integer.parseInt(domEl.getAttribute("p")); - } - if (p != knuthEl.getP()) { - fail("Expected p=" + p - + " at position " + pos - + " but got: " + knuthEl.getP()); + int p; + if ("INF".equalsIgnoreCase(domEl.getAttribute("p"))) { + p = KnuthPenalty.INFINITE; + } else if ("INFINITE".equalsIgnoreCase(domEl.getAttribute("p"))) { + p = KnuthPenalty.INFINITE; + } else if ("-INF".equalsIgnoreCase(domEl.getAttribute("p"))) { + p = -KnuthPenalty.INFINITE; + } else if ("-INFINITE".equalsIgnoreCase(domEl.getAttribute("p"))) { + p = -KnuthPenalty.INFINITE; + } else { + p = Integer.parseInt(domEl.getAttribute("p")); + } + if (p != knuthEl.getP()) { + fail("Expected p=" + p + + " at position " + pos + + " but got: " + knuthEl.getP()); + } } } if ("true".equals(domEl.getAttribute("flagged"))) { |