From 3670ee1a3682e0e3bfd8576d7555b1f2adfd0c57 Mon Sep 17 00:00:00 2001
From: jez_higgins <>
Date: Tue, 18 Oct 2005 11:39:56 +0000
Subject: [PATCH] pulled out xpath_test_suite.hpp

---
 test/XPath/axis_enumerator_test.hpp   |  1 -
 test/XPath/main.cpp                   | 28 ++-------------------
 test/XPath/xpath_test_suite.hpp       | 36 +++++++++++++++++++++++++++
 test/XPath/xpathic.vcproj             | 26 +------------------
 test/XPath_silly/main.cpp             | 30 +++-------------------
 test/XPath_silly/xpathic_silly.vcproj | 26 +------------------
 test/XPath_wide/main.cpp              | 32 +++---------------------
 test/XPath_wide/xpathic_wide.vcproj   | 32 +-----------------------
 8 files changed, 47 insertions(+), 164 deletions(-)
 create mode 100644 test/XPath/xpath_test_suite.hpp

diff --git a/test/XPath/axis_enumerator_test.hpp b/test/XPath/axis_enumerator_test.hpp
index 4907e5d6..8cf0f4d7 100644
--- a/test/XPath/axis_enumerator_test.hpp
+++ b/test/XPath/axis_enumerator_test.hpp
@@ -971,6 +971,5 @@ TestSuite* AxisEnumeratorTest_suite()
   return suiteOfTests;
 } // AxisEnumeratorTest_suite
 
-
 #endif
 
diff --git a/test/XPath/main.cpp b/test/XPath/main.cpp
index 59f888c6..6c76caf9 100644
--- a/test/XPath/main.cpp
+++ b/test/XPath/main.cpp
@@ -3,38 +3,14 @@
 #pragma warning(disable:4224 4267)
 #endif
 
-#include "../CppUnit/TestRunner.hpp"
 #include <iostream>
-#include "../CppUnit/framework/Test.h"
-#include "../CppUnit/framework/TestSuite.h"
-
-#include "parse_test.hpp"
-#include "value_test.hpp"
-#include "arithmetic_test.hpp"
-#include "relational_test.hpp"
-#include "logical_test.hpp"
-#include "axis_enumerator_test.hpp"
-#include "node_test_test.hpp"
-#include "step_test.hpp"
-#include "execute_test.hpp"
+#include "xpath_test_suite.hpp"
 
 /////////////////////////////////////////
 int main(int argc, char** argv)
 {
   std::cout << "Hello" << std::endl;
 
-  TestRunner runner;
-
-  runner.addTest("ValueTest", ValueTest_suite<std::string, Arabica::default_string_adaptor<std::string> >());
-  runner.addTest("ArithmeticTest", ArithmeticTest_suite<std::string, Arabica::default_string_adaptor<std::string> >());
-  runner.addTest("RelationalTest", RelationalTest_suite<std::string, Arabica::default_string_adaptor<std::string> >());
-  runner.addTest("LogicalTest", LogicalTest_suite<std::string, Arabica::default_string_adaptor<std::string> >());
-  runner.addTest("AxisEnumeratorTest", AxisEnumeratorTest_suite<std::string, Arabica::default_string_adaptor<std::string> >());
-  runner.addTest("NodeTestTest", NodeTestTest_suite<std::string, Arabica::default_string_adaptor<std::string> >());
-  runner.addTest("StepTest", StepTest_suite<std::string, Arabica::default_string_adaptor<std::string> >());
-  runner.addTest("ParseTest", ParseTest_suite<std::string, Arabica::default_string_adaptor<std::string> >());
-  runner.addTest("ExecuteTest", ExecuteTest_suite<std::string, Arabica::default_string_adaptor<std::string> >());
-
-  runner.run(argc, argv);
+  XPath_test_suite<std::string, Arabica::default_string_adaptor<std::string> >(argc, argv);
 } // main
 
