Skip to content

Commit

Permalink
Streamline new tests for sum filter
Browse files Browse the repository at this point in the history
  • Loading branch information
adamklingbaum committed Aug 8, 2023
1 parent de6d15a commit 75e7725
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 33 deletions.
1 change: 1 addition & 0 deletions lib/liquid/standardfilters.rb
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,7 @@ def sum(input, property = nil)
result = InputIterator.new(values_for_sum, context).sum do |item|
Utils.to_number(item)
end

result.is_a?(BigDecimal) ? result.to_f : result
end

Expand Down
55 changes: 22 additions & 33 deletions test/integration/standard_filter_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -946,21 +946,6 @@ def test_sum_with_numeric_strings
end
end

def test_sum_with_floats
input = [0.1, 0.2, 0.3]
assert_equal(0.6, @filters.sum(input))
end

def test_sum_with_negative_float
input = [0.1, 0.2, -0.3]
assert_equal(0.0, @filters.sum(input))
end

def test_sum_with_float_strings
input = [0.1, "0.2", "0.3"]
assert_equal(0.6, @filters.sum(input))
end

def test_sum_with_nested_arrays
input = [1, [2, [3, 4]]]

Expand Down Expand Up @@ -1009,36 +994,40 @@ def test_sum_with_property_calls_to_liquid_on_property_values
assert(t.foo > 0)
end

def test_render_sum_of_floats
assert_equal(Liquid::Template.parse('{{ foo | sum }}').render("foo" => [0.1, 0.2, 0.3]), "0.6")
end

def test_render_sum_of_negative_floats
assert_equal(Liquid::Template.parse('{{ foo | sum }}').render("foo" => [0.1, -0.2, 0.3]), "0.2")
def test_sum_of_floats
input = [0.1, 0.2, 0.3]
assert_equal(0.6, @filters.sum(input))
assert_template_result("0.6", "{{ input | sum }}", { "input" => input })
end

def test_render_sum_negative_float_result
assert_equal(Liquid::Template.parse('{{ foo | sum }}').render("foo" => [0.1, -0.2, -0.3]), "-0.4")
def test_sum_of_negative_floats
input = [0.1, 0.2, -0.3]
assert_equal(0.0, @filters.sum(input))
assert_template_result("0.0", "{{ input | sum }}", { "input" => input })
end

def test_render_sum_float_zero_result
assert_equal(Liquid::Template.parse('{{ foo | sum }}').render("foo" => [0.1, 0.2, -0.3]), "0.0")
def test_sum_with_float_strings
input = [0.1, "0.2", "0.3"]
assert_equal(0.6, @filters.sum(input))
assert_template_result("0.6", "{{ input | sum }}", { "input" => input })
end

def test_render_sum_with_floats_and_indexable_map_values
input = [{ "quantity" => 1 }, { "quantity" => 0.2, "weight" => -0.3 }, { "weight" => 0.4 }]
assert_equal(Liquid::Template.parse('{{ foo | sum }}').render("foo" => input), "0")
assert_equal(Liquid::Template.parse('{{ foo | sum: "quantity" }}').render("foo" => input), "1.2")
assert_equal(Liquid::Template.parse('{{ foo | sum: "weight" }}').render("foo" => input), "0.1")
assert_equal(Liquid::Template.parse('{{ foo | sum: "subtotal" }}').render("foo" => input), "0")
def test_sum_resulting_in_negative_float
input = [0.1, -0.2, -0.3]
assert_equal(-0.4, @filters.sum(input))
assert_template_result("-0.4", "{{ input | sum }}", { "input" => input })
end

def test_sum_with_floats_and_indexable_map_values
input = [{ "quantity" => 1 }, { "quantity" => 0.2, "weight" => -0.3 }, { "weight" => 0.4 }]
assert_equal(0, @filters.sum(input))
assert_equal(0.0, @filters.sum(input))
assert_equal(1.2, @filters.sum(input, "quantity"))
assert_equal(0.1, @filters.sum(input, "weight"))
assert_equal(0, @filters.sum(input, "subtotal"))
assert_equal(0.0, @filters.sum(input, "subtotal"))
assert_template_result("0", "{{ input | sum }}", { "input" => input })
assert_template_result("1.2", "{{ input | sum: 'quantity' }}", { "input" => input })
assert_template_result("0.1", "{{ input | sum: 'weight' }}", { "input" => input })
assert_template_result("0", "{{ input | sum: 'subtotal' }}", { "input" => input })
end

private
Expand Down

0 comments on commit 75e7725

Please sign in to comment.