build: OSX tests (#2505)

Author: trisyoungs

.github/workflows/build/osx/action.yml

@@ -181,18 +181,25 @@ runs:
       conan install . --deployer=direct_deploy --build=missing
       mkdir -p build && cd build
 
-
-      cmake -G Ninja -DGUI:bool=true -DMULTI_THREADING:bool=${{ inputs.threading }} -DCONAN_GSL="OFF" -DJava_JAVA_EXECUTABLE:path=${JAVA_RUNTIME} -DANTLR_EXECUTABLE:string=$ANTLR_EXE -DQT_BASE_DIR=$QT_BASE_DIR ../ -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ inputs.osxTargetDeploymentVersion }}
+      cmake -G Ninja -DGUI:bool=true -DMULTI_THREADING:bool=${{ inputs.threading }} -DCONAN_GSL="OFF" -DJava_JAVA_EXECUTABLE:path=${JAVA_RUNTIME} -DANTLR_EXECUTABLE:string=$ANTLR_EXE -DQT_BASE_DIR=$QT_BASE_DIR ../ -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ inputs.osxTargetDeploymentVersion }} -DBUILD_TESTS:bool=ON
       cmake --build . --config Release
 
       # Move conan-installed deps to the build dir
       mv ../direct_deploy ./
-      ls -R direct_deploy
 
       # Copy over gsl libs so we can ship them with the bundle. Our exe is only linked to two of the four libs present, and this breaks the binary if we don't include them all in the package.
       mkdir gsl
       cp -v $(brew --prefix gsl)/lib/*.dylib ./gsl
 
+  - name: Test
+    if: ${{ inputs.cacheOnly == 'false' }}
+    shell: bash
+    run: |
+      set -ex
+      cd build
+
+      ctest --output-on-failure
+
   - name: Upload Raw Build Artifacts
     if: ${{ inputs.cacheOnly == 'false' }}
     uses: actions/upload-artifact@v4

conanfile.py

@@ -9,9 +9,13 @@ class DissolveRecipe(ConanFile):
     generators = "CMakeToolchain", "CMakeDeps"
     options = {
         "msvc_dev": [True, False],
+        "tests": [True, False],
+        "benchmarks": [True, False],
     }
     default_options = {
         "msvc_dev": False,
+        "tests": True,
+        "benchmarks": False,
     }
     def configure(self):
         self.options["puxixml"].header_only = False
@@ -32,8 +36,9 @@ def requirements(self):
         self.requires("antlr4-cppruntime/4.13.1")
         self.requires("gsl/2.7.1")
 
-        if self.settings.os == "Linux" or (self.options.msvc_dev and self.settings.build_type == "Debug"):
+        if self.options.tests:
             self.requires("gtest/1.17.0")
+        if self.options.benchmarks:
             self.requires("benchmark/1.8.4")
 
     def build_requirements(self):

src/gui/models/CMakeLists.txt

@@ -22,7 +22,7 @@ set(models_MOC_HDRS
     generatorModel.h
     generatorNodeModel.h
     rangeVectorModel.h
-    renderableGroupManagerModel.h
+    # renderableGroupManagerModel.h
     simpleForcefieldModel.h
     sitesFilterProxy.h
     sitesModel.h
@@ -79,7 +79,7 @@ set(models_SRCS
     generatorModelMimeData.h
     generatorNodeModel.cpp
     rangeVectorModel.cpp
-    renderableGroupManagerModel.cpp
+    # renderableGroupManagerModel.cpp
     simpleForcefieldModel.cpp
     sitesFilterProxy.cpp
     sitesModel.cpp

src/gui/widgets/CMakeLists.txt

@@ -9,8 +9,8 @@ add_library(
   elementSelector.h
   exponentialSpin.cpp
   exponentialSpin.h
-  gradientBar.cpp
-  gradientBar.h
+  # gradientBar.cpp
+  # gradientBar.h
   integerSpin.cpp
   integerSpin.h
   noControls.cpp

tests/CMakeLists.txt

@@ -47,8 +47,8 @@ function(dissolve_add_test)
     target_include_directories(${TEST_NAME} PRIVATE ${Qt6Widgets_INCLUDE_DIRS})
     target_link_libraries(
       ${TEST_NAME}
-      PUBLIC models widgets render delegates
-      PRIVATE Qt6::Core Qt6::Widgets
+      PUBLIC models widgets delegates gui-qml
+      PRIVATE Qt6::Quick3D Qt6::Qml Qt6::Widgets
     )
   endif(DISSOLVE_UNIT_TEST_GUI)
 

tests/classes/box.cpp

@@ -64,10 +64,13 @@ void testBasicOperations(Box &box)
     // Determine central coordinate from full axes matrix
     auto centroid = box.axes() * Vector3(0.5, 0.5, 0.5);
 
-    // For each corner, determine correct coordinates from full axes matrix, then test optimised imaging / vector functions
+    // For each corner, determine correct coordinates from full axes matrix, then test optimised imaging / vector functions.
+    // If we sit perfectly on the corner vertex we risk numerical errors breaking the tests, so step inside by a small delta.
+    const auto delta = 1.0e-5;
     for (auto n = 0; n < 8; ++n)
     {
-        auto corner = box.axes() * Vector3((n & 1) ? 1.0 : 0.0, (n & 2) ? 1.0 : 0.0, (n & 4) ? 1.0 : 0.0);
+        auto corner =
+            box.axes() * Vector3((n & 1) ? 1.0 - delta : delta, (n & 2) ? 1.0 - delta : delta, (n & 4) ? 1.0 - delta : delta);
 
         // Calculate manual minimum image vector
         auto mimCorner = manualMim(box, corner, centroid);

tests/math/interpolator.cpp

@@ -99,12 +99,12 @@ TEST_F(InterpolatorTest, RegularBasic)
     // Form interpolation of data and check interpolation at known values
     Interpolator I(regularData_);
     for (auto &&[x, y] : zip(regularData_.xAxis(), regularData_.values()))
-        EXPECT_DOUBLE_EQ(y, I.y(x));
+        EXPECT_NEAR(y, I.y(x), 1.0e-10);
 
     auto x = 0.0;
     for (auto y : regularFineY_)
     {
-        EXPECT_DOUBLE_EQ(y, I.y(x));
+        EXPECT_NEAR(y, I.y(x), 1.0e-10);
         x += fineDeltaX;
     }
 }
@@ -127,8 +127,8 @@ TEST_F(InterpolatorTest, RegularSequentialTest)
     // Check against pre-calculated y values not present in the source data
     for (auto &&[x, y, interpy] : zip(fineBins.xAxis(), regularFineY_, fineBins.values()))
     {
-        EXPECT_DOUBLE_EQ(y, I.y(x));
-        EXPECT_DOUBLE_EQ(y, interpy);
+        EXPECT_NEAR(y, I.y(x), 1.0e-10);
+        EXPECT_NEAR(y, interpy, 1.0e-10);
     }
 }