Improve coverage

Author: noclone

application/testing/tests.custom.cmake

@@ -12,6 +12,14 @@ set_tests_properties(f3d::TestInvalidCLIArgs PROPERTIES PASS_REGULAR_EXPRESSION
 add_test(NAME f3d::TestNoCliInvalidPlugin COMMAND $<TARGET_FILE:f3d> --load-plugins=invalid --no-render)
 set_tests_properties(f3d::TestNoCliInvalidPlugin PROPERTIES PASS_REGULAR_EXPRESSION "Cannot open the library")
 
+# Test that a file group whose file lives in the statefile directory is stored as a relative path.
+# The file is copied into a temporary directory next to the statefile so the relative branch is taken.
+add_test(NAME f3d::TestStatefileRelativeAugmentSetup
+  COMMAND ${CMAKE_COMMAND} -E copy ${F3D_SOURCE_DIR}/testing/data/cow.vtp ${CMAKE_BINARY_DIR}/Testing/Temporary/statefile_relative/cow.vtp)
+set_tests_properties(f3d::TestStatefileRelativeAugmentSetup PROPERTIES FIXTURES_SETUP statefile_relative)
+add_test(NAME f3d::TestStatefileRelativeAugment COMMAND $<TARGET_FILE:f3d> --no-render --no-config ${CMAKE_BINARY_DIR}/Testing/Temporary/statefile_relative/cow.vtp --save-statefile=${CMAKE_BINARY_DIR}/Testing/Temporary/statefile_relative/state.json --verbose)
+set_tests_properties(f3d::TestStatefileRelativeAugment PROPERTIES FIXTURES_REQUIRED statefile_relative PASS_REGULAR_EXPRESSION "Statefile saved to")
+
 # Test that f3d resolution can be controlled from config file
 add_test(NAME f3d::TestConfigResolution COMMAND $<TARGET_FILE:f3d> --config=${F3D_SOURCE_DIR}/testing/configs/resolution.json ${F3D_SOURCE_DIR}/testing/data/suzanne.stl --output=${CMAKE_BINARY_DIR}/Testing/Temporary/TestConfigResolution.png --reference=${F3D_SOURCE_DIR}/testing/baselines/TestConfigResolution.png)
 

application/testing/tests.features.cmake

@@ -502,6 +502,8 @@ f3d_test(NAME TestStatefileLoadKnown DATA cow.vtp NO_RENDER NO_BASELINE ARGS --l
 f3d_test(NAME TestStatefileLoadOverride DATA cow.vtp NO_RENDER NO_BASELINE ARGS --load-statefile=${F3D_SOURCE_DIR}/testing/statefiles/test_statefile.json -D render.background.color=1,0,0 REGEXP "'render.background.color' = '1,0,0' from CLI options")
 # A missing statefile is skipped with a warning instead of failing
 f3d_test(NAME TestStatefileLoadMissing DATA cow.vtp NO_RENDER NO_BASELINE ARGS --load-statefile=${CMAKE_BINARY_DIR}/Testing/Temporary/does_not_exist.json REGEXP "Could not open statefile, skipping")
+# A file that exists but is not a valid statefile is reported and skipped
+f3d_test(NAME TestStatefileLoadInvalidContent DATA cow.vtp NO_RENDER NO_BASELINE ARGS --load-statefile=${F3D_SOURCE_DIR}/testing/data/cow.vtp REGEXP "Could not parse statefile content")
 # `-` writes the statefile to the standard output
 f3d_test(NAME TestStatefileSaveStdout DATA cow.vtp NO_RENDER NO_BASELINE ARGS --save-statefile=- REGEXP "\"options\"")
 # Missing parent directories of the statefile path are created
@@ -528,6 +530,10 @@ f3d_test(NAME TestCommandScriptLoadStatefileOverridesTweak SCRIPT DATA cow.vtp W
 f3d_test(NAME TestCommandScriptLoadStatefileMissing SCRIPT DATA cow.vtp WORKING_DIR ${F3D_SOURCE_DIR}/testing ARGS --verbose REGEXP "Could not open statefile, skipping" NO_BASELINE)
 # load_statefile with an out of range file group index falls back to the first group
 f3d_test(NAME TestCommandScriptLoadStatefileInvalidGroup SCRIPT DATA cow.vtp WORKING_DIR ${F3D_SOURCE_DIR}/testing ARGS --verbose REGEXP "cow.vtp" NO_BASELINE)
+# save_statefile and load_statefile with no argument and an empty --statefile-filename warn and no-op
+f3d_test(NAME TestCommandScriptStatefileEmptyFilename SCRIPT DATA cow.vtp ARGS --statefile-filename= --verbose REGEXP "No statefile location provided" NO_BASELINE)
+# save_statefile to a path that cannot be written (a directory) reports the error
+f3d_test(NAME TestCommandScriptSaveStatefileError SCRIPT DATA cow.vtp WORKING_DIR ${F3D_SOURCE_DIR}/testing ARGS --verbose REGEXP "Could not save statefile" NO_BASELINE)
 
 # The clipboard round-trip needs a real onscreen window for the X11 selection to work, it fails with
 # the offscreen backends (egl, osmesa), so only run it where an onscreen window is available, ie on

library/testing/TestSDKStatefile.cxx

@@ -104,9 +104,27 @@ int TestSDKStatefile([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
   test(
     "no option statefile leaves no added file", noOptEng.getScene().getAddedFiles().empty(), true);
 
+  // Options that do not exist or cannot be parsed are skipped with a warning, not a failure
+  f3d::engine optEng = f3d::engine::createNone();
+  optEng.loadStatefileFromString("{ \"options\": { \"not.a.real.option\": \"1\" } }");
+  optEng.loadStatefileFromString("{ \"options\": { \"render.line_width\": \"not_a_number\" } }");
+  test("invalid options are skipped", optEng.getScene().getAddedFiles().empty(), true);
+
+  // Restoring a camera into an engine without a window is skipped with a log, not a failure
+  f3d::engine noWinEng = f3d::engine::createNone();
+  noWinEng.loadStatefileFromString(
+    "{ \"camera\": { \"position\": [0.0, 0.0, 1.0], "
+    "\"focal_point\": [0.0, 0.0, 0.0], \"view_up\": [0.0, 1.0, 0.0], "
+    "\"view_angle\": 30.0 } }");
+  test("camera without window is skipped", noWinEng.getScene().getAddedFiles().empty(), true);
+
   // Failure modes
+  const fs::path invalidStatefilePath = tmpDir / "invalid_statefile.json";
+  std::ofstream(invalidStatefilePath) << "{ not valid json";
   test.expect<f3d::engine::statefile_exception>(
     "load a non existent statefile", [&]() { dst.loadStatefile(tmpDir / "no_such_file.json"); });
+  test.expect<f3d::engine::statefile_exception>(
+    "load an invalid statefile file", [&]() { dst.loadStatefile(invalidStatefilePath); });
   test.expect<f3d::engine::statefile_exception>(
     "load invalid statefile content", [&]() { dst.loadStatefileFromString("{ not valid json"); });
 

testing/scripts/TestCommandScriptSaveStatefileError.txt

@@ -0,0 +1,2 @@
+save_statefile data
+save_statefile data/cow.vtp/sub/state.json

testing/scripts/TestCommandScriptStatefileEmptyFilename.txt

@@ -0,0 +1,2 @@
+save_statefile
+load_statefile