aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-26 20:39:50 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-26 20:39:50 +0000
commit1120c610800896e516cb2a27d6bfd85defb47970 (patch)
tree7a05183331c66d12a01241a735a7567c1dc7b83e
parent737aa23d23897fecf794e9ad4b4e620ce8bf3d71 (diff)
downloadpaludis-1120c610800896e516cb2a27d6bfd85defb47970.tar.gz
paludis-1120c610800896e516cb2a27d6bfd85defb47970.tar.xz
gtest more
-rw-r--r--paludis/repositories/e/Makefile.am4
-rw-r--r--paludis/repositories/e/fix_locked_dependencies_TEST.cc110
2 files changed, 56 insertions, 58 deletions
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index d508509..128d6c9 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -428,13 +428,15 @@ source_uri_finder_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
fix_locked_dependencies_TEST_SOURCES = fix_locked_dependencies_TEST.cc
fix_locked_dependencies_TEST_LDADD = \
- $(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
+ $(top_builddir)/paludis/util/gtest_runner.o \
$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
fix_locked_dependencies_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
+fix_locked_dependencies_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
+
ebuild_flat_metadata_cache_TEST_SOURCES = ebuild_flat_metadata_cache_TEST.cc
ebuild_flat_metadata_cache_TEST_LDADD = \
diff --git a/paludis/repositories/e/fix_locked_dependencies_TEST.cc b/paludis/repositories/e/fix_locked_dependencies_TEST.cc
index 74f8a1a..dabe800 100644
--- a/paludis/repositories/e/fix_locked_dependencies_TEST.cc
+++ b/paludis/repositories/e/fix_locked_dependencies_TEST.cc
@@ -21,73 +21,69 @@
#include <paludis/repositories/e/dep_parser.hh>
#include <paludis/repositories/e/eapi.hh>
#include <paludis/repositories/e/spec_tree_pretty_printer.hh>
+
#include <paludis/repositories/fake/fake_package_id.hh>
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/repositories/fake/fake_installed_repository.hh>
+
#include <paludis/environments/test/test_environment.hh>
+
#include <paludis/util/make_named_values.hh>
+#include <paludis/util/stringify.hh>
+
#include <paludis/unformatted_pretty_printer.hh>
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
-using namespace test;
+#include <gtest/gtest.h>
+
using namespace paludis;
using namespace paludis::erepository;
-namespace test_cases
+TEST(FixLockedDependencies, Works)
{
- struct FixLockedDependenciesTest : TestCase
- {
- FixLockedDependenciesTest() : TestCase("fix locked dependencies") { }
-
- void run()
- {
- TestEnvironment env;
- const std::shared_ptr<FakeRepository> repo(std::make_shared<FakeRepository>(make_named_values<FakeRepositoryParams>(
- n::environment() = &env,
- n::name() = RepositoryName("repo")
- )));
- env.add_repository(1, repo);
- std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
-
- std::shared_ptr<FakeInstalledRepository> installed_repo(std::make_shared<FakeInstalledRepository>(
- make_named_values<FakeInstalledRepositoryParams>(
- n::environment() = &env,
- n::name() = RepositoryName("installed"),
- n::suitable_destination() = true,
- n::supports_uninstall() = true
- )));
- env.add_repository(2, installed_repo);
- installed_repo->add_version("cat", "installed", "1")->set_slot(SlotName("monkey"));
-
- std::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string("paludis-1"));
-
- std::shared_ptr<const DependencySpecTree> bb(parse_depend(
- "|| ( foo/bar ( bar/baz oink/squeak ) ) blah/blah", &env, *eapi, false)),
- aa(fix_locked_dependencies(&env, *eapi, id, bb));
-
- UnformattedPrettyPrinter ff;
- SpecTreePrettyPrinter
- a(ff, { }),
- b(ff, { });
- aa->top()->accept(a);
- bb->top()->accept(b);
-
- TEST_CHECK_STRINGIFY_EQUAL(a, b);
-
- std::shared_ptr<const DependencySpecTree> cc(parse_depend(
- "foo/bar:= cat/installed:= >=cat/installed-1.2:= <=cat/installed-1.2:=", &env, *eapi, false)),
- dd(fix_locked_dependencies(&env, *eapi, id, cc));
-
- SpecTreePrettyPrinter
- c(ff, { }),
- d(ff, { });
- cc->top()->accept(c);
- dd->top()->accept(d);
-
- TEST_CHECK_STRINGIFY_EQUAL(c, "foo/bar:= cat/installed:= >=cat/installed-1.2:= <=cat/installed-1.2:=");
- TEST_CHECK_STRINGIFY_EQUAL(d, "foo/bar:= cat/installed:=monkey >=cat/installed-1.2:= <=cat/installed-1.2:=monkey");
- }
- } test_fix_locked_dependencies;
+ TestEnvironment env;
+ const std::shared_ptr<FakeRepository> repo(std::make_shared<FakeRepository>(make_named_values<FakeRepositoryParams>(
+ n::environment() = &env,
+ n::name() = RepositoryName("repo")
+ )));
+ env.add_repository(1, repo);
+ std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
+
+ std::shared_ptr<FakeInstalledRepository> installed_repo(std::make_shared<FakeInstalledRepository>(
+ make_named_values<FakeInstalledRepositoryParams>(
+ n::environment() = &env,
+ n::name() = RepositoryName("installed"),
+ n::suitable_destination() = true,
+ n::supports_uninstall() = true
+ )));
+ env.add_repository(2, installed_repo);
+ installed_repo->add_version("cat", "installed", "1")->set_slot(SlotName("monkey"));
+
+ std::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string("paludis-1"));
+
+ std::shared_ptr<const DependencySpecTree> bb(parse_depend(
+ "|| ( foo/bar ( bar/baz oink/squeak ) ) blah/blah", &env, *eapi, false)),
+ aa(fix_locked_dependencies(&env, *eapi, id, bb));
+
+ UnformattedPrettyPrinter ff;
+ SpecTreePrettyPrinter
+ a(ff, { }),
+ b(ff, { });
+ aa->top()->accept(a);
+ bb->top()->accept(b);
+
+ EXPECT_EQ(stringify(b), stringify(a));
+
+ std::shared_ptr<const DependencySpecTree> cc(parse_depend(
+ "foo/bar:= cat/installed:= >=cat/installed-1.2:= <=cat/installed-1.2:=", &env, *eapi, false)),
+ dd(fix_locked_dependencies(&env, *eapi, id, cc));
+
+ SpecTreePrettyPrinter
+ c(ff, { }),
+ d(ff, { });
+ cc->top()->accept(c);
+ dd->top()->accept(d);
+
+ EXPECT_EQ("foo/bar:= cat/installed:= >=cat/installed-1.2:= <=cat/installed-1.2:=", stringify(c));
+ EXPECT_EQ("foo/bar:= cat/installed:=monkey >=cat/installed-1.2:= <=cat/installed-1.2:=monkey", stringify(d));
}