diff --git a/test/XPath/xpath_test_suite.hpp b/test/XPath/xpath_test_suite.hpp
new file mode 100644
index 00000000..7c272f64
--- /dev/null
+++ b/test/XPath/xpath_test_suite.hpp
@@ -0,0 +1,36 @@
+#ifndef XPATHIC_XPATH_TEST_SUITE_HPP
+#define XPATHIC_XPATH_TEST_SUITE_HPP
+
+#include "../CppUnit/TestRunner.hpp"
+#include "../CppUnit/framework/Test.h"
+#include "../CppUnit/framework/TestSuite.h"
+
+#include "parse_test.hpp"
+#include "value_test.hpp"
+#include "arithmetic_test.hpp"
+#include "relational_test.hpp"
+#include "logical_test.hpp"
+#include "axis_enumerator_test.hpp"
+#include "node_test_test.hpp"
+#include "step_test.hpp"
+#include "execute_test.hpp"
+
+template<class string_type, class string_adaptor>
+void XPath_test_suite(int argc, char** argv)
+{
+  TestRunner runner;
+
+  runner.addTest("ValueTest", ValueTest_suite<string_type, string_adaptor>());
+  runner.addTest("ArithmeticTest", ArithmeticTest_suite<string_type, string_adaptor>());
+  runner.addTest("RelationalTest", RelationalTest_suite<string_type, string_adaptor>());
+  runner.addTest("LogicalTest", LogicalTest_suite<string_type, string_adaptor>());
+  runner.addTest("AxisEnumeratorTest", AxisEnumeratorTest_suite<string_type, string_adaptor>());
+  runner.addTest("NodeTestTest", NodeTestTest_suite<string_type, string_adaptor>());
+  runner.addTest("StepTest", StepTest_suite<string_type, string_adaptor>());
+  runner.addTest("ParseTest", ParseTest_suite<string_type, string_adaptor>());
+  runner.addTest("ExecuteTest", ExecuteTest_suite<string_type, string_adaptor>());
+
+  runner.run(argc, argv);
+} // XPath_test_suite
+
+#endif
diff --git a/test/XPath/xpathic.vcproj b/test/XPath/xpathic.vcproj
index 8fe6076a..acb8cf58 100644
--- a/test/XPath/xpathic.vcproj
+++ b/test/XPath/xpathic.vcproj
@@ -134,31 +134,7 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
-				RelativePath=".\arithmetic_test.hpp">
-			</File>
-			<File
-				RelativePath=".\axis_enumerator_test.hpp">
-			</File>
-			<File
-				RelativePath=".\execute_test.hpp">
-			</File>
-			<File
-				RelativePath=".\logical_test.hpp">
-			</File>
-			<File
-				RelativePath=".\node_test_test.hpp">
-			</File>
-			<File
-				RelativePath=".\parse_test.hpp">
-			</File>
-			<File
-				RelativePath=".\relational_test.hpp">
-			</File>
-			<File
-				RelativePath=".\step_test.hpp">
-			</File>
-			<File
-				RelativePath=".\value_test.hpp">
+				RelativePath=".\xpath_test_suite.hpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/test/XPath_silly/main.cpp b/test/XPath_silly/main.cpp
index 616978d6..310ed111 100644
--- a/test/XPath_silly/main.cpp
+++ b/test/XPath_silly/main.cpp
@@ -3,21 +3,9 @@
 #pragma warning(disable:4224 4267)
 #endif
 
-#include "../CppUnit/TestRunner.hpp"
-#include "../CppUnit/textui/TextTestResult.h"
-#include "../CppUnit/framework/Test.h"
-#include "../CppUnit/framework/TestSuite.h"
-
-#include "../XPath/value_test.hpp"
-#include "../XPath/arithmetic_test.hpp"
-#include "../XPath/relational_test.hpp"
-#include "../XPath/logical_test.hpp"
-#include "../XPath/axis_enumerator_test.hpp"
-#include "../XPath/node_test_test.hpp"
-#include "../XPath/step_test.hpp"
-#include "../XPath/parse_test.hpp"
-#include "../XPath/execute_test.hpp"
 
+#include <iostream>
+#include "../XPath/xpath_test_suite.hpp"
 #include "../silly_string/silly_string.hpp"
 
 template<> class Arabica::default_string_adaptor<silly_string> : public silly_string_adaptor { };
