From f1e4c6c4d466188c058e1be54aacb874e16a9660 Mon Sep 17 00:00:00 2001 From: aserkes Date: Wed, 1 Mar 2023 14:38:43 +0100 Subject: [PATCH] fix failed test Signed-off-by: aserkes --- .../build/archetype/engine/v2/util/ArchetypeValidator.java | 4 ++-- .../helidon/build/archetype/engine/v2/ast/ExpressionTest.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/archetype/engine-v2/src/main/java/io/helidon/build/archetype/engine/v2/util/ArchetypeValidator.java b/archetype/engine-v2/src/main/java/io/helidon/build/archetype/engine/v2/util/ArchetypeValidator.java index cd49587fe..6c78d3195 100644 --- a/archetype/engine-v2/src/main/java/io/helidon/build/archetype/engine/v2/util/ArchetypeValidator.java +++ b/archetype/engine-v2/src/main/java/io/helidon/build/archetype/engine/v2/util/ArchetypeValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. + * Copyright (c) 2022, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -171,7 +171,7 @@ public VisitResult visitCondition(Condition condition, Context ctx) { default: throw new IllegalStateException("Bad input type"); } - }); + }).asBoolean(); } catch (Expression.UnresolvedVariableException ex) { errors.add(String.format("%s %s: '%s'", condition.location(), diff --git a/archetype/engine-v2/src/test/java/io/helidon/build/archetype/engine/v2/ast/ExpressionTest.java b/archetype/engine-v2/src/test/java/io/helidon/build/archetype/engine/v2/ast/ExpressionTest.java index 0e1a56c96..cb0ef3d0b 100644 --- a/archetype/engine-v2/src/test/java/io/helidon/build/archetype/engine/v2/ast/ExpressionTest.java +++ b/archetype/engine-v2/src/test/java/io/helidon/build/archetype/engine/v2/ast/ExpressionTest.java @@ -43,6 +43,9 @@ public void testTernaryExpression() { Expression exp; Map variables; + exp = Expression.parse("'circle'"); + assertThat(exp.eval().asText(), is("circle")); + exp = Expression.parse("${shape} == 'circle' ? 'red' : 'blue'"); variables = Map.of("shape", Value.create("circle")); assertThat(exp.eval(variables::get).asText(), is("red"));