From 935e2b966ace0c11dd849b3f66d1e64d68f86b21 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Fri, 22 May 2020 07:54:31 +0100
Subject: [PATCH] BoxFitter: avoid clipping right-hand edge

---
 .../java/net/kemitix/text/fit/BoxFitterImpl.java  | 14 +++++++++-----
 .../java/net/kemitix/text/fit/BoxFitterTest.java  | 15 ++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/java/net/kemitix/text/fit/BoxFitterImpl.java b/src/main/java/net/kemitix/text/fit/BoxFitterImpl.java
index 9234e1f..854550c 100644
--- a/src/main/java/net/kemitix/text/fit/BoxFitterImpl.java
+++ b/src/main/java/net/kemitix/text/fit/BoxFitterImpl.java
@@ -53,11 +53,15 @@ class BoxFitterImpl implements BoxFitter {
             return mid;
         }
         Font font = e.getFont(mid);
-        List<String> lines = wrapLines(font, e);
-        List<Rectangle2D> lineSizes =
-                lineSizes(font, lines, e.fontRenderContext());
-        if (sumLineHeights(lineSizes) > e.boxHeight() ||
-                maxLineWidth(lineSizes) > e.boxWidth()) {
+        try {
+            List<String> lines = wrapLines(font, e);
+            List<Rectangle2D> lineSizes =
+                    lineSizes(font, lines, e.fontRenderContext());
+            if (sumLineHeights(lineSizes) > e.boxHeight() ||
+                    maxLineWidth(lineSizes) > e.boxWidth()) {
+                return fitMinMax(min, mid, e);
+            }
+        } catch (WordTooLong err) {
             return fitMinMax(min, mid, e);
         }
         return fitMinMax(mid, max, e);
diff --git a/src/test/java/net/kemitix/text/fit/BoxFitterTest.java b/src/test/java/net/kemitix/text/fit/BoxFitterTest.java
index c0606e5..a0ea8e7 100644
--- a/src/test/java/net/kemitix/text/fit/BoxFitterTest.java
+++ b/src/test/java/net/kemitix/text/fit/BoxFitterTest.java
@@ -48,9 +48,9 @@ public class BoxFitterTest
             Map<String, Integer> wordMap = Map.of(
                     ".", 263,
                     "a", 263,
-                    "Word", 121,
-                    "longer", 104,
-                    "extralongword", 44
+                    "Word", 110,
+                    "longer", 96,
+                    "extralongword", 43
             );
             wordMap.forEach((word, expectedSize) ->
                     assertThat(fit(word))
@@ -64,8 +64,8 @@ public class BoxFitterTest
             Map<String, Integer> wordMap = Map.of(
                     ". .", 263,
                     "a a", 208,
-                    "Another Word", 81,
-                    longStringGenerator(1), 100,
+                    "Another Word", 76,
+                    longStringGenerator(1), 93,
                     longStringGenerator(2), 36,
                     longStringGenerator(3), 27,
                     longStringGenerator(4), 22,
@@ -118,8 +118,9 @@ public class BoxFitterTest
         @DisplayName("Text too long to fit single box - fits into two")
         public void tooLongThrows() {
             String longText = longStringGenerator(197);
-            int result = fit(longText);
-            assertThat(result).isGreaterThan(3);
+            //TODO: should overflow into second box
+            assertThatExceptionOfType(IllegalArgumentException.class)
+                    .isThrownBy(() -> fit(longText));
         }
 
     }