Merge remote-tracking branch 'origin/4096_RoundTrip' into merge_city

NREL · Sep 29, 2020 · a715ab8 · a715ab8
2 parents 6c384fe + 696dbb8
commit a715ab8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/utilities/core/test/Enum_GTest.cpp b/src/utilities/core/test/Enum_GTest.cpp
@@ -60,7 +60,7 @@ TEST(Enum, EnumThrows)
   try {
     openstudio::enums::TestEnum("forth");
   } catch (std::runtime_error& e) {
-    std::string expectedErrorMessage("Unknown OpenStudio Enum Value 'FORTH'");
+    std::string expectedErrorMessage("Unknown OpenStudio Enum Value 'FORTH' for Enum TestEnum");
     EXPECT_EQ(expectedErrorMessage, std::string(e.what()));
   }
 
@@ -69,7 +69,7 @@ TEST(Enum, EnumThrows)
   try {
     openstudio::enums::TestEnum(3);
   } catch (std::runtime_error& e) {
-    std::string expectedErrorMessage("Unknown OpenStudio Enum Value = 3");
+    std::string expectedErrorMessage("Unknown OpenStudio Enum Value = 3 for Enum TestEnum");
     EXPECT_EQ(expectedErrorMessage, std::string(e.what()));
   }
 

diff --git a/src/utilities/idf/Test/Workspace_GTest.cpp b/src/utilities/idf/Test/Workspace_GTest.cpp
@@ -2127,7 +2127,7 @@ TEST_F(IdfFixture, Workspace_getObjects_Type_StringOverload) {
 
   // And check with a bad std::string, that it throws, and that we get an informative message (#1741)
   ASSERT_THROW(workspace.getObjectsByType("BadEnum"), std::runtime_error);
-  std::string expectedErrorMessage("Unknown OpenStudio Enum Value 'BADENUM'");
+  std::string expectedErrorMessage("Unknown OpenStudio Enum Value 'BADENUM' for Enum IddObjectType");
   try {
     workspace.getObjectsByType("BadEnum");
   } catch (std::runtime_error& e) {