allow testeval to use a non-flag filename argument and cleaned up tests

Author: sbromberger

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 CMakeFiles/
+Testing/
 **/build/
 .cache/
 CMakeCache.txt

cpp/CMakeLists.txt

@@ -62,6 +62,15 @@ if(JSONLOGIC_ENABLE_BENCH)
 endif()
 if(JSONLOGIC_ENABLE_TESTS)
     message(STATUS "Building tests: ${JSONLOGIC_ENABLE_TESTS}")
-    enable_testing()
+    include(CTest)
+    
+    # Enable parallel testing by default
+    include(ProcessorCount)
+    ProcessorCount(N)
+    if(NOT N EQUAL 0)
+        set(CTEST_BUILD_FLAGS -j${N})
+        set(ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
+    endif()
+    
     add_subdirectory(tests)
 endif()

cpp/tests/CMakeLists.txt

@@ -2,48 +2,28 @@ add_executable(testeval src/testeval.cpp)
 target_link_libraries(testeval PRIVATE jsonlogic Boost::json Boost::lexical_cast Boost::range)
 target_include_directories(testeval PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include)
 
-# Create a fixture setup test that builds testeval if needed
-add_test(NAME "build_testeval" 
-         COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target testeval)
-set_tests_properties("build_testeval" PROPERTIES
-    LABELS "setup"
-    FIXTURES_SETUP testeval_fixture)
-
 # Get all JSON test files
 file(GLOB_RECURSE JSON_TEST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/json/*.json")
 
 # Add individual tests for each JSON file (normal mode)
 foreach(json_file ${JSON_TEST_FILES})
     get_filename_component(test_name ${json_file} NAME_WE)
     add_test(NAME "jsonlogic_${test_name}"
-             COMMAND bash -c "cat '${json_file}' | $<TARGET_FILE:testeval>"
+             COMMAND testeval "${json_file}"
              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
     set_tests_properties("jsonlogic_${test_name}" PROPERTIES
         LABELS "jsonlogic;normal"
         TIMEOUT 5
-        FIXTURES_REQUIRED testeval_fixture)
+    )
 endforeach()
 
 # Add individual tests for each JSON file (strict mode)
 foreach(json_file ${JSON_TEST_FILES})
     get_filename_component(test_name ${json_file} NAME_WE)
     add_test(NAME "jsonlogic_${test_name}_strict"
-             COMMAND bash -c "cat '${json_file}' | $<TARGET_FILE:testeval> -s"
+             COMMAND testeval -s "${json_file}"
              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
     set_tests_properties("jsonlogic_${test_name}_strict" PROPERTIES
         LABELS "jsonlogic;strict"
-        TIMEOUT 5
-        FIXTURES_REQUIRED testeval_fixture)
+        TIMEOUT 5)
 endforeach()
-
-# Custom target to run tests with clean summary (excludes setup test)
-add_custom_target(test_clean
-    COMMAND ${CMAKE_CTEST_COMMAND} --exclude-regex "^_setup_"
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    COMMENT "Running tests with clean summary (excluding setup tests)")
-
-# Custom target to run only jsonlogic tests  
-add_custom_target(test_jsonlogic
-    COMMAND ${CMAKE_CTEST_COMMAND} -L jsonlogic --exclude-regex "^_setup_"
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    COMMENT "Running only jsonlogic tests")

cpp/tests/src/testeval.cpp

@@ -2,11 +2,12 @@
 #include <boost/json/src.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/range/adaptor/transformed.hpp>
+#include <cstdint>
 #include <fstream>
 #include <iostream>
-#include <sstream>
-
 #include <jsonlogic/logic.hpp>
+#include <sstream>
+#include <vector>
 
 enum class ResultStatus : std::uint8_t {
   NoError = 0,  // no error
@@ -105,9 +106,11 @@ bool matchOpt0(const std::vector<std::string> &args, N &pos,
 }
 
 template <class N, class Fn>
-bool noSwitch0(const std::vector<std::string> &args, N &pos, Fn /*fn*/) {
-  //~ if (fn(args[pos]))
-  //~ return true;
+bool noSwitch0(const std::vector<std::string> &args, N &pos, Fn fn) {
+  if (fn(args[pos])) {
+    ++pos;
+    return true;
+  }
 
   std::cerr << "unrecognized argument: " << args[pos] << std::endl;
   ++pos;
@@ -254,7 +257,10 @@ int main(int argc, const char **argv) {
     exit(1);
   }
 
-  bjsn::value all = parseStream(std::cin);
+  bjsn::value all = config.filename.empty() ? parseStream(std::cin)
+                                            : parseFile(config.filename);
+
+  // parseStream(config.filename.empty() ? std::cin : config.filename);
   bjsn::object &allobj = all.as_object();
 
   bjsn::value rule = allobj["rule"];