unit helper added for vector of pair

Author: Debashis08

Headers/0003_Graph/0001_BreadthFirstSearch.h

@@ -2,7 +2,9 @@
 
 #include<list>
 #include<map>
+#include<utility>
 #include<string>
+#include<vector>
 using namespace std;
 enum color { WHITE, GRAY, BLACK };
 
@@ -26,5 +28,5 @@ class BFSGraph
 public:
     void PushUndirectedEdge(char valueU, char valueV);
     void BFS(char value);
-    string ShowBFSResult();
+    vector<pair<char, int>> ShowBFSResult();
 };

Headers/0003_Graph/0002_DepthFirstSearch.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include<list>
+#include<map>
+#include<string>
+using namespace std;
+enum color { WHITE, GRAY, BLACK };
+
+class Node
+{
+public:
+    char data;
+    int distance;
+    int color;
+    Node* parent;
+    Node(char value);
+};
+
+class DFSGraph
+{
+private:
+    map<Node*, list<Node*>> _adjlist;
+    map<char, Node*> _nodeMap;
+    Node* MakeOrFindNode(char value);
+    void DepthFirstSearch(Node* node);
+public:
+    void PushUndirectedEdge(char valueU, char valueV);
+    void DFS(char value);
+    string ShowDFSResult();
+};

SourceCodes/0003_Graph/0001_BreadthFirstSearch.cc

@@ -1,6 +1,8 @@
 #include "../Headers/0003_Graph/0001_BreadthFirstSearch.h"
 #include<iostream>
 #include<queue>
+#include<vector>
+#include<utility>
 #include<string>
 #include<climits>
 using namespace std;
@@ -70,12 +72,12 @@ void BFSGraph::BFS(char value)
 	this->BreadthFirstSearch(this->_nodeMap[value]);
 }
 
-string BFSGraph::ShowBFSResult()
+vector<pair<char, int>> BFSGraph::ShowBFSResult()
 {
-	string result = "";
-	for (auto &node : this->_nodeMap)
+	vector<pair<char, int>> result;
+	for (auto& node : this->_nodeMap)
 	{
-		result = result + " " + node.first + "(" + to_string(node.second->distance) + ")";
+		result.push_back(make_pair(node.first, node.second->distance));
 	}
 	return result;
 }

SourceCodes/0003_Graph/0002_DepthFirstSearch.cc

@@ -1,6 +1,7 @@
 # Specify the source files
 set(0003GRAPH_SOURCES
     0001_BreadthFirstSearch.cc
+    0002_DepthFirstSearch.cc
 )
 
 # Create a library target

SourceCodes/0003_Graph/CMakeLists.txt

@@ -9,14 +9,14 @@ template<typename T>
 class UnitTestHelper
 {
 public:
-	string VerifyVectorResult(vector<T> vector)
+	string VerifyVectorResult(vector<T>& vector)
 	{
 		string result = "";
-		for (auto iterator : vector)
+		for (auto& iterator : vector)
 		{
 			result += to_string(iterator) + " ";
 		}
 		result.pop_back();
 		return result;
 	}
-};
+};

Tests/0000_CommonUtilities/UnitTestHelper.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include<iostream>
+#include<vector>
+#include<utility>
+#include<string>
+using namespace std;
+
+template<typename T1, typename T2>
+class UnitTestHelperVectorOfPair
+{
+public:
+	string VerifyVectorOfPair(vector<pair<T1,T2>> vector)
+	{
+		string result = "";
+		for (auto& iterator : vector)
+		{
+			result += string(1, iterator.first) + "(" + to_string(iterator.second) + ")" + " ";
+		}
+
+		if (!result.empty())
+		{
+			result.pop_back();
+		}
+		return result;
+	}
+};

Tests/0000_CommonUtilities/UnitTestHelperVectorOfPair.h

@@ -1,10 +1,12 @@
 #include <gtest/gtest.h>
 #include<string>
 #include "../Headers/0003_Graph/0001_BreadthFirstSearch.h"
+#include "../0000_CommonUtilities/UnitTestHelperVectorOfPair.h"
 
-// Demonstrate some basic assertions.
 namespace BreadthFirstSearchTest
 {
+    UnitTestHelperVectorOfPair<char, int> unitTestHelperVectorOfPair;
+
 	TEST(BFSTesting, ShowBFSResultTest01) 
     {
 		BFSGraph graph;
@@ -22,8 +24,8 @@ namespace BreadthFirstSearchTest
 
         graph.BFS('s');
 
-        string actualResult = graph.ShowBFSResult();
-        string expectedResult = " r(1) s(0) t(2) u(3) v(2) w(1) x(2) y(3)";
+        string actualResult = unitTestHelperVectorOfPair.VerifyVectorOfPair(graph.ShowBFSResult());
+        string expectedResult = "r(1) s(0) t(2) u(3) v(2) w(1) x(2) y(3)";
         EXPECT_EQ(actualResult, expectedResult);
 	}
 
@@ -35,8 +37,8 @@ namespace BreadthFirstSearchTest
 
         graph.BFS('s');
 
-        string actualResult = graph.ShowBFSResult();
-        string expectedResult = " r(1) s(0)";
+        string actualResult = unitTestHelperVectorOfPair.VerifyVectorOfPair(graph.ShowBFSResult());
+        string expectedResult = "r(1) s(0)";
         EXPECT_EQ(actualResult, expectedResult);
     }
 }

Tests/0003_Graph/0001_BreadthFirstSearchTest.cc

@@ -0,0 +1,7 @@
+#include<gtest/gtest.h>
+#include "../Headers/0003_Graph/0002_DepthFirstSearch.h"
+
+namespace DepthFirstSearchTest
+{
+
+}

Tests/0003_Graph/0002_DepthFirstSearchTest.cc

@@ -11,19 +11,16 @@ FetchContent_MakeAvailable(googletest)
 enable_testing()
 
 add_executable(
-  0003-Graph-Tests
-  0001_BreadthFirstSearchTest.cc)
-
-target_link_libraries(
-  0003-Graph-Tests
-  GTest::gtest_main
+  0003GraphTests
+  0001_BreadthFirstSearchTest.cc
+  0002_DepthFirstSearchTest.cc
 )
 
 target_link_libraries(
-  0003-Graph-Tests
+  0003GraphTests
+  GTest::gtest_main
   0003GRAPH
 )
 
-
 include(GoogleTest)
-gtest_discover_tests(0003-Graph-Tests)
+gtest_discover_tests(0003GraphTests)