From aacb7fc276b392aaaddf84ddea28bfed6f48d4fd Mon Sep 17 00:00:00 2001
From: Anders Eknert <anders@eknert.com>
Date: Tue, 21 Jun 2022 12:23:08 +0200
Subject: [PATCH] Add a few int/float comparison tests (#4798)

Signed-off-by: Anders Eknert <anders@eknert.com>
---
 .../test-comparisonexpr-0619.yaml             | 87 +------------------
 .../test-comparisonexpr-0620.yaml             | 47 ++++++++++
 2 files changed, 49 insertions(+), 85 deletions(-)
 create mode 100644 test/cases/testdata/comparisonexpr/test-comparisonexpr-0620.yaml

diff --git a/test/cases/testdata/comparisonexpr/test-comparisonexpr-0619.yaml b/test/cases/testdata/comparisonexpr/test-comparisonexpr-0619.yaml
index f48fd97cd4..cbd97f5123 100644
--- a/test/cases/testdata/comparisonexpr/test-comparisonexpr-0619.yaml
+++ b/test/cases/testdata/comparisonexpr/test-comparisonexpr-0619.yaml
@@ -1,93 +1,10 @@
 cases:
-- data:
-    a:
-    - 1
-    - 2
-    - 3
-    - 4
-    b:
-      v1: hello
-      v2: goodbye
-    c:
-    - x:
-      - true
-      - false
-      - foo
-      "y":
-      - null
-      - 3.14159
-      z:
-        p: true
-        q: false
-    d:
-      e:
-      - bar
-      - baz
-    f:
-    - xs:
-      - 1
-      ys:
-      - 2
-    - xs:
-      - 2
-      ys:
-      - 3
-    g:
-      a:
-      - 1
-      - 0
-      - 0
-      - 0
-      b:
-      - 0
-      - 2
-      - 0
-      - 0
-      c:
-      - 0
-      - 0
-      - 0
-      - 4
-    h:
-    - - 1
-      - 2
-      - 3
-    - - 2
-      - 3
-      - 4
-    l:
-    - a: bob
-      b: -1
-      c:
-      - 1
-      - 2
-      - 3
-      - 4
-    - a: alice
-      b: 1
-      c:
-      - 2
-      - 3
-      - 4
-      - 5
-      d: null
-    m: []
-    numbers:
-    - "1"
-    - "2"
-    - "3"
-    - "4"
-    strings:
-      bar: 2
-      baz: 3
-      foo: 1
-    three: 3
-  modules:
+- modules:
   - |
     package generated
 
     p {
-      1 < -1
+      1 <= -1
     }
   note: 'comparisonexpr/undefined: lteq'
   query: data.generated.p = x
diff --git a/test/cases/testdata/comparisonexpr/test-comparisonexpr-0620.yaml b/test/cases/testdata/comparisonexpr/test-comparisonexpr-0620.yaml
new file mode 100644
index 0000000000..8479d208ba
--- /dev/null
+++ b/test/cases/testdata/comparisonexpr/test-comparisonexpr-0620.yaml
@@ -0,0 +1,47 @@
+cases:
+# Leaving out floats as map keys until this is resolved:
+# https://github.com/open-policy-agent/opa/issues/4797
+- modules:
+  - |
+    package comparison
+
+    p {
+      1 == 1.0
+    }
+  note: 'comparisonexpr/numbers: int and float comparison'
+  query: data.comparison.p = x
+  want_result:
+    - x: true
+- modules:
+  - |
+    package comparison
+  
+    p {
+      [1] == [1.0]
+    }
+  note: 'comparisonexpr/numbers: int and float array comparison'
+  query: data.comparison.p = x
+  want_result:
+  - x: true
+- modules:
+    - |
+      package comparison
+      
+      p {
+        {1: 1} == {1: 1.0}
+      }
+  note: 'comparisonexpr/numbers: int and float object comparison'
+  query: data.comparison.p = x
+  want_result:
+    - x: true
+- modules:
+    - |
+      package comparison
+      
+      p {
+        {"x": [1, 2, {"b": 3.0}]} == {"x": [1, 2, {"b": 3}]}
+      }
+  note: 'comparisonexpr/numbers: int and float nested object comparison'
+  query: data.comparison.p = x
+  want_result:
+    - x: true