aboutsummaryrefslogtreecommitdiff
path: root/paludis/user_dep_spec_TEST.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/user_dep_spec_TEST.cc')
-rw-r--r--paludis/user_dep_spec_TEST.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/paludis/user_dep_spec_TEST.cc b/paludis/user_dep_spec_TEST.cc
index c76eed842..f3d1b787f 100644
--- a/paludis/user_dep_spec_TEST.cc
+++ b/paludis/user_dep_spec_TEST.cc
@@ -69,6 +69,11 @@ namespace
return "[." + result + "]";
}
+ std::string stringify_choice_constraint(const ChoiceConstraint & k)
+ {
+ return k.as_raw_string();
+ }
+
class UserDepSpecTest :
public testing::Test
{
@@ -176,15 +181,15 @@ UserDepSpecTest::check_spec(
}
if (additional_requirement.empty())
- EXPECT_TRUE((! spec.additional_requirements_ptr()) || spec.additional_requirements_ptr()->empty());
+ EXPECT_TRUE((! spec.all_choice_constraints()) || spec.all_choice_constraints()->empty());
else
{
- ASSERT_TRUE(bool(spec.additional_requirements_ptr()) || bool(spec.all_key_constraints()));
+ ASSERT_TRUE(bool(spec.all_choice_constraints()) || bool(spec.all_key_constraints()));
std::string x;
- if (spec.additional_requirements_ptr())
+ if (spec.all_choice_constraints())
x.append(stringify(join(
- indirect_iterator(spec.additional_requirements_ptr()->begin()),
- indirect_iterator(spec.additional_requirements_ptr()->end()), ", ")));
+ indirect_iterator(spec.all_choice_constraints()->begin()),
+ indirect_iterator(spec.all_choice_constraints()->end()), ", ", &stringify_choice_constraint)));
if (spec.all_key_constraints())
x.append(stringify(join(
indirect_iterator(spec.all_key_constraints()->begin()),