diff options
author | 2011-03-20 12:52:07 +0000 | |
---|---|---|
committer | 2011-03-20 16:20:41 +0000 | |
commit | a9311ad5b670a53daf9e9767af2ff795ff890110 (patch) | |
tree | 6417e583ba552ea6c62a6af572756862653cd49e | |
parent | 549dc011420fa1a14b5b62a802db2cdf5a965412 (diff) | |
download | paludis-a9311ad5b670a53daf9e9767af2ff795ff890110.tar.gz paludis-a9311ad5b670a53daf9e9767af2ff795ff890110.tar.xz |
gtest more
-rw-r--r-- | paludis/util/files.m4 | 2 | ||||
-rw-r--r-- | paludis/util/wildcard_expander_TEST.cc | 116 |
2 files changed, 53 insertions, 65 deletions
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4 index 194cd7ff4..7f76816b7 100644 --- a/paludis/util/files.m4 +++ b/paludis/util/files.m4 @@ -93,7 +93,7 @@ add(`type_list', `hh', `cc', `fwd') add(`util', `hh') add(`visitor', `hh', `cc', `fwd', `impl') add(`visitor_cast', `hh', `cc', `fwd') -add(`wildcard_expander', `hh', `cc', `test', `testscript') +add(`wildcard_expander', `hh', `cc', `gtest', `testscript') add(`wrapped_forward_iterator', `hh', `fwd', `impl', `gtest') add(`wrapped_output_iterator', `hh', `fwd', `impl') add(`wrapped_value', `hh', `fwd', `impl', `gtest') diff --git a/paludis/util/wildcard_expander_TEST.cc b/paludis/util/wildcard_expander_TEST.cc index 0626f24e4..08e1da6e6 100644 --- a/paludis/util/wildcard_expander_TEST.cc +++ b/paludis/util/wildcard_expander_TEST.cc @@ -2,6 +2,7 @@ /* * Copyright (c) 2007 David Leverton + * Copyright (c) 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 @@ -21,81 +22,68 @@ #include <paludis/util/fs_path.hh> #include <paludis/util/join.hh> -#include <test/test_runner.hh> -#include <test/test_framework.hh> +#include <gtest/gtest.h> -using namespace test; using namespace paludis; -namespace test_cases +namespace { - struct WildcardExpanderGeneralTest : TestCase + std::string expand(const std::string & pattern) { - WildcardExpanderGeneralTest() : TestCase("WildcardExpander general") {} - - std::string expand(const std::string & pattern) - { - return join(WildcardExpander(pattern, FSPath::cwd() / "wildcard_expander_TEST_dir"), - WildcardExpander(), " "); - } - - void run() - { - TEST_CHECK_EQUAL(expand("/xyz*zy"), "/xyz1zy /xyz22zy /xyzzy"); - TEST_CHECK_EQUAL(expand("/plugh"), "/plugh"); - TEST_CHECK_EQUAL(expand("/quux"), "/quux"); - TEST_CHECK_EQUAL(expand("/quux*quux"), "/quux*quux"); - TEST_CHECK_EQUAL(expand("/meh/?"), "/meh/1 /meh/2 /meh/3"); - TEST_CHECK_EQUAL(expand("/foo*\\*"), "/foo* /foo123*"); - TEST_CHECK_EQUAL(expand("/foo\\*"), "/foo*"); - } - } wildcard_expander_general_test; + return join(WildcardExpander(pattern, FSPath::cwd() / "wildcard_expander_TEST_dir"), + WildcardExpander(), " "); + } +} - struct WildcardExpanderIteratorSanityTest : TestCase - { - WildcardExpanderIteratorSanityTest() : TestCase("WildcardExpander iterator sanity") {} +TEST(WildcardExpander, Works) +{ + EXPECT_EQ("/xyz1zy /xyz22zy /xyzzy", expand("/xyz*zy")); + EXPECT_EQ("/plugh", expand("/plugh")); + EXPECT_EQ("/quux", expand("/quux")); + EXPECT_EQ("/quux*quux", expand("/quux*quux")); + EXPECT_EQ("/meh/1 /meh/2 /meh/3", expand("/meh/?")); + EXPECT_EQ("/foo* /foo123*", expand("/foo*\\*")); + EXPECT_EQ("/foo*", expand("/foo\\*")); +} - void run() - { - WildcardExpander it("/foo*bar", FSPath::cwd() / "wildcard_expander_TEST_dir"); - TEST_CHECK(it == it); - TEST_CHECK(! (it != it)); - TEST_CHECK(it != WildcardExpander()); - TEST_CHECK_STRINGIFY_EQUAL(*it, "/fooAbar"); - TEST_CHECK_EQUAL(it->basename(), "fooAbar"); +TEST(WildcardExpander, IteratorSanity) +{ + WildcardExpander it("/foo*bar", FSPath::cwd() / "wildcard_expander_TEST_dir"); + ASSERT_TRUE(it == it); + ASSERT_TRUE(! (it != it)); + ASSERT_TRUE(it != WildcardExpander()); + EXPECT_EQ("/fooAbar", stringify(*it)); + EXPECT_EQ(it->basename(), "fooAbar"); - WildcardExpander it2(it); - TEST_CHECK(it == it2); - TEST_CHECK(! (it != it2)); - TEST_CHECK(it2 != WildcardExpander()); - TEST_CHECK_STRINGIFY_EQUAL(*++it2, "/fooBbar"); - TEST_CHECK_STRINGIFY_EQUAL(*it2, "/fooBbar"); - TEST_CHECK_EQUAL(it2->basename(), "fooBbar"); - TEST_CHECK(it != it2); - TEST_CHECK(! (it == it2)); - TEST_CHECK(it2 != WildcardExpander()); + WildcardExpander it2(it); + ASSERT_TRUE(it == it2); + ASSERT_TRUE(! (it != it2)); + ASSERT_TRUE(it2 != WildcardExpander()); + EXPECT_EQ("/fooBbar", stringify(*++it2)); + EXPECT_EQ("/fooBbar", stringify(*it2)); + EXPECT_EQ(it2->basename(), "fooBbar"); + ASSERT_TRUE(it != it2); + ASSERT_TRUE(! (it == it2)); + ASSERT_TRUE(it2 != WildcardExpander()); - WildcardExpander it3(it2); - TEST_CHECK(it2 == it3++); - TEST_CHECK(it2 != it3); - TEST_CHECK(it3 != WildcardExpander()); - TEST_CHECK_STRINGIFY_EQUAL(*it3, "/fooCbar"); - TEST_CHECK_EQUAL(it3->basename(), "fooCbar"); + WildcardExpander it3(it2); + ASSERT_TRUE(it2 == it3++); + ASSERT_TRUE(it2 != it3); + ASSERT_TRUE(it3 != WildcardExpander()); + EXPECT_EQ("/fooCbar", stringify(*it3)); + EXPECT_EQ(it3->basename(), "fooCbar"); - it3 = it2; - TEST_CHECK(it2 == it3); - TEST_CHECK_STRINGIFY_EQUAL(*it3, "/fooBbar"); - TEST_CHECK_STRINGIFY_EQUAL(*it3++, "/fooBbar"); - TEST_CHECK(it3 != WildcardExpander()); + it3 = it2; + ASSERT_TRUE(it2 == it3); + EXPECT_EQ("/fooBbar", stringify(*it3)); + EXPECT_EQ("/fooBbar", stringify(*it3++)); + ASSERT_TRUE(it3 != WildcardExpander()); - TEST_CHECK(++it3 != WildcardExpander()); - TEST_CHECK(++it3 != WildcardExpander()); - TEST_CHECK(++it3 == WildcardExpander()); + ASSERT_TRUE(++it3 != WildcardExpander()); + ASSERT_TRUE(++it3 != WildcardExpander()); + ASSERT_TRUE(++it3 == WildcardExpander()); - TEST_CHECK_EQUAL(join(WildcardExpander("/foo*bar", FSPath::cwd() / "wildcard_expander_TEST_dir"), - WildcardExpander(), " "), - "/fooAbar /fooBbar /fooCbar /fooDbar /fooEbar"); - } - } wildcard_expander_iterator_sanity_test; + EXPECT_EQ("/fooAbar /fooBbar /fooCbar /fooDbar /fooEbar", + join(WildcardExpander("/foo*bar", FSPath::cwd() / "wildcard_expander_TEST_dir"), WildcardExpander(), " ")); } |