rebase

Author: jpbempel

dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ProbeConditionTest.java

@@ -242,7 +242,7 @@ void testLiterals() throws Exception {
 
   @Test
   void testLenCount() throws Exception {
-    ProbeCondition probeCondition = load("/test_conditional_13.json");
+    ProbeCondition probeCondition = load("/test_conditional_14.json");
     Map<String, Object> fields = new HashMap<>();
     fields.put("intArray", new int[] {1, 1, 1});
     fields.put("strArray", new String[] {"foo", "bar"});
@@ -260,7 +260,6 @@ void testLenCount() throws Exception {
     assertTrue(probeCondition.execute(ctx));
   }
 
-
   private static ProbeCondition load(String resourcePath) throws IOException {
     InputStream input = ProbeConditionTest.class.getResourceAsStream(resourcePath);
     Moshi moshi =

dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_13.json

@@ -13,18 +13,4 @@
   }
 }
 
-{
-  "dsl": "",
-  "json": {
-    "and": [
-      {"eq": [{"count": {"ref": "intArray"}}, 3]},
-      {"eq": [{"len": {"ref": "intArray"}}, 3]},
-      {"eq": [{"count": {"ref": "strArray"}}, 2]},
-      {"eq": [{"count": {"ref": "strMap"}}, 2]},
-      {"eq": [{"count": {"ref": "strSet"}}, 1]},
-      {"eq": [{"count": {"ref": "strList"}}, 1]}
-    ]
-  }
-}
-
 

dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_conditional_14.json

@@ -0,0 +1,13 @@
+{
+  "dsl": "",
+  "json": {
+    "and": [
+      {"eq": [{"count": {"ref": "intArray"}}, 3]},
+      {"eq": [{"len": {"ref": "intArray"}}, 3]},
+      {"eq": [{"count": {"ref": "strArray"}}, 2]},
+      {"eq": [{"count": {"ref": "strMap"}}, 2]},
+      {"eq": [{"count": {"ref": "strSet"}}, 1]},
+      {"eq": [{"count": {"ref": "strList"}}, 1]}
+    ]
+  }
+}