From 74acf7080bf8b95e22ae364495139d5878e9bf05 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 21 Jun 2023 10:45:18 +0200 Subject: [PATCH 1/3] implement ExtNetwork::operator== --- src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp b/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp index 77a8725d6..4bd968c91 100644 --- a/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp +++ b/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp @@ -34,8 +34,10 @@ bool ExtNetwork::active() const { return !this->m_branches.empty() && !this->m_nodes.empty(); } -bool ExtNetwork::operator==(const ExtNetwork&) const { - return true; +bool ExtNetwork::operator==(const ExtNetwork& rhs) const { + return this->m_branches == rhs.m_branches + && this->insert_indexed_node_names == rhs.insert_indexed_node_names + && this->m_nodes == rhs.m_nodes; } From 75bd0e915ec73085eb489fa68f15b87aefa250f5 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 21 Jun 2023 10:45:30 +0200 Subject: [PATCH 2/3] ExtNetwork: use a non-default instance in serializationTestObject --- src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp b/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp index 4bd968c91..97b96b2f0 100644 --- a/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp +++ b/src/opm/input/eclipse/Schedule/Network/ExtNetwork.cpp @@ -27,6 +27,9 @@ namespace Network { ExtNetwork ExtNetwork::serializationTestObject() { ExtNetwork object; + object.m_branches = {Branch::serializationTestObject()}; + object.insert_indexed_node_names = {"test1", "test2"}; + object.m_nodes = {{"test3", Node::serializationTestObject()}}; return object; } From 68ffa2ea1ff1b0bcdc9ec960bd86faf508edc1b8 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 21 Jun 2023 10:48:39 +0200 Subject: [PATCH 3/3] add serialization test for Network::ExtNetwork --- tests/test_Serialization.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_Serialization.cpp b/tests/test_Serialization.cpp index ddb973f90..4fc995bb4 100644 --- a/tests/test_Serialization.cpp +++ b/tests/test_Serialization.cpp @@ -250,6 +250,7 @@ TEST_FOR_TYPE(KeywordLocation) TEST_FOR_TYPE(MessageLimits) TEST_FOR_TYPE(MULTREGTScanner) TEST_FOR_TYPE(NNC) +TEST_FOR_TYPE_NAMED(Network::ExtNetwork, ExtNetwork) TEST_FOR_TYPE_NAMED(Network::Node, NetworkNode) TEST_FOR_TYPE(OilVaporizationProperties) TEST_FOR_TYPE(PAvg)