Skip to content

Adjust divide/multiply for backwards compatability #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattcoley merged 1 commit into from
Nov 3, 2021
Merged

Adjust divide/multiply for backwards compatability #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions src/main/java/com/hubspot/jinjava/lib/filter/DivideFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,16 @@ public Object filter(
Object toMul = args[0];
Number num;
if (toMul != null) {
if (toMul instanceof Number) {
num = (Number) toMul;
} else {
try {
num = new BigDecimal(toMul.toString());
} catch (NumberFormatException e) {
throw new InvalidArgumentException(
interpreter,
this,
InvalidReason.NUMBER_FORMAT,
0,
toMul
);
}
try {
num = new BigDecimal(toMul.toString());
} catch (NumberFormatException e) {
throw new InvalidArgumentException(
interpreter,
this,
InvalidReason.NUMBER_FORMAT,
0,
toMul
);
}
} else {
return var;
Expand Down
24 changes: 10 additions & 14 deletions src/main/java/com/hubspot/jinjava/lib/filter/MultiplyFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,16 @@ public Object filter(
Object toMul = args[0];
Number num;
if (toMul != null) {
if (toMul instanceof Number) {
num = (Number) toMul;
} else {
try {
num = new BigDecimal(toMul.toString());
} catch (NumberFormatException e) {
throw new InvalidArgumentException(
interpreter,
this,
InvalidReason.NUMBER_FORMAT,
0,
toMul
);
}
try {
num = new BigDecimal(toMul.toString());
} catch (NumberFormatException e) {
throw new InvalidArgumentException(
interpreter,
this,
InvalidReason.NUMBER_FORMAT,
0,
toMul
);
}
} else {
return var;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/hubspot/jinjava/lib/filter/DivideFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void itDivides() {
ImmutableMap.of("numerator", 10, "denominator", 2)
)
)
.isEqualTo("5.0");
.isEqualTo("5");
assertThat(
jinjava.render(
"{{ numerator // denominator }}",
Expand All @@ -41,6 +41,6 @@ public void itDividesIntegersWithNonIntegerResult() {
ImmutableMap.of("numerator", 9, "denominator", 10)
)
)
.isEqualTo("0.9 0.9");
.isEqualTo("1 0.9");
}
}
4 changes: 2 additions & 2 deletions src/test/java/com/hubspot/jinjava/lib/filter/MultiplyFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ public void setup() {
public void itMultipliesDecimalNumbers() {
Map<String, Object> vars = ImmutableMap.of("test", 10);
RenderResult renderResult = jinjava.renderForResult("{{ test|multiply(.25) }}", vars);
assertThat(renderResult.getOutput()).isEqualTo("2.5");
assertThat(renderResult.getOutput()).isEqualTo("2.50");
}

@Test
public void itCoercesStringsToNumbers() {
Map<String, Object> vars = ImmutableMap.of("test", "10");
RenderResult renderResult = jinjava.renderForResult("{{ test|multiply(.25) }}", vars);
assertThat(renderResult.getOutput()).isEqualTo("2.5");
assertThat(renderResult.getOutput()).isEqualTo("2.50");
}
}