Merge pull request #17315 from mwganson/ssclearall

[Spreadsheet] avoid removing user dynamic properties when clearing ce…

tests/src/Mod/CMakeLists.txt

@@ -25,3 +25,6 @@ endif(BUILD_POINTS)
 if(BUILD_SKETCHER)
     add_subdirectory(Sketcher)
 endif(BUILD_SKETCHER)
+if(BUILD_SPREADSHEET)
+    add_subdirectory(Spreadsheet)
+endif()

tests/src/Mod/Spreadsheet/App/CMakeLists.txt

@@ -0,0 +1,11 @@
+target_sources(
+    Spreadsheet_tests_run
+        PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}/PropertySheet.cpp
+)
+
+target_include_directories(
+    Spreadsheet_tests_run
+        PUBLIC
+            ${CMAKE_BINARY_DIR}
+)

tests/src/Mod/Spreadsheet/App/PropertySheet.cpp

@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include <gtest/gtest.h>
+#include "src/App/InitApplication.h"
+
+#include <memory>
+
+#include <Mod/Spreadsheet/App/Sheet.h>
+#include <Mod/Spreadsheet/App/PropertySheet.h>
+
+class PropertySheetTest: public ::testing::Test
+{
+protected:
+    static void SetUpTestSuite()
+    {
+        tests::initApplication();
+    }
+    void SetUp() override
+    {
+        _sheet = std::make_unique<Spreadsheet::Sheet>();
+        _propertySheet = std::make_unique<Spreadsheet::PropertySheet>(_sheet.get());
+    }
+    void TearDown() override
+    {
+        _sheet.reset();
+        _propertySheet.reset();
+    }
+
+    /// Get a non-owning pointer to the internal PropertySheet for this test
+    Spreadsheet::PropertySheet* propertySheet()
+    {
+        return _propertySheet.get();
+    }
+
+private:
+    std::unique_ptr<Spreadsheet::Sheet> _sheet;
+    std::unique_ptr<Spreadsheet::PropertySheet> _propertySheet;
+};
+
+TEST_F(PropertySheetTest, isValidCellAddressNameValidNames)  // NOLINT
+{
+    std::vector<std::string> validAddressNames {"A1", "Z1024", "AA42", "ZZ4096"};
+    for (const auto& name : validAddressNames) {
+        EXPECT_TRUE(propertySheet()->isValidCellAddressName(name))
+            << "\"" << name << "\" was not accepted as a cell name, and should be";
+    }
+}
+
+TEST_F(PropertySheetTest, isValidCellAddressNameInvalidNames)  // NOLINT
+{
+    std::vector<std::string> invalidAddressNames {
+        "Bork",
+        "Bork_de_bork",
+        "A",
+        "42",
+        "AAA1",     // Too many characters to start, AAA is not a valid column
+        "ZZ123456"  // Too large a number to end, 123456 is not a valid row
+    };
+    for (const auto& name : invalidAddressNames) {
+        EXPECT_FALSE(propertySheet()->isValidCellAddressName(name))
+            << "\"" << name << "\" was accepted as a cell name, and should not be";
+    }
+}
+
+TEST_F(PropertySheetTest, validAliases)  // NOLINT
+{
+    std::vector<std::string> validAliases {"Bork",
+                                           "Bork_de_bork"
+                                           "A",
+                                           "AA123456"};
+    for (const auto& name : validAliases) {
+        EXPECT_TRUE(propertySheet()->isValidAlias(name))
+            << "\"" << name << "\" was not accepted as an alias name, and should be";
+    }
+}
+
+TEST_F(PropertySheetTest, invalidAliases)  // NOLINT
+{
+    std::vector<std::string> invalidAliases {"A1", "ZZ1234", "mm"};
+    for (const auto& name : invalidAliases) {
+        EXPECT_FALSE(propertySheet()->isValidAlias(name))
+            << "\"" << name << "\" was accepted as an alias name, and should not be";
+    }
+}

tests/src/Mod/Spreadsheet/CMakeLists.txt

@@ -0,0 +1,17 @@
+
+target_include_directories(Spreadsheet_tests_run PUBLIC
+    ${EIGEN3_INCLUDE_DIR}
+    ${OCC_INCLUDE_DIR}
+    ${Python3_INCLUDE_DIRS}
+    ${SMESH_INCLUDE_DIR}
+    ${VTK_INCLUDE_DIRS}
+    ${XercesC_INCLUDE_DIRS}
+)
+
+target_link_libraries(Spreadsheet_tests_run
+    gtest_main
+    ${Google_Tests_LIBS}
+    Spreadsheet
+)
+
+add_subdirectory(App)