@@ -27,18 +15,6 @@ int main(int argc, char** argv)
 {
   std::cout << "Hello" << std::endl;
 
-  TestRunner runner;
-
-  runner.addTest("ValueTest", ValueTest_suite<silly_string, Arabica::default_string_adaptor<silly_string> >());
-  runner.addTest("ArithmeticTest", ArithmeticTest_suite<silly_string, Arabica::default_string_adaptor<silly_string> >());
-  runner.addTest("RelationalTest", RelationalTest_suite<silly_string, Arabica::default_string_adaptor<silly_string> >());
-  runner.addTest("LogicalTest", LogicalTest_suite<silly_string, Arabica::default_string_adaptor<silly_string> >());
-  runner.addTest("AxisEnumeratorTest", AxisEnumeratorTest_suite<silly_string, Arabica::default_string_adaptor<silly_string> >());
-  runner.addTest("NodeTestTest", NodeTestTest_suite<silly_string, Arabica::default_string_adaptor<silly_string> >());
-  runner.addTest("StepTest", StepTest_suite<silly_string, Arabica::default_string_adaptor<silly_string> >());
-  runner.addTest("ParseTest", ParseTest_suite<silly_string, Arabica::default_string_adaptor<silly_string> >());
-  runner.addTest("ExecuteTest", ExecuteTest_suite<silly_string, Arabica::default_string_adaptor<silly_string> >());
-
-  runner.run(argc, argv);
+  XPath_test_suite<silly_string, Arabica::default_string_adaptor<silly_string> >(argc, argv);
 } // main
 
diff --git a/test/XPath_silly/xpathic_silly.vcproj b/test/XPath_silly/xpathic_silly.vcproj
index 9be7071b..133944c6 100644
--- a/test/XPath_silly/xpathic_silly.vcproj
+++ b/test/XPath_silly/xpathic_silly.vcproj
@@ -136,35 +136,11 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\XPath\arithmetic_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\axis_enumerator_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\execute_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\logical_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\node_test_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\parse_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\relational_test.hpp">
-			</File>
 			<File
 				RelativePath="..\silly_string\silly_string.hpp">
 			</File>
 			<File
-				RelativePath="..\XPath\step_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\value_test.hpp">
+				RelativePath="..\XPath\xpath_test_suite.hpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/test/XPath_wide/main.cpp b/test/XPath_wide/main.cpp
index db91f97d..0b3138e8 100644
--- a/test/XPath_wide/main.cpp
+++ b/test/XPath_wide/main.cpp
@@ -3,40 +3,14 @@
 #pragma warning(disable:4224 4267)
 #endif
 
-#include "../CppUnit/TestRunner.hpp"
-#include "../CppUnit/textui/TextTestResult.h"
-#include "../CppUnit/framework/Test.h"
-#include "../CppUnit/framework/TestSuite.h"
-
-#include "../XPath/value_test.hpp"
-#include "../XPath/arithmetic_test.hpp"
-#include "../XPath/relational_test.hpp"
-#include "../XPath/logical_test.hpp"
-#include "../XPath/axis_enumerator_test.hpp"
-#include "../XPath/node_test_test.hpp"
-#include "../XPath/step_test.hpp"
-#include "../XPath/parse_test.hpp"
-#include "../XPath/execute_test.hpp"
-
-#include <string>
+#include <iostream>
+#include "../XPath/xpath_test_suite.hpp"
 
 /////////////////////////////////////////
 int main(int argc, char** argv)
 {
   std::cout << "Hello" << std::endl;
 
-  TestRunner runner;
-
-  runner.addTest("ValueTest", ValueTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
-  runner.addTest("ArithmeticTest", ArithmeticTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
-  runner.addTest("RelationalTest", RelationalTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
-  runner.addTest("LogicalTest", LogicalTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
-  runner.addTest("AxisEnumeratorTest", AxisEnumeratorTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
-  runner.addTest("NodeTestTest", NodeTestTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
-  runner.addTest("StepTest", StepTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
-  runner.addTest("ParseTest", ParseTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
-  runner.addTest("ExecuteTest", ExecuteTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
-
-  runner.run(argc, argv);
+  XPath_test_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >(argc, argv);
 } // main
 
diff --git a/test/XPath_wide/xpathic_wide.vcproj b/test/XPath_wide/xpathic_wide.vcproj
index 46e9cd39..9ad069fd 100644
--- a/test/XPath_wide/xpathic_wide.vcproj
+++ b/test/XPath_wide/xpathic_wide.vcproj
@@ -128,43 +128,13 @@
 			<File
 				RelativePath=".\main.cpp">
 			</File>
-			<File
-				RelativePath="..\silly_string\silly_string.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
-				RelativePath="..\XPath\arithmetic_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\axis_enumerator_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\execute_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\logical_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\node_test_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\parse_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\relational_test.hpp">
-			</File>
-			<File
-				RelativePath="..\silly_string\silly_string.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\step_test.hpp">
-			</File>
-			<File
-				RelativePath="..\XPath\value_test.hpp">
+				RelativePath="..\XPath\xpath_test_suite.hpp">
 			</File>
 		</Filter>
 		<Filter