Merging upstream version 0.12.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 24 insertions, 0 deletions

diff --git a/src/base/attr_line.tests.cc b/src/base/attr_line.tests.cc
index 53b338e..8e23480 100644
--- a/src/base/attr_line.tests.cc
+++ b/src/base/attr_line.tests.cc
@@ -36,6 +36,15 @@
 
 using namespace lnav::roles::literals;
 
+TEST_CASE("line_range")
+{
+    line_range lr1{0, 95};
+    line_range lr2{0, -1};
+
+    CHECK(lr2 < lr1);
+    CHECK(!(lr1 < lr2));
+}
+
 TEST_CASE("attr_line_t::basic-wrapping")
 {
     text_wrap_settings tws = {3, 21};
@@ -89,3 +98,18 @@ TEST_CASE("attr_line_t::unicode-wrap")
           "   be wrapped and\n"
           "   indented");
 }
+
+TEST_CASE("attr_line_t::pre-wrap")
+{
+    auto pre_al = attr_line_t(" Hello, World! ")
+                      .with_attr_for_all(SA_PREFORMATTED.value());
+    auto al = attr_line_t("This is a pre-formatted inline -- ")
+                  .append(pre_al)
+                  .append(" -- that should be wrapped");
+
+    text_wrap_settings tws = {0, 36};
+
+    auto body = attr_line_t().append(al, &tws);
+
+    printf("body\n%s\n", body.get_string().c_str());
+}