aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-23 08:54:11 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-23 08:54:11 +0100
commitdd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a (patch)
treeba2da539f103634b8ddb52a477bbace3b4a52c57 /test
parent4209b95ecc83365718b3dd5556a6866a662e95c5 (diff)
downloadpaludis-dd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a.tar.gz
paludis-dd959fd53fbc5c863ec5e9f3571e3af9ff0d8b1a.tar.xz
PrivateImplementationPattern -> Pimp, Implementation -> Imp
Diffstat (limited to 'test')
-rw-r--r--test/test_framework.cc24
-rw-r--r--test/test_framework.hh6
-rw-r--r--test/test_runner.cc2
3 files changed, 16 insertions, 16 deletions
diff --git a/test/test_framework.cc b/test/test_framework.cc
index 8dd439601..0f3264bb7 100644
--- a/test/test_framework.cc
+++ b/test/test_framework.cc
@@ -22,13 +22,13 @@
#include <iostream>
#include <list>
#include <paludis/util/attributes.hh>
-#include <paludis/util/private_implementation_pattern-impl.hh>
+#include <paludis/util/pimp-impl.hh>
#include <unistd.h>
#include <cstdlib>
#include <sys/time.h>
/** \file
- * Implementation for test framework classes.
+ * Imp for test framework classes.
*
* \ingroup grptestframework
*/
@@ -86,20 +86,20 @@ std::string (* test::get_exception_to_debug_string()) (const std::exception &)
namespace paludis
{
template<>
- struct Implementation<TestMessageSuffix>
+ struct Imp<TestMessageSuffix>
{
static std::list<std::string> suffixes;
};
- std::list<std::string> Implementation<TestMessageSuffix>::suffixes;
+ std::list<std::string> Imp<TestMessageSuffix>::suffixes;
}
std::string
TestMessageSuffix::suffixes()
{
std::string result;
- std::list<std::string>::const_iterator i(paludis::Implementation<TestMessageSuffix>::suffixes.begin()),
- end(paludis::Implementation<TestMessageSuffix>::suffixes.end());
+ std::list<std::string>::const_iterator i(paludis::Imp<TestMessageSuffix>::suffixes.begin()),
+ end(paludis::Imp<TestMessageSuffix>::suffixes.end());
while (i != end)
{
@@ -111,29 +111,29 @@ TestMessageSuffix::suffixes()
}
TestMessageSuffix::TestMessageSuffix(const std::string & s, bool write) :
- paludis::PrivateImplementationPattern<TestMessageSuffix>()
+ paludis::Pimp<TestMessageSuffix>()
{
- paludis::Implementation<TestMessageSuffix>::suffixes.push_back(s);
+ paludis::Imp<TestMessageSuffix>::suffixes.push_back(s);
if (write)
std::cout << "[" << s << "]" << std::flush;
}
TestMessageSuffix::~TestMessageSuffix()
{
- paludis::Implementation<TestMessageSuffix>::suffixes.pop_back();
+ paludis::Imp<TestMessageSuffix>::suffixes.pop_back();
}
namespace paludis
{
template<>
- struct Implementation<TestCase>
+ struct Imp<TestCase>
{
const std::string name;
mutable const char * reached_file;
mutable const char * reached_function;
mutable long reached_line;
- Implementation(const std::string & the_name) :
+ Imp(const std::string & the_name) :
name(the_name),
reached_file(NULL),
reached_function(NULL),
@@ -144,7 +144,7 @@ namespace paludis
}
TestCase::TestCase(const std::string & our_name) :
- paludis::PrivateImplementationPattern<TestCase>(our_name)
+ paludis::Pimp<TestCase>(our_name)
{
TestCaseList::register_test_case(this);
}
diff --git a/test/test_framework.hh b/test/test_framework.hh
index f0978814c..1759b6f35 100644
--- a/test/test_framework.hh
+++ b/test/test_framework.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_TEST_TEST_FRAMEWORK_HH 1
#include <paludis/util/stringify.hh>
-#include <paludis/util/private_implementation_pattern.hh>
+#include <paludis/util/pimp.hh>
#include <string>
/** \file
@@ -38,7 +38,7 @@ namespace test
* \ingroup grptestframework
*/
class TestMessageSuffix :
- paludis::PrivateImplementationPattern<TestMessageSuffix>
+ paludis::Pimp<TestMessageSuffix>
{
public:
/**
@@ -63,7 +63,7 @@ namespace test
* \ingroup grptestframework
*/
class TestCase :
- private paludis::PrivateImplementationPattern<TestCase>
+ private paludis::Pimp<TestCase>
{
protected:
/**
diff --git a/test/test_runner.cc b/test/test_runner.cc
index 107c5a6ea..802bf89e8 100644
--- a/test/test_runner.cc
+++ b/test/test_runner.cc
@@ -38,7 +38,7 @@
#endif
/** \file
- * Implementation of the default test runner.
+ * Imp of the default test runner.
*
* \ingroup grptestframework
*/