Merge pull request #29 from seantanly/fix-compare

fix(Cldr.Unit.compare): Units built from Decimal string value are not compared corrrectly
elixir-cldr · Aug 3, 2022 · 6a67e18 · 6a67e18
2 parents 2e9c311 + 962e916
commit 6a67e18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/cldr/unit/math.ex b/lib/cldr/unit/math.ex
@@ -518,11 +518,7 @@ defmodule Cldr.Unit.Math do
   end
 
   def compare(%Unit{unit: unit} = unit_1, %Unit{unit: unit} = unit_2) do
-    cond do
-      unit_1.value == unit_2.value -> :eq
-      unit_1.value > unit_2.value -> :gt
-      unit_1.value < unit_2.value -> :lt
-    end
+    Ratio.compare(Ratio.new(unit_1.value), Ratio.new(unit_2.value))
   end
 
   def compare(%Unit{} = unit_1, %Unit{} = unit_2) do

diff --git a/test/conversion_test.exs b/test/conversion_test.exs
@@ -62,6 +62,12 @@ defmodule Cldr.Unit.Conversion.Test do
     end
   end
 
+  test "compare/2 for [Decimal] units that are built from string" do
+    s_unit = Cldr.Unit.new!(Decimal.new("300.0"), "gram")
+    t_unit = Cldr.Unit.new!(Decimal.new("60.0"), "kilogram")
+    assert Cldr.Unit.compare(s_unit, t_unit) == :lt
+  end
+
   test "convert!/2" do
     assert MyApp.Cldr.Unit.convert!(MyApp.Cldr.Unit.new!(:foot, 3), :meter)