aboutsummaryrefslogtreecommitdiff
path: root/paludis/dep_list/dep_list_TEST.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/dep_list/dep_list_TEST.cc')
-rw-r--r--paludis/dep_list/dep_list_TEST.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/paludis/dep_list/dep_list_TEST.cc b/paludis/dep_list/dep_list_TEST.cc
index 768578c..454aa50 100644
--- a/paludis/dep_list/dep_list_TEST.cc
+++ b/paludis/dep_list/dep_list_TEST.cc
@@ -1563,7 +1563,7 @@ namespace test_cases
installed_repo->add_version("cat", "two", "2");
DepList d(&env, DepListOptions());
- d.options.fall_back = dl_fall_back_never;
+ d.options()->fall_back = dl_fall_back_never;
TEST_CHECK_THROWS(d.add(PortageDepParser::parse("cat/one")), DepListError);
}
} test_dep_list_fall_back_never;
@@ -1589,7 +1589,7 @@ namespace test_cases
installed_repo->add_version("cat", "two", "2");
DepList d(&env, DepListOptions());
- d.options.fall_back = dl_fall_back_as_needed;
+ d.options()->fall_back = dl_fall_back_as_needed;
d.add(PortageDepParser::parse("cat/one"));
d.add(PortageDepParser::parse("cat/two"));
TEST_CHECK_EQUAL(join(d.begin(), d.end(), " "), "cat/two-2:0::installed_repo cat/one-1:0::repo");
@@ -1618,21 +1618,21 @@ namespace test_cases
installed_repo->add_version("cat", "three", "3");
DepList d1(&env, DepListOptions());
- d1.options.fall_back = dl_fall_back_as_needed_except_targets;
+ d1.options()->fall_back = dl_fall_back_as_needed_except_targets;
d1.add(PortageDepParser::parse("cat/one"));
TEST_CHECK_EQUAL(join(d1.begin(), d1.end(), " "), "cat/two-2:0::installed_repo cat/one-1:0::repo");
TEST_CHECK_THROWS(d1.add(PortageDepParser::parse("cat/three")), DepListError);
DepList d2(&env, DepListOptions());
- d2.options.fall_back = dl_fall_back_as_needed_except_targets;
+ d2.options()->fall_back = dl_fall_back_as_needed_except_targets;
TEST_CHECK_THROWS(d2.add(PortageDepParser::parse("cat/two")), DepListError);
DepList d3(&env, DepListOptions());
- d3.options.fall_back = dl_fall_back_as_needed_except_targets;
+ d3.options()->fall_back = dl_fall_back_as_needed_except_targets;
TEST_CHECK_THROWS(d3.add(PortageDepParser::parse("( cat/one cat/two )")), DepListError);
DepList d4(&env, DepListOptions());
- d4.options.fall_back = dl_fall_back_as_needed_except_targets;
+ d4.options()->fall_back = dl_fall_back_as_needed_except_targets;
TEST_CHECK_THROWS(d4.add(PortageDepParser::parse("( cat/one cat/three )")), DepListError);
}
} test_dep_list_fall_back_as_needed_not_targets;
@@ -1659,12 +1659,12 @@ namespace test_cases
installed_repo->add_version("cat", "two", "0");
DepList d1(&env, DepListOptions());
- d1.options.upgrade = dl_upgrade_as_needed;
+ d1.options()->upgrade = dl_upgrade_as_needed;
d1.add(PortageDepParser::parse("cat/one"));
TEST_CHECK_EQUAL(join(d1.begin(), d1.end(), " "), "cat/two-0:0::installed_repo cat/one-1:0::repo");
DepList d2(&env, DepListOptions());
- d2.options.upgrade = dl_upgrade_as_needed;
+ d2.options()->upgrade = dl_upgrade_as_needed;
d2.add(PortageDepParser::parse("( cat/one cat/two )"));
TEST_CHECK_EQUAL(join(d2.begin(), d2.end(), " "), "cat/two-2:0::repo cat/one-1:0::repo");
}
@@ -1701,7 +1701,7 @@ namespace test_cases
installed_repo->add_version("cat", "five-svn", "0");
DepList d1(&env, DepListOptions());
- d1.options.reinstall_scm = dl_reinstall_scm_always;
+ d1.options()->reinstall_scm = dl_reinstall_scm_always;
d1.add(PortageDepParser::parse("cat/zero"));
TEST_CHECK_EQUAL(join(d1.begin(), d1.end(), " "), "cat/one-scm:0::repo cat/two-2:0::installed_repo "
"cat/three-live-0:0::repo cat/four-cvs-0:0::repo cat/five-svn-0:0::repo cat/zero-1:0::repo");