aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-27 14:57:27 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-27 14:57:27 +0100
commit2d485c86590f0ef51b70916717b6fdbd11b9b5d2 (patch)
treee11c4de9c55bd11576c929462d6143289f017d13
parent4ba198eb4423a20e9e0acb06afffb0844be92e3e (diff)
downloadpaludis-2d485c86590f0ef51b70916717b6fdbd11b9b5d2.tar.gz
paludis-2d485c86590f0ef51b70916717b6fdbd11b9b5d2.tar.xz
gtest more
-rw-r--r--paludis/files.m42
-rw-r--r--paludis/filtered_generator_TEST.cc12
2 files changed, 6 insertions, 8 deletions
diff --git a/paludis/files.m4 b/paludis/files.m4
index e0bfdc7..42f5101 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -46,7 +46,7 @@ add(`environment_implementation', `hh', `cc', `gtest')
add(`file_output_manager', `hh', `cc', `fwd')
add(`filter', `hh', `cc', `fwd', `gtest')
add(`filter_handler', `hh', `cc', `fwd')
-add(`filtered_generator', `hh', `cc', `fwd', `test')
+add(`filtered_generator', `hh', `cc', `fwd', `gtest')
add(`format_messages_output_manager', `hh', `fwd', `cc')
add(`formatted_pretty_printer', `hh', `fwd', `cc')
add(`forward_at_finish_output_manager', `hh', `fwd', `cc')
diff --git a/paludis/filtered_generator_TEST.cc b/paludis/filtered_generator_TEST.cc
index c033452..acea508 100644
--- a/paludis/filtered_generator_TEST.cc
+++ b/paludis/filtered_generator_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -20,15 +20,13 @@
#include <paludis/filtered_generator.hh>
#include <paludis/filter.hh>
#include <paludis/generator.hh>
-#include <test/test_runner.hh>
-#include <test/test_framework.hh>
-#include <test/test_concepts.hh>
+
+#include <gtest/gtest.h>
using namespace paludis;
-using namespace test;
-namespace test_cases
+TEST(FilteredGenerator, Works)
{
- TESTCASE_SEMIREGULAR(FilteredGenerator, generator::All() | filter::All());
+ generator::All() | filter::All();
}