From f4a363db0eeb0273e683a45904703f75de25b9de Mon Sep 17 00:00:00 2001
From: David Rosca <roscadav@fit.cvut.cz>
Date: Thu, 5 Mar 2015 15:54:27 +0100
Subject: [PATCH] GraphTest: Output name of representation being tested
Helps to track failures
---
alib2data/test-src/graph/GraphTest.cpp | 36 ++++++++++++--------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/alib2data/test-src/graph/GraphTest.cpp b/alib2data/test-src/graph/GraphTest.cpp
index 9ae3f19f62..5e1830cd97 100644
--- a/alib2data/test-src/graph/GraphTest.cpp
+++ b/alib2data/test-src/graph/GraphTest.cpp
@@ -8,66 +8,62 @@
#define CPPUNIT_ASSERT_EQUAL_INT(a, b) CPPUNIT_ASSERT_EQUAL(a, (int)b)
+#define RUN_TEST(t) \
+ std::cout << "ADJACENCY_LIST" << std::endl; \
+ t(graph::REPRESENTATION::ADJACENCY_LIST); \
+ std::cout << "ADJACENCY_MATRIX" << std::endl; \
+ t(graph::REPRESENTATION::ADJACENCY_MATRIX)
+
CPPUNIT_TEST_SUITE_REGISTRATION(GraphTest);
void GraphTest::testCopyConstruct()
{
- testCopyConstruct_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testCopyConstruct_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testCopyConstruct_impl);
}
void GraphTest::testEqual()
{
- testEqual_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testEqual_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testEqual_impl);
}
void GraphTest::testXMLParser()
{
- testXMLParser_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testXMLParser_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testXMLParser_impl);
}
void GraphTest::testStringParser()
{
- testStringParser_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testStringParser_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testStringParser_impl);
}
void GraphTest::testAddEdge()
{
- testAddEdge_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testAddEdge_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testAddEdge_impl);
}
void GraphTest::testRemoveEdge()
{
- testRemoveEdge_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testRemoveEdge_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testRemoveEdge_impl);
}
void GraphTest::testAddNode()
{
- testAddNode_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testAddNode_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testAddNode_impl);
}
void GraphTest::testRemoveNode()
{
- testRemoveNode_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testRemoveNode_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testRemoveNode_impl);
}
void GraphTest::testNeighborEdges()
{
- testNeighborEdges_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testNeighborEdges_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testNeighborEdges_impl);
}
void GraphTest::testHasEdge()
{
- testHasEdge_impl(graph::REPRESENTATION::ADJACENCY_LIST);
- testHasEdge_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+ RUN_TEST(testHasEdge_impl);
}
void GraphTest::testCopyConstruct_impl(graph::REPRESENTATION representation)
--
GitLab