lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix some bounds in rapid check instances

Browse source 
`inRange` is exclusive not inclusive:
https://github.com/emil-e/rapidcheck/blob/master/doc/generators.md#usage

Furthermore, use `std::variant_size_v` so we use the right number
automatically.

Finally, make the `switch` assert the discriminant is in bounds as
expected.
This commit is contained in:
John Ericson 2023-05-11 23:22:35 -04:00
parent 0c49c1af28
commit bbd7d5de09
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/tests/value/context.cc
View file

@ -95,13 +95,15 @@ Gen<NixStringContextElem::Built> Arbitrary<NixStringContextElem::Built>::arbitra
Gen<NixStringContextElem> Arbitrary<NixStringContextElem>::arbitrary() Gen<NixStringContextElem> Arbitrary<NixStringContextElem>::arbitrary()
{ {
switch (*gen::inRange<uint8_t>(0, 2)) { switch (*gen::inRange<uint8_t>(0, std::variant_size_v<NixStringContextElem::Raw>)) {
case 0: case 0:
return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::Opaque>()); return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::Opaque>());
case 1: case 1:
return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::DrvDeep>()); return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::DrvDeep>());
default: case 2:
return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::Built>()); return gen::just<NixStringContextElem>(*gen::arbitrary<NixStringContextElem::Built>());
default:
assert(false);
} }
} }

6
src/libstore/tests/derived-path.cc
View file

@ -27,11 +27,13 @@ Gen<DerivedPath::Built> Arbitrary<DerivedPath::Built>::arbitrary()
Gen<DerivedPath> Arbitrary<DerivedPath>::arbitrary() Gen<DerivedPath> Arbitrary<DerivedPath>::arbitrary()
{ {
switch (*gen::inRange<uint8_t>(0, 1)) { switch (*gen::inRange<uint8_t>(0, std::variant_size_v<DerivedPath::Raw>)) {
case 0: case 0:
return gen::just<DerivedPath>(*gen::arbitrary<DerivedPath::Opaque>()); return gen::just<DerivedPath>(*gen::arbitrary<DerivedPath::Opaque>());
default: case 1:
return gen::just<DerivedPath>(*gen::arbitrary<DerivedPath::Built>()); return gen::just<DerivedPath>(*gen::arbitrary<DerivedPath::Built>());
default:
assert(false);
} }
} }

6
src/libstore/tests/outputs-spec.cc
View file

@ -206,15 +206,17 @@ using namespace nix;
Gen<OutputsSpec> Arbitrary<OutputsSpec>::arbitrary() Gen<OutputsSpec> Arbitrary<OutputsSpec>::arbitrary()
{ {
switch (*gen::inRange<uint8_t>(0, 1)) { switch (*gen::inRange<uint8_t>(0, std::variant_size_v<OutputsSpec::Raw>)) {
case 0: case 0:
return gen::just((OutputsSpec) OutputsSpec::All { }); return gen::just((OutputsSpec) OutputsSpec::All { });
default: case 1:
return gen::just((OutputsSpec) OutputsSpec::Names { return gen::just((OutputsSpec) OutputsSpec::Names {
*gen::nonEmpty(gen::container<StringSet>(gen::map( *gen::nonEmpty(gen::container<StringSet>(gen::map(
gen::arbitrary<StorePathName>(), gen::arbitrary<StorePathName>(),
[](StorePathName n) { return n.name; }))), [](StorePathName n) { return n.name; }))),
}); });
default:
assert(false);
} }
} }