diff options
Diffstat (limited to 'tests/test_choice.cc')
| -rw-r--r-- | tests/test_choice.cc | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/tests/test_choice.cc b/tests/test_choice.cc index bc193a15..efaa5d66 100644 --- a/tests/test_choice.cc +++ b/tests/test_choice.cc @@ -67,9 +67,9 @@ class Choice_Test : public CppUnit::TestFixture return choice::make_install_version(v, -1); } - static choice make_install_version(const version &v, bool dep_scoped, const dep &d) + static choice make_install_version(const version &v, const dep &d) { - return choice::make_install_version(v, dep_scoped, d, -1); + return choice::make_install_version(v, d, -1); } static choice make_install_version_from_dep_source(const version &v, const dep &d) @@ -110,8 +110,7 @@ public: const choice cav1 = make_install_version(av1); const choice cav1av2d1 = make_install_version_from_dep_source(av1, av2d1); - const choice cav1av2d1_scoped = make_install_version(av1, true, av2d1); - const choice cav1av2d1_unscoped = make_install_version(av1, false, av2d1); + const choice cav1av2d1_unscoped = make_install_version(av1, av2d1); const choice cav1av3d1 = make_install_version_from_dep_source(av1, av3d1); const choice cav2 = make_install_version(av2); const choice cbv1 = make_install_version(bv1); @@ -121,7 +120,6 @@ public: // Check that all the containment relations here are correct. CPPUNIT_ASSERT(cav1.contains(cav1)); CPPUNIT_ASSERT(cav1.contains(cav1av2d1)); - CPPUNIT_ASSERT(cav1.contains(cav1av2d1_scoped)); CPPUNIT_ASSERT(cav1.contains(cav1av2d1_unscoped)); CPPUNIT_ASSERT(cav1.contains(cav1av3d1)); CPPUNIT_ASSERT(!cav1.contains(cav2)); @@ -131,7 +129,6 @@ public: CPPUNIT_ASSERT(!cav1av2d1.contains(cav1)); CPPUNIT_ASSERT(cav1av2d1.contains(cav1av2d1)); - CPPUNIT_ASSERT(!cav1av2d1.contains(cav1av2d1_scoped)); CPPUNIT_ASSERT(!cav1av2d1.contains(cav1av2d1_unscoped)); CPPUNIT_ASSERT(!cav1av2d1.contains(cav1av3d1)); CPPUNIT_ASSERT(!cav1av2d1.contains(cav2)); @@ -139,19 +136,8 @@ public: CPPUNIT_ASSERT(!cav1av2d1.contains(cav1d1)); CPPUNIT_ASSERT(!cav1av2d1.contains(cav2d1)); - CPPUNIT_ASSERT(!cav1av2d1_scoped.contains(cav1)); - CPPUNIT_ASSERT(cav1av2d1_scoped.contains(cav1av2d1)); - CPPUNIT_ASSERT(cav1av2d1_scoped.contains(cav1av2d1_scoped)); - CPPUNIT_ASSERT(cav1av2d1_scoped.contains(cav1av2d1_unscoped)); - CPPUNIT_ASSERT(!cav1av2d1_scoped.contains(cav1av3d1)); - CPPUNIT_ASSERT(!cav1av2d1_scoped.contains(cav2)); - CPPUNIT_ASSERT(!cav1av2d1_scoped.contains(cbv1)); - CPPUNIT_ASSERT(!cav1av2d1_scoped.contains(cav1d1)); - CPPUNIT_ASSERT(!cav1av2d1_scoped.contains(cav2d1)); - CPPUNIT_ASSERT(cav1av2d1_unscoped.contains(cav1)); CPPUNIT_ASSERT(cav1av2d1_unscoped.contains(cav1av2d1)); - CPPUNIT_ASSERT(cav1av2d1_unscoped.contains(cav1av2d1_scoped)); CPPUNIT_ASSERT(cav1av2d1_unscoped.contains(cav1av2d1_unscoped)); CPPUNIT_ASSERT(cav1av2d1_unscoped.contains(cav1av3d1)); CPPUNIT_ASSERT(!cav1av2d1_unscoped.contains(cav2)); @@ -161,7 +147,6 @@ public: CPPUNIT_ASSERT(!cav1av3d1.contains(cav1)); CPPUNIT_ASSERT(!cav1av3d1.contains(cav1av2d1)); - CPPUNIT_ASSERT(!cav1av3d1.contains(cav1av2d1_scoped)); CPPUNIT_ASSERT(!cav1av3d1.contains(cav1av2d1_unscoped)); CPPUNIT_ASSERT(cav1av3d1.contains(cav1av3d1)); CPPUNIT_ASSERT(!cav1av3d1.contains(cav2)); @@ -173,7 +158,6 @@ public: CPPUNIT_ASSERT(!cav2.contains(cav1)); CPPUNIT_ASSERT(!cav2.contains(cav1av2d1)); - CPPUNIT_ASSERT(!cav2.contains(cav1av2d1_scoped)); CPPUNIT_ASSERT(!cav2.contains(cav1av2d1_unscoped)); CPPUNIT_ASSERT(!cav2.contains(cav1av3d1)); CPPUNIT_ASSERT(cav2.contains(cav2)); @@ -183,7 +167,6 @@ public: CPPUNIT_ASSERT(!cbv1.contains(cav1)); CPPUNIT_ASSERT(!cbv1.contains(cav1av2d1)); - CPPUNIT_ASSERT(!cbv1.contains(cav1av2d1_scoped)); CPPUNIT_ASSERT(!cbv1.contains(cav1av2d1_unscoped)); CPPUNIT_ASSERT(!cbv1.contains(cav1av3d1)); CPPUNIT_ASSERT(!cbv1.contains(cav2)); @@ -193,7 +176,6 @@ public: CPPUNIT_ASSERT(!cav1d1.contains(cav1)); CPPUNIT_ASSERT(!cav1d1.contains(cav1av2d1)); - CPPUNIT_ASSERT(!cav1d1.contains(cav1av2d1_scoped)); CPPUNIT_ASSERT(!cav1d1.contains(cav1av2d1_unscoped)); CPPUNIT_ASSERT(!cav1d1.contains(cav1av3d1)); CPPUNIT_ASSERT(!cav1d1.contains(cav2)); @@ -203,7 +185,6 @@ public: CPPUNIT_ASSERT(!cav2d1.contains(cav1)); CPPUNIT_ASSERT(!cav2d1.contains(cav1av2d1)); - CPPUNIT_ASSERT(!cav2d1.contains(cav1av2d1_scoped)); CPPUNIT_ASSERT(!cav2d1.contains(cav1av2d1_unscoped)); CPPUNIT_ASSERT(!cav2d1.contains(cav1av3d1)); CPPUNIT_ASSERT(!cav2d1.contains(cav2)); |