Renamed AbstractTestFactory to TestFactory.

7 files changed, 16 insertions, 16 deletions

diff --git a/include/cppunit/extensions/AutoRegisterSuite.h b/include/cppunit/extensions/AutoRegisterSuite.h
index 21ef224..0871529 100644
--- a/include/cppunit/extensions/AutoRegisterSuite.h
+++ b/include/cppunit/extensions/AutoRegisterSuite.h
@@ -25,7 +25,7 @@ namespace CppUnit {
        */
       AutoRegisterSuite()
       {
-        AbstractTestFactory *factory = new TestSuiteFactory<TestCaseType>();
+        TestFactory *factory = new TestSuiteFactory<TestCaseType>();
         TestFactoryRegistry::getRegistry().registerFactory( factory );
       }
 
diff --git a/include/cppunit/extensions/Makefile b/include/cppunit/extensions/Makefile
index ed8aa03..e0b9d27 100644
--- a/include/cppunit/extensions/Makefile
+++ b/include/cppunit/extensions/Makefile
@@ -88,7 +88,7 @@ enable_latex_docs = no
 
 libcppunitincludedir = $(includedir)/cppunit/extensions
 
-libcppunitinclude_HEADERS =  	AbstractTestFactory.h 	AutoRegisterSuite.h 	HelperMacros.h 	Orthodox.h 	RepeatedTest.h 	TestDecorator.h 	TestFactoryRegistry.h 	TestSetup.h 	TestSuiteBuilder.h 	TestSuiteFactory.h
+libcppunitinclude_HEADERS =  	TestFactory.h 	AutoRegisterSuite.h 	HelperMacros.h 	Orthodox.h 	RepeatedTest.h 	TestDecorator.h 	TestFactoryRegistry.h 	TestSetup.h 	TestSuiteBuilder.h 	TestSuiteFactory.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = ../../../include/config.h
diff --git a/include/cppunit/extensions/Makefile.am b/include/cppunit/extensions/Makefile.am
index 1173df7..9a1bde3 100644
--- a/include/cppunit/extensions/Makefile.am
+++ b/include/cppunit/extensions/Makefile.am
@@ -1,7 +1,7 @@
 libcppunitincludedir = $(includedir)/cppunit/extensions
 
 libcppunitinclude_HEADERS = \
-	AbstractTestFactory.h \
+	TestFactory.h \
 	AutoRegisterSuite.h \
 	HelperMacros.h \
 	Orthodox.h \
diff --git a/include/cppunit/extensions/Makefile.in b/include/cppunit/extensions/Makefile.in
index 13d34ba..2b49e8f 100644
--- a/include/cppunit/extensions/Makefile.in
+++ b/include/cppunit/extensions/Makefile.in
@@ -88,7 +88,7 @@ enable_latex_docs = @enable_latex_docs@
 
 libcppunitincludedir = $(includedir)/cppunit/extensions
 
-libcppunitinclude_HEADERS =  	AbstractTestFactory.h 	AutoRegisterSuite.h 	HelperMacros.h 	Orthodox.h 	RepeatedTest.h 	TestDecorator.h 	TestFactoryRegistry.h 	TestSetup.h 	TestSuiteBuilder.h 	TestSuiteFactory.h
+libcppunitinclude_HEADERS =  	TestFactory.h 	AutoRegisterSuite.h 	HelperMacros.h 	Orthodox.h 	RepeatedTest.h 	TestDecorator.h 	TestFactoryRegistry.h 	TestSetup.h 	TestSuiteBuilder.h 	TestSuiteFactory.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = ../../../include/config.h
diff --git a/include/cppunit/extensions/AbstractTestFactory.h b/include/cppunit/extensions/TestFactory.h
index de0ea84..a648243 100644
--- a/include/cppunit/extensions/AbstractTestFactory.h
+++ b/include/cppunit/extensions/TestFactory.h
@@ -1,5 +1,5 @@
-#ifndef CPPUNIT_EXTENSIONS_ABSTRACTTESTFACTORY_H
-#define CPPUNIT_EXTENSIONS_ABSTRACTTESTFACTORY_H
+#ifndef CPPUNIT_EXTENSIONS_TESTFACTORY_H
+#define CPPUNIT_EXTENSIONS_TESTFACTORY_H
 
 namespace CppUnit {
 
@@ -7,15 +7,15 @@ namespace CppUnit {
 
   /** This class represents an abstract Test factory.
    */
-  class AbstractTestFactory 
+  class TestFactory 
   {
   public:
-    virtual ~AbstractTestFactory() {}
+    virtual ~TestFactory() {}
 
     /** Makes a new test.
      * \return A new Test.
      */
-    virtual Test *makeTest() =0;
+    virtual Test* makeTest() = 0;
   };
 
 }  // namespace CppUnit
diff --git a/include/cppunit/extensions/TestFactoryRegistry.h b/include/cppunit/extensions/TestFactoryRegistry.h
index c26b987..cc6c035 100644
--- a/include/cppunit/extensions/TestFactoryRegistry.h
+++ b/include/cppunit/extensions/TestFactoryRegistry.h
@@ -7,7 +7,7 @@
 
 #include <map>
 #include <string>
-#include <cppunit/extensions/AbstractTestFactory.h>
+#include <cppunit/extensions/TestFactory.h>
 
 namespace CppUnit {
 
@@ -17,7 +17,7 @@ namespace CppUnit {
    *
    * Note that the registry assume lifetime control for any registered test.
    */
-  class TestFactoryRegistry : public AbstractTestFactory
+  class TestFactoryRegistry : public TestFactory
   {
   public:
     /** Constructs the registry with the specified name.
@@ -54,13 +54,13 @@ namespace CppUnit {
      * \param factory Factory to register. 
      */
     void registerFactory( const std::string &name,
-                          AbstractTestFactory *factory );
+                          TestFactory *factory );
 
 #ifdef USE_TYPEINFO
     /** Registers a test factory using its class name.
      * \param factory Factory to register. 
      */
-    void registerFactory( AbstractTestFactory *factory );
+    void registerFactory( TestFactory *factory );
 #endif // USE_TYPEINFO
 
   private:
@@ -68,7 +68,7 @@ namespace CppUnit {
     void operator =( const TestFactoryRegistry &copy );
 
   private:
-    typedef std::map<std::string, AbstractTestFactory *> Factories;
+    typedef std::map<std::string, TestFactory *> Factories;
     Factories m_factories;
 
     typedef std::map<std::string, TestFactoryRegistry *> NamedRegistries;
diff --git a/include/cppunit/extensions/TestSuiteFactory.h b/include/cppunit/extensions/TestSuiteFactory.h
index b1e39c3..a54311b 100644
--- a/include/cppunit/extensions/TestSuiteFactory.h
+++ b/include/cppunit/extensions/TestSuiteFactory.h
@@ -1,14 +1,14 @@
 #ifndef CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H
 #define CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H
 
-#include <cppunit/extensions/AbstractTestFactory.h>
+#include <cppunit/extensions/TestFactory.h>
 
 namespace CppUnit {
 
   class Test;
 
   template<typename TestCaseType>
-    class TestSuiteFactory : public AbstractTestFactory
+    class TestSuiteFactory : public TestFactory
   {
   public:
     virtual Test *makeTest()