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

libexpr: use eval() for builtin-using value printer tests

Browse source 
if we're relying on the behavior of builtins we can also use the parser.

Change-Id: I682722b2a22fbb6e748da2cab1bfeb76788bfb48
This commit is contained in:
eldritch horrors 2024-11-27 02:09:08 +01:00
parent 12802b492a
commit 1ed0814859
1 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
tests/unit/libexpr/value/print.cc
View file

@ -458,13 +458,11 @@ TEST_F(ValuePrintingTests, ansiColorsDerivation)
TEST_F(ValuePrintingTests, ansiColorsError) TEST_F(ValuePrintingTests, ansiColorsError)
{ {
Value throw_ = state.getBuiltin("throw");
Value message;
message.mkString("uh oh!");
Value vError; Value vError;
vError.mkApp(&throw_, &message); auto & e = state.parseExprFromString("{ a = throw \"uh oh!\"; }", {CanonPath::root});
state.eval(e, vError);
test(vError, test(*vError.attrs->begin()->value,
ANSI_RED ANSI_RED
"«error: uh oh!»" "«error: uh oh!»"
ANSI_NORMAL, ANSI_NORMAL,
@ -476,21 +474,11 @@ TEST_F(ValuePrintingTests, ansiColorsError)
TEST_F(ValuePrintingTests, ansiColorsDerivationError) TEST_F(ValuePrintingTests, ansiColorsDerivationError)
{ {
Value throw_ = state.getBuiltin("throw");
Value message;
message.mkString("uh oh!");
Value vError;
vError.mkApp(&throw_, &message);
Value vDerivation;
vDerivation.mkString("derivation");
BindingsBuilder builder = state.buildBindings(10);
builder.insert(state.s.type, &vDerivation);
builder.insert(state.s.drvPath, &vError);
Value vAttrs; Value vAttrs;
vAttrs.mkAttrs(builder.finish()); auto & e = state.parseExprFromString(
"{ type = \"derivation\"; drvPath = throw \"uh oh!\"; }", {CanonPath::root}
);
state.eval(e, vAttrs);
test(vAttrs, test(vAttrs,
"{ drvPath = " "{ drvPath = "
@ -520,15 +508,12 @@ TEST_F(ValuePrintingTests, ansiColorsDerivationError)
TEST_F(ValuePrintingTests, ansiColorsAssert) TEST_F(ValuePrintingTests, ansiColorsAssert)
{ {
ExprAssert expr(noPos, auto & e = state.parseExprFromString("{ a = assert false; 1; }", {CanonPath::root});
std::make_unique<ExprVar>(state.symbols.create("false")),
std::make_unique<ExprInt>(1));
expr.bindVars(state, state.staticBaseEnv);
Value v; Value v;
state.mkThunk_(v, expr); state.eval(e, v);
test(v, ASSERT_EQ(v.type(), nAttrs);
test(*v.attrs->begin()->value,
ANSI_RED "«error: assertion 'false' failed»" ANSI_NORMAL, ANSI_RED "«error: assertion 'false' failed»" ANSI_NORMAL,
PrintOptions { PrintOptions {
.ansiColors = true, .ansiColors = true,