fix #60: minfilesize and ignoreempty in combination

Author: Paul Dreik

Options.cc

@@ -1,5 +1,6 @@
 #include "config.h" //header file from autoconf, must come first to make large file support work properly
 
+#include <algorithm>
 #include <iostream>
 #include <limits>
 
@@ -106,7 +107,8 @@ parseOptions(Parser& parser)
       o.resultsfile = parser.get_parsed_string();
     } else if (parser.try_parse_bool("-ignoreempty")) {
       if (parser.get_parsed_bool()) {
-        o.minimumfilesize = 1;
+        o.minimumfilesize =
+          std::max(Fileinfo::filesizetype{ 1 }, o.minimumfilesize);
       } else {
         o.minimumfilesize = 0;
       }

inofficial_cmake/CMakeLists.txt

@@ -96,9 +96,9 @@ foreach(testscript ${testscripts})
 endforeach()
 
 if(Catch2_FOUND)
-  set(unittests test_checksum)
+  set(unittests test_checksum test_options)
   foreach(unittest ${unittests})
-    add_executable(${unittest} ../unittests/test_checksum.cc)
+    add_executable(${unittest} ../unittests/${unittest}.cc)
     target_compile_features(${unittest} PRIVATE cxx_std_20)
     target_link_libraries(${unittest} PRIVATE rdfindimpl Catch2::Catch2WithMain)
   endforeach()

unittests/test_options.cc

@@ -0,0 +1,89 @@
+#include <catch2/catch_test_macros.hpp>
+
+#include "CmdlineParser.hh"
+#include "Options.hh"
+
+TEST_CASE("minimum filesize is 1 by default")
+{
+  Options defaults;
+  REQUIRE(defaults.minimumfilesize == 1);
+}
+
+TEST_CASE("-ignoreempty false")
+{
+  const int argc = 3;
+  const char* argv[argc] = { "progname", "-ignoreempty", "false" };
+  Parser parser(argc, argv);
+
+  Options o = parseOptions(parser);
+  REQUIRE(o.minimumfilesize == 0);
+}
+
+TEST_CASE("-ignoreempty true")
+{
+  const int argc = 3;
+  const char* argv[argc] = { "progname", "-ignoreempty", "true" };
+  Parser parser(argc, argv);
+
+  Options o = parseOptions(parser);
+  REQUIRE(o.minimumfilesize == 1);
+}
+
+TEST_CASE("-minsize 1234")
+{
+  const int argc = 3;
+  const char* argv[argc] = { "progname", "-minsize", "1234" };
+  Parser parser(argc, argv);
+
+  Options o = parseOptions(parser);
+  REQUIRE(o.minimumfilesize == 1234);
+}
+
+// https://github.com/pauldreik/rdfind/issues/60
+TEST_CASE("-minsize 100000000 -ignoreempty true")
+{
+  const int argc = 5;
+  const char* argv[argc] = {
+    "progname", "-minsize", "100000000", "-ignoreempty", "true"
+  };
+  Parser parser(argc, argv);
+
+  Options o = parseOptions(parser);
+  REQUIRE(o.minimumfilesize == 100000000);
+}
+
+TEST_CASE("-ignoreempty true -minsize 100000000")
+{
+  const int argc = 5;
+  const char* argv[argc] = {
+    "progname", "-ignoreempty", "true", "-minsize", "100000000"
+  };
+  Parser parser(argc, argv);
+
+  Options o = parseOptions(parser);
+  REQUIRE(o.minimumfilesize == 100000000);
+}
+
+TEST_CASE("-ignoreempty false -minsize 1234")
+{
+  const int argc = 5;
+  const char* argv[argc] = {
+    "progname", "-ignoreempty", "false", "-minsize", "1234"
+  };
+  Parser parser(argc, argv);
+
+  Options o = parseOptions(parser);
+  REQUIRE(o.minimumfilesize == 1234);
+}
+
+TEST_CASE("-minsize 1234 -ignoreempty false")
+{
+  const int argc = 5;
+  const char* argv[argc] = {
+    "progname", "-minsize", "1234", "-ignoreempty", "false"
+  };
+  Parser parser(argc, argv);
+
+  Options o = parseOptions(parser);
+  REQUIRE(o.minimumfilesize == 0);
+}