From 733b73dc87259803f98ccae7b8612e4f841ad4d6 Mon Sep 17 00:00:00 2001
From: Gabriel Schlozer <g.schlozer@gmail.com>
Date: Wed, 8 Jun 2016 11:25:13 +0200
Subject: [PATCH] parameterized tests have names

---
 UnitTest++/ParameterizedMacros.h | 2 +-
 UnitTest++/ParameterizedTest.cpp | 5 +++--
 UnitTest++/ParameterizedTest.h   | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/UnitTest++/ParameterizedMacros.h b/UnitTest++/ParameterizedMacros.h
index a32bc6d..7fda47c 100644
--- a/UnitTest++/ParameterizedMacros.h
+++ b/UnitTest++/ParameterizedMacros.h
@@ -15,7 +15,7 @@
 		## SetUpBody \
 	} static parameterizedCreator ## IterationName ## Instance; \
 	\
-	static UnitTest::ParameterizedTest<## Type>  ## IterationName(parameterizedCreator ## IterationName ## Instance.parameters);
+	static UnitTest::ParameterizedTest<## Type>  ## IterationName(parameterizedCreator ## IterationName ## Instance.parameters, #IterationName);
 
 
 #endif
\ No newline at end of file
diff --git a/UnitTest++/ParameterizedTest.cpp b/UnitTest++/ParameterizedTest.cpp
index 77aa2bd..813afdc 100644
--- a/UnitTest++/ParameterizedTest.cpp
+++ b/UnitTest++/ParameterizedTest.cpp
@@ -5,8 +5,9 @@ using namespace std;
 using namespace UnitTest;
 
 
-ParameterizedTestAbstract::ParameterizedTestAbstract()
-	: _iteration(0)
+ParameterizedTestAbstract::ParameterizedTestAbstract(const string & name)
+	: _name(name),
+	_iteration(0)
 {
 }
 
diff --git a/UnitTest++/ParameterizedTest.h b/UnitTest++/ParameterizedTest.h
index cde5287..5da5b58 100644
--- a/UnitTest++/ParameterizedTest.h
+++ b/UnitTest++/ParameterizedTest.h
@@ -16,9 +16,10 @@ namespace UnitTest
 	{
 		friend class ParameterizedManager;
 	public:
-		ParameterizedTestAbstract();
+		ParameterizedTestAbstract(const string & name);
 		virtual ~ParameterizedTestAbstract();
 		size_t getIteration();
+		const string & getName() const { return _name; }
 
 	protected:
 		void updateIteration();
@@ -29,6 +30,7 @@ namespace UnitTest
 		bool hasMoreParameters(int advance = 0) const;
 		void onNewIteration(bool first);
 
+		string _name;
 		size_t _iteration;
 	};
 
@@ -42,8 +44,9 @@ namespace UnitTest
 			virtual void onNextIteration(Test* const test, T_Parameter current, size_t iteration) = 0;
 		};
 
-		ParameterizedTest(vector<T_Parameter> parameters, IParameterizedTestListener* const listener = nullptr)
-			: _parameters(parameters),
+		ParameterizedTest(vector<T_Parameter> parameters, const string & name = "", IParameterizedTestListener* const listener = nullptr)
+			: ParameterizedTestAbstract(name),
+			_parameters(parameters),
 			_listener(listener)
 		{
 		}