From 3175114158490a62323772c866c629fdc332104c Mon Sep 17 00:00:00 2001
From: Kalle Stenflo <kalle.stenflo@gmail.com>
Date: Wed, 11 Nov 2015 22:32:51 +0100
Subject: [PATCH] Extracted filter parsing to new test class.

---
 .../com/jayway/jsonpath/FilterParseTest.java  | 250 ++++++++++++++++++
 .../java/com/jayway/jsonpath/FilterTest.java  | 236 -----------------
 2 files changed, 250 insertions(+), 236 deletions(-)
 create mode 100644 json-path/src/test/java/com/jayway/jsonpath/FilterParseTest.java

diff --git a/json-path/src/test/java/com/jayway/jsonpath/FilterParseTest.java b/json-path/src/test/java/com/jayway/jsonpath/FilterParseTest.java
new file mode 100644
index 00000000..ff2d0c1f
--- /dev/null
+++ b/json-path/src/test/java/com/jayway/jsonpath/FilterParseTest.java
@@ -0,0 +1,250 @@
+package com.jayway.jsonpath;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import java.util.regex.Pattern;
+
+import static com.jayway.jsonpath.Criteria.where;
+import static com.jayway.jsonpath.Filter.filter;
+import static com.jayway.jsonpath.Filter.parse;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FilterParseTest {
+
+    @Test
+    public void a_filter_can_be_parsed() {
+
+        parse("[?(@.foo)]");
+        parse("[?(@.foo == 1)]");
+        parse("[?(@.foo == 1 || @['bar'])]");
+        parse("[?(@.foo == 1 && @['bar'])]");
+    }
+
+    @Test
+    public void an_invalid_filter_can_not_be_parsed() {
+        try {
+            parse("[?(@.foo == 1)");
+            Assertions.fail("expected " + InvalidPathException.class.getName());
+        } catch (InvalidPathException ipe){}
+
+        try {
+            parse("[?(@.foo == 1) ||]");
+            Assertions.fail("expected " + InvalidPathException.class.getName());
+        } catch (InvalidPathException ipe){}
+
+        try {
+            parse("[(@.foo == 1)]");
+            Assertions.fail("expected " + InvalidPathException.class.getName());
+        } catch (InvalidPathException ipe){}
+
+        try {
+            parse("[?@.foo == 1)]");
+            Assertions.fail("expected " + InvalidPathException.class.getName());
+        } catch (InvalidPathException ipe){}
+    }
+
+
+    @Test
+    public void a_gte_filter_can_be_serialized() {
+
+        String filter = filter(where("a").gte(1)).toString();
+        String parsed = parse("[?(@['a'] >= 1)]").toString();
+
+        assertThat(filter).isEqualTo(parse(parsed).toString());
+    }
+
+    @Test
+    public void a_lte_filter_can_be_serialized() {
+
+        String filter = filter(where("a").lte(1)).toString();
+        String parsed = parse("[?(@['a'] <= 1)]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_eq_filter_can_be_serialized() {
+
+        String filter = filter(where("a").eq(1)).toString();
+        String parsed = parse("[?(@['a'] == 1)]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_ne_filter_can_be_serialized() {
+
+        String filter = filter(where("a").ne(1)).toString();
+        String parsed = parse("[?(@['a'] != 1)]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_lt_filter_can_be_serialized() {
+
+        String filter = filter(where("a").lt(1)).toString();
+        String parsed = parse("[?(@['a'] < 1)]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_gt_filter_can_be_serialized() {
+
+        String filter = filter(where("a").gt(1)).toString();
+        String parsed = parse("[?(@['a'] > 1)]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_nin_filter_can_be_serialized() {
+        String filter = filter(where("a").nin(1)).toString();
+        String parsed = parse("[?(@['a'] ¦NIN¦ [1])]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_in_filter_can_be_serialized() {
+
+        String filter = filter(where("a").in("a")).toString();
+        String parsed = parse("[?(@['a'] ¦IN¦ ['a'])]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_contains_filter_can_be_serialized() {
+        String filter = filter(where("a").contains("a")).toString();
+        String parsed = parse("[?(@['a'] ¦CONTAINS¦ 'a')]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_all_filter_can_be_serialized() {
+
+        String filter = filter(where("a").all("a", "b")).toString();
+        String parsed = parse("[?(@['a'] ¦ALL¦ ['a','b'])]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_size_filter_can_be_serialized() {
+
+        String filter = filter(where("a").size(5)).toString();
+        String parsed = parse("[?(@['a'] ¦SIZE¦ 5)]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_exists_filter_can_be_serialized() {
+
+        Filter a = filter(where("a").exists(true));
+        String filter = a.toString();
+        String parsed = parse("[?(@['a'])]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_not_exists_filter_can_be_serialized() {
+
+        String filter = filter(where("a").exists(false)).toString();
+        String parsed = parse("[?(!@['a'])]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_type_filter_can_be_serialized() {
+        assertThat(filter(where("a").type(String.class)).toString()).isEqualTo("[?(@['a'] ¦TYPE¦ java.lang.String)]");
+    }
+
+    @Test
+    public void a_matches_filter_can_be_serialized() {
+        Filter a = filter(where("x").eq(1000));
+
+        assertThat(filter(where("a").matches(a)).toString()).isEqualTo("[?(@['a'] ¦MATCHES¦ [?(@['x'] == 1000)])]");
+    }
+
+    @Test
+    public void a_not_empty_filter_can_be_serialized() {
+
+        String filter = filter(where("a").notEmpty()).toString();
+        String parsed = parse("[?(@['a'] ¦NOT_EMPTY¦)]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void and_filter_can_be_serialized() {
+
+        String filter = filter(where("a").eq(1).and("b").eq(2)).toString();
+        String parsed = parse("[?(@['a'] == 1 && @['b'] == 2)]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void in_string_filter_can_be_serialized() {
+
+        String filter = filter(where("a").in("1","2")).toString();
+        String parsed = parse("[?(@['a'] ¦IN¦ ['1','2'])]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_deep_path_filter_can_be_serialized() {
+
+        String filter = filter(where("a.b.c").in("1", "2")).toString();
+        String parsed = parse("[?(@['a']['b']['c'] ¦IN¦ ['1','2'])]").toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void a_regex_filter_can_be_serialized() {
+        assertThat(filter(where("a").regex(Pattern.compile("/.*?/i"))).toString()).isEqualTo("[?(@['a'] =~ /.*?/i)]");
+    }
+
+    @Test
+    public void a_doc_ref_filter_can_be_serialized() {
+        Filter f = parse("[?(@.display-price <= $.max-price)]");
+        assertThat(f.toString()).isEqualTo("[?(@['display-price'] <= $['max-price'])]");
+    }
+
+    @Test
+    public void and_combined_filters_can_be_serialized() {
+
+        Filter a = filter(where("a").eq(1));
+        Filter b = filter(where("b").eq(2));
+        Filter c = a.and(b);
+
+        String filter = c.toString();
+        String parsed = parse("[?(@['a'] == 1 && @['b'] == 2)]").toString();
+
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+
+    @Test
+    public void or_combined_filters_can_be_serialized() {
+
+        Filter a = filter(where("a").eq(1));
+        Filter b = filter(where("b").eq(2));
+        Filter c = a.or(b);
+
+        String filter = c.toString();
+        Filter d = parse("[?(@['a'] == 1 || @['b'] == 2)]");
+        String parsed = d.toString();
+
+        assertThat(filter).isEqualTo(parsed);
+    }
+}
diff --git a/json-path/src/test/java/com/jayway/jsonpath/FilterTest.java b/json-path/src/test/java/com/jayway/jsonpath/FilterTest.java
index af6ec17f..f43b8fbe 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/FilterTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/FilterTest.java
@@ -1,6 +1,5 @@
 package com.jayway.jsonpath;
 
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -435,241 +434,6 @@ public class FilterTest extends BaseTest {
 
     }
 
-    @Test
-    public void a_filter_can_be_parsed() {
-
-        parse("[?(@.foo)]");
-        parse("[?(@.foo == 1)]");
-        parse("[?(@.foo == 1 || @['bar'])]");
-        parse("[?(@.foo == 1 && @['bar'])]");
-    }
-
-    @Test
-    public void an_invalid_filter_can_not_be_parsed() {
-        try {
-            parse("[?(@.foo == 1)");
-            Assertions.fail("expected " + InvalidPathException.class.getName());
-        } catch (InvalidPathException ipe){}
-
-        try {
-            parse("[?(@.foo == 1) ||]");
-            Assertions.fail("expected " + InvalidPathException.class.getName());
-        } catch (InvalidPathException ipe){}
-
-        try {
-            parse("[(@.foo == 1)]");
-            Assertions.fail("expected " + InvalidPathException.class.getName());
-        } catch (InvalidPathException ipe){}
-
-        try {
-            parse("[?@.foo == 1)]");
-            Assertions.fail("expected " + InvalidPathException.class.getName());
-        } catch (InvalidPathException ipe){}
-    }
-
-
-    @Test
-    public void a_gte_filter_can_be_serialized() {
-
-        String filter = filter(where("a").gte(1)).toString();
-        String parsed = parse("[?(@['a'] >= 1)]").toString();
-
-        assertThat(filter).isEqualTo(parse(parsed).toString());
-    }
-
-    @Test
-    public void a_lte_filter_can_be_serialized() {
-
-        String filter = filter(where("a").lte(1)).toString();
-        String parsed = parse("[?(@['a'] <= 1)]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_eq_filter_can_be_serialized() {
-
-        String filter = filter(where("a").eq(1)).toString();
-        String parsed = parse("[?(@['a'] == 1)]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_ne_filter_can_be_serialized() {
-
-        String filter = filter(where("a").ne(1)).toString();
-        String parsed = parse("[?(@['a'] != 1)]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_lt_filter_can_be_serialized() {
-
-        String filter = filter(where("a").lt(1)).toString();
-        String parsed = parse("[?(@['a'] < 1)]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_gt_filter_can_be_serialized() {
-
-        String filter = filter(where("a").gt(1)).toString();
-        String parsed = parse("[?(@['a'] > 1)]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_nin_filter_can_be_serialized() {
-        String filter = filter(where("a").nin(1)).toString();
-        String parsed = parse("[?(@['a'] ¦NIN¦ [1])]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_in_filter_can_be_serialized() {
-
-        String filter = filter(where("a").in("a")).toString();
-        String parsed = parse("[?(@['a'] ¦IN¦ ['a'])]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_contains_filter_can_be_serialized() {
-        String filter = filter(where("a").contains("a")).toString();
-        String parsed = parse("[?(@['a'] ¦CONTAINS¦ 'a')]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_all_filter_can_be_serialized() {
-
-        String filter = filter(where("a").all("a", "b")).toString();
-        String parsed = parse("[?(@['a'] ¦ALL¦ ['a','b'])]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_size_filter_can_be_serialized() {
-
-        String filter = filter(where("a").size(5)).toString();
-        String parsed = parse("[?(@['a'] ¦SIZE¦ 5)]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_exists_filter_can_be_serialized() {
-
-        Filter a = filter(where("a").exists(true));
-        String filter = a.toString();
-        String parsed = parse("[?(@['a'])]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_not_exists_filter_can_be_serialized() {
-
-        String filter = filter(where("a").exists(false)).toString();
-        String parsed = parse("[?(!@['a'])]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_type_filter_can_be_serialized() {
-        assertThat(filter(where("a").type(String.class)).toString()).isEqualTo("[?(@['a'] ¦TYPE¦ java.lang.String)]");
-    }
-
-    @Test
-    public void a_matches_filter_can_be_serialized() {
-        Filter a = filter(where("x").eq(1000));
-
-        assertThat(filter(where("a").matches(a)).toString()).isEqualTo("[?(@['a'] ¦MATCHES¦ [?(@['x'] == 1000)])]");
-    }
-
-    @Test
-    public void a_not_empty_filter_can_be_serialized() {
-
-        String filter = filter(where("a").notEmpty()).toString();
-        String parsed = parse("[?(@['a'] ¦NOT_EMPTY¦)]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void and_filter_can_be_serialized() {
-
-        String filter = filter(where("a").eq(1).and("b").eq(2)).toString();
-        String parsed = parse("[?(@['a'] == 1 && @['b'] == 2)]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void in_string_filter_can_be_serialized() {
-
-        String filter = filter(where("a").in("1","2")).toString();
-        String parsed = parse("[?(@['a'] ¦IN¦ ['1','2'])]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_deep_path_filter_can_be_serialized() {
-
-        String filter = filter(where("a.b.c").in("1", "2")).toString();
-        String parsed = parse("[?(@['a']['b']['c'] ¦IN¦ ['1','2'])]").toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void a_regex_filter_can_be_serialized() {
-        assertThat(filter(where("a").regex(Pattern.compile("/.*?/i"))).toString()).isEqualTo("[?(@['a'] =~ /.*?/i)]");
-    }
-
-    @Test
-    public void a_doc_ref_filter_can_be_serialized() {
-        Filter f = parse("[?(@.display-price <= $.max-price)]");
-        assertThat(f.toString()).isEqualTo("[?(@['display-price'] <= $['max-price'])]");
-    }
-
-    @Test
-    public void and_combined_filters_can_be_serialized() {
-
-        Filter a = filter(where("a").eq(1));
-        Filter b = filter(where("b").eq(2));
-        Filter c = a.and(b);
-
-        String filter = c.toString();
-        String parsed = parse("[?(@['a'] == 1 && @['b'] == 2)]").toString();
-
-
-        assertThat(filter).isEqualTo(parsed);
-    }
-
-    @Test
-    public void or_combined_filters_can_be_serialized() {
-
-        Filter a = filter(where("a").eq(1));
-        Filter b = filter(where("b").eq(2));
-        Filter c = a.or(b);
-
-        String filter = c.toString();
-        Filter d = parse("[?(@['a'] == 1 || @['b'] == 2)]");
-        String parsed = d.toString();
-
-        assertThat(filter).isEqualTo(parsed);
-    }
 
     @Test
     public void testFilterWithOrShortCircuit1() throws Exception {