Allow selecting tests to run by base name or specialised name.

boxbackup · Jan 4, 2016 · 8a24376 · 8a24376
1 parent a89fd31
commit 8a24376
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/lib/common/Test.cpp b/lib/common/Test.cpp
@@ -34,9 +34,17 @@ std::string current_test_name;
 std::list<std::string> run_only_named_tests;
 std::map<std::string, std::string> s_test_status;
 
-bool setUp(const std::string& function_name)
+bool setUp(const std::string& function_name, const std::string& specialisation)
 {
-	current_test_name = function_name;
+	std::ostringstream specialised_name;
+	specialised_name << function_name;
+
+	if(!specialisation.empty())
+	{
+		specialised_name << "(" << specialisation << ")";
+	}
+
+	current_test_name = specialised_name.str();
 
 	if (!run_only_named_tests.empty())
 	{
@@ -46,7 +54,7 @@ bool setUp(const std::string& function_name)
 			i = run_only_named_tests.begin();
 			i != run_only_named_tests.end(); i++)
 		{
-			if (*i == current_test_name)
+			if (*i == function_name || *i == current_test_name)
 			{
 				run_this_test = true;
 				break;
@@ -60,7 +68,7 @@ bool setUp(const std::string& function_name)
 		}
 	}
 
-	printf("\n\n== %s ==\n", function_name.c_str());
+	printf("\n\n== %s ==\n", current_test_name.c_str());
 	num_tests_selected++;
 	old_failure_count = num_failures;
 

diff --git a/lib/common/Test.h b/lib/common/Test.h
@@ -44,17 +44,12 @@ extern std::map<std::string, std::string> s_test_status;
 
 //! Simplifies calling setUp() with the current function name in each test.
 #define SETUP() \
-	if (!setUp(__FUNCTION__)) return true; \
+	if (!setUp(__FUNCTION__, "")) return true; \
 	try \
 	{ // left open for TEARDOWN()
 
-#define SETUP_SPECIALISED(name) \
-	{ \
-		std::ostringstream full_name; \
-		full_name << __FUNCTION__ << "(" << name << ")"; \
-		if (!setUp(full_name.str())) return true; \
-	} \
-	\
+#define SETUP_SPECIALISED(specialisation) \
+	if (!setUp(__FUNCTION__, specialisation)) return true; \
 	try \
 	{ // left open for TEARDOWN()
 
@@ -212,7 +207,7 @@ extern std::map<std::string, std::string> s_test_status;
 	TEST_EQUAL_LINE(expected, actual.substr(0, std::string(expected).size()), actual);
 
 //! Sets up (cleans up) test environment at the start of every test.
-bool setUp(const std::string& function_name);
+bool setUp(const std::string& function_name, const std::string& specialisation);
 
 //! Checks account for errors and shuts down daemons at end of every test.
 bool tearDown();