gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/0f355431 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fde90c4c (commit)
	from  https://github.com/Gnucash/gnucash/commit/d7c797a4 (commit)



commit 0f3554313b038eefba757e8e8595d0c8b94d6888
Merge: d7c797a46e fde90c4c99
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jun 6 14:53:20 2023 -0700

    Merge Richard Cohen's 'restore-test-gnc-option' into stable.


commit fde90c4c9950b8457a4c2a128212b2b9d9593b0f
Author: Richard Cohen <richard at daijobu.co.uk>
Date:   Sat Jun 3 14:46:42 2023 +0100

    Restore test-gnc-option
    
    - removed in merge 3e5fcc8709100c299998b9377fa6db13c1c27fb9
    
    To get it to compile
    
    - remove unused variables
    - remove duplicate operator==(GncGUID)

diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 0f5b639705..4608ecac31 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -200,6 +200,11 @@ gtest-qofevent.cpp)
 gnc_add_test(test-qofevent "${test_qofevent_SOURCES}"
   gtest_engine_INCLUDES gtest_old_engine_LIBS)
 
+set(test_gnc_option_SOURCES
+  gtest-gnc-option.cpp
+  gtest-gnc-optiondb.cpp)
+gnc_add_test(test-gnc-option "${test_gnc_option_SOURCES}"
+  gtest_engine_INCLUDES gtest_old_engine_LIBS)
 
 set(test_engine_SOURCES_DIST
         gtest-gnc-euro.cpp
diff --git a/libgnucash/engine/test/gtest-gnc-option.cpp b/libgnucash/engine/test/gtest-gnc-option.cpp
index 29d6fee316..1c7f67904f 100644
--- a/libgnucash/engine/test/gtest-gnc-option.cpp
+++ b/libgnucash/engine/test/gtest-gnc-option.cpp
@@ -536,7 +536,6 @@ protected:
             return account;
         };
         auto assets = create_account(m_root, ACCT_TYPE_ASSET, "Assets");
-        auto liabilities = create_account(m_root, ACCT_TYPE_LIABILITY, "Liabilities");
         auto expenses = create_account(m_root, ACCT_TYPE_EXPENSE, "Expenses");
         create_account(assets, ACCT_TYPE_BANK, "Bank");
         auto broker = create_account(assets, ACCT_TYPE_ASSET, "Broker");
@@ -569,12 +568,6 @@ protected:
     Account* m_root;
 };
 
-static bool
-operator==(const GncGUID& l, const GncGUID& r)
-{
-    return guid_equal(&l, &r);
-}
-
 TEST_F(GncOptionAccountTest, test_test_constructor_and_destructor)
 {
     EXPECT_TRUE(m_book != NULL);
@@ -777,9 +770,9 @@ TEST_F(GncMultichoiceOption, test_permissible_value_stuff)
             EXPECT_STREQ("waldo", m_option.permissible_value(1));
             EXPECT_STREQ("sausage", m_option.permissible_value_name(2));
         });
-    EXPECT_THROW({ auto result = m_option.permissible_value(7); },
+    EXPECT_THROW({ m_option.permissible_value(7); },
                  std::out_of_range);
-    EXPECT_THROW({ auto result = m_option.permissible_value_name(9); },
+    EXPECT_THROW({ m_option.permissible_value_name(9); },
         std::out_of_range);
     EXPECT_EQ(std::numeric_limits<uint16_t>::max(),
               m_option.permissible_value_index("xyzzy"));
diff --git a/libgnucash/engine/test/gtest-gnc-optiondb.cpp b/libgnucash/engine/test/gtest-gnc-optiondb.cpp
index 68070d5f76..1b92ed63c3 100644
--- a/libgnucash/engine/test/gtest-gnc-optiondb.cpp
+++ b/libgnucash/engine/test/gtest-gnc-optiondb.cpp
@@ -118,7 +118,6 @@ struct GncOptionDBAccountTest : public ::testing::Test
             return account;
         };
         auto assets = create_account(m_root, ACCT_TYPE_ASSET, "Assets");
-        auto liabilities = create_account(m_root, ACCT_TYPE_LIABILITY, "Liabilities");
         auto expenses = create_account(m_root, ACCT_TYPE_EXPENSE, "Expenses");
         create_account(assets, ACCT_TYPE_BANK, "Bank");
         auto broker = create_account(assets, ACCT_TYPE_ASSET, "Broker");
@@ -288,12 +287,6 @@ TEST_F(GncOptionDBTest, test_register_start_date_option)
 
 }
 
-static bool
-operator==(const GncGUID& l, const GncGUID& r)
-{
-    return guid_equal(&l, &r);
-}
-
 class GncOptionDBIOTest : public ::testing::Test
 {
 protected:
@@ -315,7 +308,6 @@ protected:
             return account;
         };
         auto assets = create_account(m_root, ACCT_TYPE_ASSET, "Assets");
-        auto liabilities = create_account(m_root, ACCT_TYPE_LIABILITY, "Liabilities");
         auto expenses = create_account(m_root, ACCT_TYPE_EXPENSE, "Expenses");
         create_account(assets, ACCT_TYPE_BANK, "Bank");
         auto broker = create_account(assets, ACCT_TYPE_ASSET, "Broker");
@@ -384,14 +376,12 @@ TEST_F(GncOptionDBIOTest, test_option_kvp_save)
     auto bar = "bar";
     auto sausage = "sausage";
     auto grault = "grault";
-    auto garply = "garply";
     GSList foo_bar_tail{(void*)bar, nullptr};
     GSList foo_bar_head{(void*)foo, &foo_bar_tail};
     GSList foo_sausage_tail{(void*)sausage, nullptr};
     GSList foo_sausage_head{(void*)foo, &foo_sausage_tail};
     GSList qux_grault_tail{(void*)grault, nullptr};
     GSList qux_grault_head{(void*)foo, &qux_grault_tail};
-    GSList qux_garply_tail{(void*)garply, nullptr};
     GSList qux_garply_head{(void*)foo, &qux_grault_tail};
     m_db->set_option("foo", "sausage", std::string{"pepper"});
     m_db->save_to_kvp(m_book, true);



Summary of changes:
 libgnucash/engine/test/CMakeLists.txt         |  5 +++++
 libgnucash/engine/test/gtest-gnc-option.cpp   | 11 ++---------
 libgnucash/engine/test/gtest-gnc-optiondb.cpp | 10 ----------
 3 files changed, 7 insertions(+), 19 deletions(-)