Skip to content

Commit

Permalink
fix(core): randomInt receive a Long not an Integer
Browse files Browse the repository at this point in the history
  • Loading branch information
loicmathieu committed Jan 21, 2025
1 parent f5bc586 commit 01a77af
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public class RandomIntFunction implements Function {
@Override
public Object execute(
Map<String, Object> args, PebbleTemplate self, EvaluationContext context, int lineNumber) {
Integer lower = getArgument(args, "lower", self, lineNumber);
Integer upper = getArgument(args, "upper", self, lineNumber);
Long lower = getArgument(args, "lower", self, lineNumber);
Long upper = getArgument(args, "upper", self, lineNumber);
if (upper < lower) {
throw new PebbleException(
null,
"In 'GenerateRandomNumber' upper is less than lower",
"In 'randomIn()' upper is less than lower",
lineNumber,
self.getName());
}
Expand All @@ -30,23 +30,23 @@ public List<String> getArgumentNames() {
return List.of("lower", "upper");
}

private Integer getArgument(
private Long getArgument(
Map<String, Object> args, String arg, PebbleTemplate self, int lineNumber) {
if (!args.containsKey(arg)) {
throw new PebbleException(
null,
"The 'GenerateRandomNumber' function expects an argument " + arg,
"The 'randomIn()' function expects an argument " + arg,
lineNumber,
self.getName());
}

if (!(args.get(arg) instanceof Integer)) {
if (!(args.get(arg) instanceof Long)) {
throw new PebbleException(
null,
"The 'GenerateRandomNumber' function expects an argument " + arg + "with type Integer.",
"The 'randomIn()' function expects an argument " + arg + " of type Long.",
lineNumber,
self.getName());
}
return (Integer) args.get(arg);
return (Long) args.get(arg);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ class RandomIntFunctionTest {
void missingParameter() {
assertThrows(
IllegalVariableEvaluationException.class,
() -> variableRenderer.render("{{randomInt(lower)}}", Map.of("lower", 10)));
() -> variableRenderer.render("{{randomInt(lower)}}", Map.of("lower", 10L)));

assertThrows(
IllegalVariableEvaluationException.class,
() -> variableRenderer.render("{{randomInt(upper)}}", Map.of("upper", 1)));
() -> variableRenderer.render("{{randomInt(upper)}}", Map.of("upper", 1L)));
assertThrows(
IllegalVariableEvaluationException.class,
() -> variableRenderer.render("{{randomInt()}}", Collections.emptyMap()));
Expand All @@ -33,8 +33,8 @@ void missingParameter() {
void testGenerateNumberPositive() throws IllegalVariableEvaluationException {
String rendered =
variableRenderer.render(
"{{ randomInt(lower, upper) }}", Map.of("lower", 1, "upper", 10));
assertThat(rendered, Integer.parseInt(rendered) >= 1 && Integer.parseInt(rendered) <= 10);
"{{ randomInt(lower, upper) }}", Map.of("lower", 1L, "upper", 10L));
assertThat(rendered, Long.parseLong(rendered) >= 1L && Long.parseLong(rendered) <= 10L);
}

@Test
Expand All @@ -50,22 +50,22 @@ void testGenerateNumberUpperLessThanLower() {
IllegalVariableEvaluationException.class,
() ->
variableRenderer.render(
"{{ randomInt(lower, upper) }}", Map.of("lower", 10, "upper", 1)));
"{{ randomInt(lower, upper) }}", Map.of("lower", 10L, "upper", 1L)));
}

@Test
void testGenerateNumberNegative() throws IllegalVariableEvaluationException {
String rendered =
variableRenderer.render(
"{{ randomInt(lower, upper) }}", Map.of("lower", -10, "upper", -1));
assertThat(rendered, Integer.parseInt(rendered) >= -10 && Integer.parseInt(rendered) <= -1);
"{{ randomInt(lower, upper) }}", Map.of("lower", -10L, "upper", -1L));
assertThat(rendered, Long.parseLong(rendered) >= -10L && Long.parseLong(rendered) <= -1L);
}

@Test
void testGenerateNumberSame() throws IllegalVariableEvaluationException {
String rendered =
variableRenderer.render(
"{{ randomInt(lower, upper) }}", Map.of("lower", 10, "upper", 10));
assertThat(rendered, Integer.parseInt(rendered) == 10);
"{{ randomInt(lower, upper) }}", Map.of("lower", 10L, "upper", 10L));
assertThat(rendered, Long.parseLong(rendered) == 10);
}
}

0 comments on commit 01a77af

Please sign in to comment.