Skip to content

Simplify logic around std::optional<bool> #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZigRazor merged 1 commit into from
Oct 31, 2025
Merged

Simplify logic around std::optional<bool> #557

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 43 additions & 84 deletions test/RWOutputTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <fstream>
#include <memory>
#include <optional>

#include "CXXGraph/CXXGraph.hpp"
#include "CXXGraph/Utility/SecureRandom.hpp"
Expand Down Expand Up @@ -249,8 +250,7 @@ TEST(RWOutputTest, test_8) {

for (const auto &readEdgeIt : readEdge) {
if (readEdgeIt->getUserId() == "1") {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node1.getUserId());
// ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node1.getData());
Expand All @@ -259,8 +259,7 @@ TEST(RWOutputTest, test_8) {
// ASSERT_EQ(readEdgeIt->getNodePair().second->getData(),
// node2.getData());
} else if (readEdgeIt->getUserId() == "2") {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node2.getUserId());
// ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node2.getData());
Expand All @@ -269,8 +268,7 @@ TEST(RWOutputTest, test_8) {
// ASSERT_EQ(readEdgeIt->getNodePair().second->getData(),
// node3.getData());
} else if (readEdgeIt->getUserId() == "3") {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
!readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node1.getUserId());
// ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node1.getData());
Expand Down Expand Up @@ -318,26 +316,23 @@ TEST(RWOutputTest, test_9) {

for (const auto &readEdgeIt : readEdge) {
if (readEdgeIt->getId() == edge1.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node1.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node1.getData());
ASSERT_EQ(readEdgeIt->getNodePair().second->getUserId(),
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node2.getData());
} else if (readEdgeIt->getId() == edge2.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node2.getData());
ASSERT_EQ(readEdgeIt->getNodePair().second->getUserId(),
node3.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node3.getData());
} else if (readEdgeIt->getId() == edge3.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
!readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node1.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node1.getData());
Expand Down Expand Up @@ -386,10 +381,8 @@ TEST(RWOutputTest, test_10) {

for (const auto &readEdgeIt : readEdge) {
if (readEdgeIt->getId() == edge1.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
5);
Expand All @@ -400,21 +393,17 @@ TEST(RWOutputTest, test_10) {
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node2.getData());
} else if (readEdgeIt->getId() == edge2.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
!readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node2.getData());
ASSERT_EQ(readEdgeIt->getNodePair().second->getUserId(),
node3.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node3.getData());
} else if (readEdgeIt->getId() == edge3.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
!readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
6);
Expand Down Expand Up @@ -632,8 +621,7 @@ TEST(RWOutputTest, test_18) {

for (const auto &readEdgeIt : readEdge) {
if (readEdgeIt->getId() == edge1.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node1.getUserId());
// ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node1.getData());
Expand All @@ -642,8 +630,7 @@ TEST(RWOutputTest, test_18) {
// ASSERT_EQ(readEdgeIt->getNodePair().second->getData(),
// node2.getData());
} else if (readEdgeIt->getId() == edge2.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node2.getUserId());
// ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node2.getData());
Expand All @@ -652,8 +639,7 @@ TEST(RWOutputTest, test_18) {
// ASSERT_EQ(readEdgeIt->getNodePair().second->getData(),
// node3.getData());
} else if (readEdgeIt->getId() == edge3.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
!readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node1.getUserId());
// ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node1.getData());
Expand Down Expand Up @@ -701,26 +687,23 @@ TEST(RWOutputTest, test_19) {

for (const auto &readEdgeIt : readEdge) {
if (readEdgeIt->getId() == edge1.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node1.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node1.getData());
ASSERT_EQ(readEdgeIt->getNodePair().second->getUserId(),
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node2.getData());
} else if (readEdgeIt->getId() == edge2.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node2.getData());
ASSERT_EQ(readEdgeIt->getNodePair().second->getUserId(),
node3.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node3.getData());
} else if (readEdgeIt->getId() == edge3.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
!readEdgeIt->isDirected().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node1.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node1.getData());
Expand Down Expand Up @@ -769,10 +752,8 @@ TEST(RWOutputTest, test_20) {

for (const auto &readEdgeIt : readEdge) {
if (readEdgeIt->getId() == edge1.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
5);
Expand All @@ -783,21 +764,17 @@ TEST(RWOutputTest, test_20) {
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node2.getData());
} else if (readEdgeIt->getId() == edge2.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
!readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node2.getData());
ASSERT_EQ(readEdgeIt->getNodePair().second->getUserId(),
node3.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node3.getData());
} else if (readEdgeIt->getId() == edge3.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
!readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
6);
Expand Down Expand Up @@ -882,10 +859,8 @@ TEST(RWOutputTest, test_22) {

for (const auto &readEdgeIt : readEdge) {
if (readEdgeIt->getId() == edge1.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
5);
Expand All @@ -896,21 +871,17 @@ TEST(RWOutputTest, test_22) {
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node2.getData());
} else if (readEdgeIt->getId() == edge2.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
!readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node2.getData());
ASSERT_EQ(readEdgeIt->getNodePair().second->getUserId(),
node3.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node3.getData());
} else if (readEdgeIt->getId() == edge3.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
!readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
6);
Expand Down Expand Up @@ -1022,10 +993,8 @@ TEST(RWOutputTest, test_25) {

for (const auto &readEdgeIt : readEdge) {
if (readEdgeIt->getId() == edge1.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
5);
Expand All @@ -1036,21 +1005,17 @@ TEST(RWOutputTest, test_25) {
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node2.getData());
} else if (readEdgeIt->getId() == edge2.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
!readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node2.getData());
ASSERT_EQ(readEdgeIt->getNodePair().second->getUserId(),
node3.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node3.getData());
} else if (readEdgeIt->getId() == edge3.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
!readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
6);
Expand Down Expand Up @@ -1189,10 +1154,8 @@ TEST(RWOutputTest, test_29) {

for (const auto &readEdgeIt : readEdge) {
if (readEdgeIt->getId() == edge1.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
5);
Expand All @@ -1203,21 +1166,17 @@ TEST(RWOutputTest, test_29) {
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node2.getData());
} else if (readEdgeIt->getId() == edge2.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
!readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{true});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->getNodePair().first->getUserId(),
node2.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().first->getData(), node2.getData());
ASSERT_EQ(readEdgeIt->getNodePair().second->getUserId(),
node3.getUserId());
ASSERT_EQ(readEdgeIt->getNodePair().second->getData(), node3.getData());
} else if (readEdgeIt->getId() == edge3.getId()) {
ASSERT_TRUE(readEdgeIt->isDirected().has_value() &&
!readEdgeIt->isDirected().value());
ASSERT_TRUE(readEdgeIt->isWeighted().has_value() &&
readEdgeIt->isWeighted().value());
ASSERT_EQ(readEdgeIt->isDirected(), std::optional<bool>{false});
ASSERT_EQ(readEdgeIt->isWeighted(), std::optional<bool>{true});
ASSERT_EQ((dynamic_cast<const CXXGraph::Weighted *>(readEdgeIt.get()))
->getWeight(),
6);
Expand Down
Loading