aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_fail_TEST.cc2
-rw-r--r--test/test_framework.cc4
-rw-r--r--test/test_framework.hh6
-rw-r--r--test/test_pass_TEST.cc2
-rw-r--r--test/test_runner.cc2
5 files changed, 8 insertions, 8 deletions
diff --git a/test/test_fail_TEST.cc b/test/test_fail_TEST.cc
index 8c27e1298..1d86326d5 100644
--- a/test/test_fail_TEST.cc
+++ b/test/test_fail_TEST.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
diff --git a/test/test_framework.cc b/test/test_framework.cc
index 80759a243..0410d0fba 100644
--- a/test/test_framework.cc
+++ b/test/test_framework.cc
@@ -18,9 +18,9 @@
*/
#include "test_framework.hh"
-#include <paludis/util/attributes.hh>
-#include <iostream>
#include <algorithm>
+#include <iostream>
+#include <paludis/util/attributes.hh>
#include <unistd.h>
/** \file
diff --git a/test/test_framework.hh b/test/test_framework.hh
index 4b539a719..5362d3b15 100644
--- a/test/test_framework.hh
+++ b/test/test_framework.hh
@@ -20,11 +20,11 @@
#ifndef PALUDIS_GUARD_TEST_TEST_FRAMEWORK_HH
#define PALUDIS_GUARD_TEST_TEST_FRAMEWORK_HH 1
-#include <paludis/util/stringify.hh>
-#include <string>
-#include <memory>
#include <list>
+#include <memory>
+#include <paludis/util/stringify.hh>
#include <sstream>
+#include <string>
/** \file
* Test framework class definitions.
diff --git a/test/test_pass_TEST.cc b/test/test_pass_TEST.cc
index 38b156e62..77751569f 100644
--- a/test/test_pass_TEST.cc
+++ b/test/test_pass_TEST.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <string>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
-#include <string>
using namespace test;
diff --git a/test/test_runner.cc b/test/test_runner.cc
index fc16736fa..1107a082f 100644
--- a/test/test_runner.cc
+++ b/test/test_runner.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "test_runner.hh"
#include "test_framework.hh"
+#include "test_runner.hh"
#include <paludis/util/stringify.hh>
#include <iostream>