aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-02-04 23:15:32 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-02-04 23:15:32 +0000
commit252ffe6b427c88b8023884c17d2d72c47a9957b5 (patch)
tree0c6ac97918c2290fa7f417be2a2112c202e9adb4
parent0d56e4d7733f30729ce610f46011d56526f069f2 (diff)
downloadpaludis-252ffe6b427c88b8023884c17d2d72c47a9957b5.tar.gz
paludis-252ffe6b427c88b8023884c17d2d72c47a9957b5.tar.xz
Support slot deps. Add test cases for package_dep_atom.
-rw-r--r--paludis/files.m42
-rw-r--r--paludis/package_dep_atom.cc13
-rw-r--r--paludis/package_dep_atom_TEST.cc63
3 files changed, 75 insertions, 3 deletions
diff --git a/paludis/files.m4 b/paludis/files.m4
index 8aa7cf9..980d779 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -55,7 +55,7 @@ add(`log', `hh', `cc', `test')
add(`mask_reasons', `hh', `cc')
add(`match_package', `hh', `cc')
add(`package_database', `hh', `cc', `test')
-add(`package_dep_atom', `hh', `cc')
+add(`package_dep_atom', `hh', `cc', `test')
add(`package_name_part', `hh', `cc', `test')
add(`paludis', `hh', `cc')
add(`portage_repository', `hh', `cc')
diff --git a/paludis/package_dep_atom.cc b/paludis/package_dep_atom.cc
index 638a529..665a917 100644
--- a/paludis/package_dep_atom.cc
+++ b/paludis/package_dep_atom.cc
@@ -47,19 +47,28 @@ PackageDepAtom::PackageDepAtom(
{
}
-PackageDepAtom::PackageDepAtom(const std::string & s) :
+PackageDepAtom::PackageDepAtom(const std::string & ss) :
_package(CategoryNamePart("later"), PackageNamePart("later")),
_version_operator("="),
_version_spec(0),
_slot(0)
{
- Context context("When parsing package dep atom '" + s + "':");
+ Context context("When parsing package dep atom '" + ss + "':");
try
{
+ std::string s(ss);
+
if (s.empty())
throw InternalError(PALUDIS_HERE, "todo"); /// \bug
+ std::string::size_type slot_p;
+ if (std::string::npos != ((slot_p = s.rfind(':'))))
+ {
+ _slot.assign(new SlotName(s.substr(slot_p + 1)));
+ s.erase(slot_p);
+ }
+
if (std::string::npos != std::string("<>=~").find(s.at(0)))
{
std::string::size_type p(1);
diff --git a/paludis/package_dep_atom_TEST.cc b/paludis/package_dep_atom_TEST.cc
new file mode 100644
index 0000000..e1e1d6d
--- /dev/null
+++ b/paludis/package_dep_atom_TEST.cc
@@ -0,0 +1,63 @@
+/* vim: set sw=4 sts=4 et foldmethod=syntax : */
+
+/*
+ * Copyright (c) 2006 Ciaran McCreesh <ciaranm@gentoo.org>
+ *
+ * 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
+ * Public License version 2, as published by the Free Software Foundation.
+ *
+ * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "package_dep_atom.hh"
+#include <test/test_framework.hh>
+#include <test/test_runner.hh>
+
+using namespace paludis;
+using namespace test;
+
+namespace test_cases
+{
+ struct PackageDepAtomTest : TestCase
+ {
+ PackageDepAtomTest() : TestCase("package dep atom") { }
+
+ void run()
+ {
+ PackageDepAtom a("foo/bar");
+ TEST_CHECK_STRINGIFY_EQUAL(a.package(), "foo/bar");
+ TEST_CHECK(! a.slot_ptr());
+ TEST_CHECK(! a.version_spec_ptr());
+
+ PackageDepAtom b(">=foo/bar-1.2.3");
+ TEST_CHECK_STRINGIFY_EQUAL(b.package(), "foo/bar");
+ TEST_CHECK(! b.slot_ptr());
+ TEST_CHECK(b.version_spec_ptr());
+ TEST_CHECK_STRINGIFY_EQUAL(*b.version_spec_ptr(), "1.2.3");
+ TEST_CHECK_EQUAL(b.version_operator(), vo_greater_equal);
+
+ PackageDepAtom c("foo/bar:baz");
+ TEST_CHECK_STRINGIFY_EQUAL(c.package(), "foo/bar");
+ TEST_CHECK(c.slot_ptr());
+ TEST_CHECK_STRINGIFY_EQUAL(*c.slot_ptr(), "baz");
+ TEST_CHECK(! c.version_spec_ptr());
+
+ PackageDepAtom d("=foo/bar-1.2*:1.2.1");
+ TEST_CHECK_STRINGIFY_EQUAL(d.package(), "foo/bar");
+ TEST_CHECK(d.slot_ptr());
+ TEST_CHECK_STRINGIFY_EQUAL(*d.slot_ptr(), "1.2.1");
+ TEST_CHECK(d.version_spec_ptr());
+ TEST_CHECK_STRINGIFY_EQUAL(*d.version_spec_ptr(), "1.2");
+ TEST_CHECK_EQUAL(d.version_operator(), vo_equal_star);
+ }
+ } test_package_dep_atom;
+}
+