[tests] move some test code around

src/base/CMakeLists.txt

@@ -42,7 +42,10 @@ target_include_directories(
 target_link_libraries(base cppfmt PkgConfig::libpcre)
 
 add_executable(test_base
+
+        humanize.file_size.tests.cc
         humanize.time.tests.cc
+        string_util.tests.cc
         test_base.cc)
 target_link_libraries(test_base base)
 add_test(NAME test_base COMMAND test_base)

src/base/Makefile.am

@@ -51,7 +51,9 @@ check_PROGRAMS = \
     test_base
 
 test_base_SOURCES = \
+    humanize.file_size.tests.cc \
     humanize.time.tests.cc \
+    string_util.tests.cc \
     test_base.cc
 
 test_base_LDADD = \

src/base/humanize.file_size.tests.cc

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2021, Timothy Stack
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of Timothy Stack nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include <iostream>
+
+#include "doctest.hh"
+
+#include "base/humanize.hh"
+
+TEST_CASE("humanize::file_size") {
+    CHECK(humanize::file_size(0) == "0.0 B");
+    CHECK(humanize::file_size(1) == "1.0 B");
+    CHECK(humanize::file_size(1024) == "1.0KB");
+    CHECK(humanize::file_size(1500) == "1.5KB");
+    CHECK(humanize::file_size(55LL * 784LL * 1024LL * 1024LL) == "42.1GB");
+    CHECK(humanize::file_size(-1LL) == "Unknown");
+    CHECK(humanize::file_size(std::numeric_limits<int64_t>::max()) == "8.0EB");
+}

src/base/string_util.tests.cc

@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2021, Timothy Stack
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of Timothy Stack nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include <iostream>
+
+#include "doctest.hh"
+
+#include "base/string_util.hh"
+
+TEST_CASE ("truncate_to")
+{
+    const std::string orig = "0123456789abcdefghijklmnopqrstuvwxyz";
+    std::string str;
+
+    truncate_to(str, 10);
+    CHECK(str == "");
+    str = "abc";
+    truncate_to(str, 10);
+    CHECK(str == "abc");
+    str = orig;
+    truncate_to(str, 10);
+    CHECK(str == "01234\u22efwxyz");
+    str = orig;
+    truncate_to(str, 1);
+    CHECK(str == "\u22ef");
+    str = orig;
+    truncate_to(str, 2);
+    CHECK(str == "\u22ef");
+    str = orig;
+    truncate_to(str, 3);
+    CHECK(str == "0\u22efz");
+    str = orig;
+    truncate_to(str, 4);
+    CHECK(str == "01\u22efz");
+    str = orig;
+    truncate_to(str, 5);
+    CHECK(str == "01\u22efyz");
+}

test/lnav_doctests.cc

@@ -37,7 +37,6 @@
 #include "relative_time.hh"
 #include "unique_path.hh"
 #include "logfile.hh"
-#include "base/humanize.hh"
 #include "log_format.hh"
 
 using namespace std;
@@ -87,16 +86,6 @@ TEST_CASE("duration2str") {
     CHECK(val == "-10s000");
 }
 
-TEST_CASE("humanize::file_size") {
-        CHECK(humanize::file_size(0) == "0.0 B");
-        CHECK(humanize::file_size(1) == "1.0 B");
-        CHECK(humanize::file_size(1024) == "1.0KB");
-        CHECK(humanize::file_size(1500) == "1.5KB");
-        CHECK(humanize::file_size(55LL * 784LL * 1024LL * 1024LL) == "42.1GB");
-        CHECK(humanize::file_size(-1LL) == "Unknown");
-        CHECK(humanize::file_size(std::numeric_limits<int64_t>::max()) == "8.0EB");
-}
-
 TEST_CASE("byte_array") {
     using my_array_t = byte_array<8>;
 
@@ -120,35 +109,6 @@ TEST_CASE("byte_array") {
     CHECK(ba2.to_string() == "6162636431323334");
 }
 
-TEST_CASE("truncate_to") {
-    const std::string orig = "0123456789abcdefghijklmnopqrstuvwxyz";
-    std::string str;
-
-    truncate_to(str, 10);
-    CHECK(str == "");
-    str = "abc";
-    truncate_to(str, 10);
-    CHECK(str == "abc");
-    str = orig;
-    truncate_to(str, 10);
-    CHECK(str == "01234\u22efwxyz");
-    str = orig;
-    truncate_to(str, 1);
-    CHECK(str == "\u22ef");
-    str = orig;
-    truncate_to(str, 2);
-    CHECK(str == "\u22ef");
-    str = orig;
-    truncate_to(str, 3);
-    CHECK(str == "0\u22efz");
-    str = orig;
-    truncate_to(str, 4);
-    CHECK(str == "01\u22efz");
-    str = orig;
-    truncate_to(str, 5);
-    CHECK(str == "01\u22efyz");
-}
-
 TEST_CASE("ptime_fmt") {
     const char *date_str = "2018-05-16 18:16:42";
     struct exttm tm;