Unit tests compiling

Tests that use copy constructor changed to test copy method. Unit tests compile but failing. Probably initializer_list construction issue.
boutproject · Feb 8, 2024 · 058faee · 058faee
1 parent 182c21b
commit 058faee
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/tests/unit/src/test_bout++.cxx b/tests/unit/src/test_bout++.cxx
@@ -378,7 +378,7 @@ TEST(BoutInitialiseFunctions, SetRunStartInfo) {
 
   bout::experimental::setRunStartInfo(options);
 
-  auto run_section = options["run"];
+  auto& run_section = options["run"];
 
   ASSERT_TRUE(run_section.isSection());
   EXPECT_TRUE(run_section.isSet("version"));

diff --git a/tests/unit/sys/test_options.cxx b/tests/unit/sys/test_options.cxx
@@ -602,23 +602,23 @@ TEST_F(OptionsTest, OptionsMacroConstReference) {
   EXPECT_EQ(val, 42);
 }
 
-/// Copy constructor copies value
+/// Copy method copies value
 TEST_F(OptionsTest, CopyOption) {
   Options option1;
 
   option1 = 42;
 
-  Options option2(option1);
+  Options option2(option1.copy());
 
   EXPECT_EQ(option2.as<int>(), 42);
 }
 
-/// Copy constructor makes independent copy
+/// Copy method makes independent copy
 TEST_F(OptionsTest, CopyOptionDistinct) {
   Options option1;
   option1 = 42;
 
-  Options option2(option1);
+  Options option2(option1.copy());
 
   option1.force(23);
 
@@ -632,7 +632,7 @@ TEST_F(OptionsTest, CopySection) {
 
   option1["key"] = 42; // option1 now a section
 
-  Options option2(option1);
+  Options option2(option1.copy());
 
   EXPECT_EQ(option2["key"].as<int>(), 42);
 }
@@ -643,7 +643,7 @@ TEST_F(OptionsTest, CopySectionParent) {
 
   option1["key"] = 42;
 
-  Options option2(option1);
+  Options option2(option1.copy());
 
   EXPECT_TRUE(&option2["key"].parent() == &option2);
 }
@@ -653,7 +653,7 @@ TEST_F(OptionsTest, AssignOption) {
 
   option1 = 42;
 
-  option2 = option1;
+  option2 = option1.copy();
 
   EXPECT_EQ(option2.as<int>(), 42);
 }
@@ -663,7 +663,7 @@ TEST_F(OptionsTest, AssignSection) {
 
   option1["key"] = 42;
 
-  option2 = option1;
+  option2 = option1.copy();
 
   EXPECT_EQ(option2["key"].as<int>(), 42);
   EXPECT_TRUE(option2["key"].isValue());
@@ -675,7 +675,7 @@ TEST_F(OptionsTest, AssignSectionReplace) {
   option1["key"] = 42;
   option2["key"] = 23;
 
-  option2 = option1;
+  option2 = option1.copy();
 
   EXPECT_EQ(option2["key"].as<int>(), 42);
 }
@@ -685,7 +685,7 @@ TEST_F(OptionsTest, AssignSectionParent) {
 
   option1["key"] = 42;
 
-  option2 = option1;
+  option2 = option1.copy();
 
   EXPECT_TRUE(&option2["key"].parent() == &option2);
 }
@@ -695,7 +695,7 @@ TEST_F(OptionsTest, AssignSubSection) {
 
   option1["key1"] = 42;
 
-  option2["key2"] = option1;
+  option2["key2"] = option1.copy();
 
   EXPECT_EQ(option2["key2"]["key1"].as<int>(), 42);
 }
@@ -705,7 +705,7 @@ TEST_F(OptionsTest, AssignSubSectionParent) {
 
   option1["key1"] = 42;
 
-  option2["key2"] = option1;
+  option2["key2"] = option1.copy();
 
   EXPECT_EQ(&option2["key2"].parent(), &option2);
   EXPECT_EQ(&option2["key2"]["key1"].parent(), &option2["key2"]);
@@ -1042,7 +1042,7 @@ TEST_F(OptionsTest, DocStringNotCopied) {
   Options option;
   option = 32;
 
-  Options option2 = option;
+  Options option2 = option.copy();
 
   int value = option2.doc("test value");
 

diff --git a/tests/unit/sys/test_optionsreader.cxx b/tests/unit/sys/test_optionsreader.cxx
@@ -352,7 +352,7 @@ test6 = h2`+`:on`e-`more             # Escape sequences in the middle
   OptionsReader reader;
   reader.read(Options::getRoot(), filename);
 
-  auto options = Options::root()["tests"];
+  auto& options = Options::root()["tests"];
 
   EXPECT_EQ(options["test1"].as<int>(), 3);
   EXPECT_EQ(options["test2"].as<int>(), 15);
@@ -398,7 +398,7 @@ twopi = 2 * π   # Unicode symbol defined for pi
   OptionsReader reader;
   reader.read(Options::getRoot(), filename);
 
-  auto options = Options::root()["tests"];
+  auto& options = Options::root()["tests"];
 
   EXPECT_EQ(options["結果"].as<int>(), 8);
   EXPECT_DOUBLE_EQ(options["value"].as<BoutReal>(), 1.3 * (1 + 3));
@@ -425,7 +425,7 @@ value = [a = 1,
   OptionsReader reader;
   reader.read(Options::getRoot(), filename.c_str());
 
-  auto options = Options::root();
+  auto& options = Options::root();
 
   EXPECT_EQ(options["result"].as<int>(), 6);
   EXPECT_EQ(options["value"].as<int>(), 5);
@@ -452,7 +452,7 @@ value = [a = 1,
   OptionsReader reader;
   reader.read(Options::getRoot(), filename.c_str());
 
-  auto options = Options::root();
+  auto& options = Options::root();
 
   EXPECT_EQ(options["result"].as<int>(), 6);
   EXPECT_EQ(options["value"].as<int>(), 5);