Merge pull request #9 from lanwen/path_param_decode

fix - any param filter decodes query twice
yandex-qatools · Feb 11, 2016 · f328cc2 · f328cc2
2 parents 6da7450 + be658f8
commit f328cc2
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ What it returns:
 | `http://yandex.com`        | `http://yandex.com.tr` | `http://yandex.com.[+tr]`      |  
 | `http://yandex.com.tr`     | `http://yandex.com`    | `http://yandex.com.[-tr]`      |  
 | `http://yandex.com.tr.fr`  | `http://yandex.com`    | `http://yandex.com.[-tr.fr]`   |  
+| `/path?q=1`                | `/changed?q=2`         | `/[path->changed]?[q=1->q=2]`  |  
 
 ##Use filters:
 

diff --git a/pom.xml b/pom.xml
@@ -134,7 +134,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.3</version>
                 <inherited>true</inherited>
                 <configuration>
                     <source>1.7</source>

diff --git a/src/main/java/ru/lanwen/diff/uri/core/filters/AnyParamValueFilter.java b/src/main/java/ru/lanwen/diff/uri/core/filters/AnyParamValueFilter.java
@@ -13,6 +13,7 @@
 import static java.util.Arrays.asList;
 import static jersey.repackaged.com.google.common.base.Joiner.on;
 import static ru.lanwen.diff.uri.core.Delimiters.QUERY_NAME_VALUE_SEPARATOR;
+import static ru.lanwen.diff.uri.core.util.URLCoder.encode;
 
 /**
  * User: lanwen
@@ -68,7 +69,7 @@ private String toQuery(Map<String, List<String>> params) {
         List<String> pairs = new ArrayList<>();
         for (String key : params.keySet()) {
             for (String value : params.get(key)) {
-                pairs.add(on(QUERY_NAME_VALUE_SEPARATOR).join(asList(key, value)));
+                pairs.add(on(QUERY_NAME_VALUE_SEPARATOR).join(asList(key, encode(value))));
             }
         }
         return on(UriPart.QUERY.getJoiner()).join(pairs);

diff --git a/...ru/lanwen/diff/uri/core/util/Decoder.java → ...u/lanwen/diff/uri/core/util/URLCoder.java b/...ru/lanwen/diff/uri/core/util/Decoder.java → ...u/lanwen/diff/uri/core/util/URLCoder.java
@@ -5,9 +5,9 @@
 /**
  * User: leonsabr
  */
-public class Decoder {
+public final class URLCoder {
 
-    private Decoder() {
+    private URLCoder() {
     }
 
     public static String decode(String s) {
@@ -17,4 +17,12 @@ public static String decode(String s) {
             throw new IllegalArgumentException("UTF-8 encoding is not supported");
         }
     }
+
+    public static String encode(String s) {
+        try {
+            return java.net.URLEncoder.encode(s, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new IllegalArgumentException("UTF-8 encoding is not supported");
+        }
+    }
 }
diff --git a/src/main/java/ru/lanwen/diff/uri/core/util/UriPrinter.java b/src/main/java/ru/lanwen/diff/uri/core/util/UriPrinter.java
@@ -72,12 +72,12 @@ public String toString() {
 //                    sb.append("//");
 //                    sb.append(authority);
 //                }
-            if (path != null)
-                sb.append(path);
-            if (query != null) {
-                sb.append('?');
-                sb.append(query);
-            }
+        }
+        if (path != null)
+            sb.append(path);
+        if (query != null) {
+            sb.append('?');
+            sb.append(query);
         }
         if (fragment != null) {
             sb.append('#');

diff --git a/src/main/java/ru/lanwen/diff/uri/core/util/UriSplitter.java b/src/main/java/ru/lanwen/diff/uri/core/util/UriSplitter.java
@@ -22,7 +22,7 @@
 import static ru.lanwen.diff.uri.core.UriPart.PORT;
 import static ru.lanwen.diff.uri.core.UriPart.QUERY;
 import static ru.lanwen.diff.uri.core.UriPart.SCHEME;
-import static ru.lanwen.diff.uri.core.util.Decoder.decode;
+import static ru.lanwen.diff.uri.core.util.URLCoder.decode;
 
 /**
  * User: lanwen

diff --git a/src/test/java/ru/lanwen/diff/uri/QueryWithEncodedURLTest.java b/src/test/java/ru/lanwen/diff/uri/QueryWithEncodedURLTest.java
@@ -2,23 +2,34 @@
 
 import org.junit.Test;
 
+import static ru.lanwen.diff.uri.core.util.URLCoder.encode;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
+import static ru.lanwen.diff.uri.matchers.UriDiffMatchers.changes;
 
 /**
  * User: leonsabr
  */
 public class QueryWithEncodedURLTest {
 
-    public static final String URL_EXP = "https://www.yandex.com/yandsearch?text=procter%26gamble";
-    public static final String URL_ACT = "https://www.yandex.com/yandsearch?text=m%26m%27s";
-
     @Test
     public void parameterValueWithAmpersandIsParsedCorrectly() throws Exception {
-        UriDiffer differ = UriDiffer.diff().actual(URL_ACT).expected(URL_EXP);
+        String actual = "https://www.yandex.com/yandsearch?text=m%26m%27s";
+        String expected = "https://www.yandex.com/yandsearch?text=procter%26gamble";
+
+        UriDiffer differ = UriDiffer.diff().actual(actual).expected(expected);
         assertThat(differ.queryDeltas(), hasSize(1));
         assertThat((String) differ.queryDeltas().get(0).getRevised().getLines().get(0), equalTo("text=m&m's"));
     }
 
+    @Test
+    public void shouldNormallyEncodeDecodeBrackets() throws Exception {
+        String encode = "/?y=" +  encode("{\"");
+        UriDiffer differ = UriDiffer.diff().expected("/?y=1").actual(encode);
+
+        assertThat(differ.changes(), changes(hasSize(1)));
+        assertThat(differ.queryDeltas(), hasSize(1));
+        assertThat((String) differ.queryDeltas().get(0).getRevised().getLines().get(0), equalTo("y={\""));
+    }
 }
diff --git a/src/test/java/ru/lanwen/diff/uri/UriDiffFilterTest.java b/src/test/java/ru/lanwen/diff/uri/UriDiffFilterTest.java
@@ -5,9 +5,9 @@
 import java.net.URI;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static ru.lanwen.diff.uri.matchers.ViewCompareMatcher.comparingTo;
 import static ru.lanwen.diff.uri.core.filters.AnyParamValueFilter.param;
 import static ru.lanwen.diff.uri.core.filters.SchemeFilter.scheme;
+import static ru.lanwen.diff.uri.matchers.ViewCompareMatcher.comparingTo;
 
 /**
  * User: lanwen

diff --git a/src/test/java/ru/lanwen/diff/uri/UriDiffOutputTest.java b/src/test/java/ru/lanwen/diff/uri/UriDiffOutputTest.java
@@ -58,6 +58,7 @@ public static Collection<Object[]> data() {
         data.add(new Object[]{"http://ya.ru/?q=1#123neo", "http://ya.ru/?q=1#neo", "http://ya.ru/?q=1#[-123]neo"});
         data.add(new Object[]{"http://ya.ru/?q=1#noo", "http://ya.ru/?q=1#neo", "http://ya.ru/?q=1#n[+e]o[-o]"});
         data.add(new Object[]{"http://ya.ru/?q=1#n00oo", "http://ya.ru/?q=1#neo", "http://ya.ru/?q=1#n[00->e]oo[-o]"});
+        data.add(new Object[]{"/path?q=1", "/changed?q=2", "/[path->changed]?[q=1->q=2]"});
         data.add(new Object[]{UriDiffTest.URL_EXP, UriDiffTest.URL_ACT,
                 "http://disk.yandex.com.tr/?[auth=1->auth=1?retpath=http://mail.yandex.com.tr/neo2/#disk]&auth=2&[-retpath=http://mail.yandex.com.tr/neo2/#disk]"});
         return data;

diff --git a/src/test/java/ru/lanwen/diff/uri/UriDiffTest.java b/src/test/java/ru/lanwen/diff/uri/UriDiffTest.java
@@ -136,7 +136,7 @@ public void fragmentChange() throws Exception {
         UriDiffer differ = UriDiffer.diff().actual(actual).expected(expected);
         UriDiff diff = differ.changes();
 
-        assertThat(differ.fragmentDeltas().size(), equalTo(1));
+        assertThat(differ.fragmentDeltas(), hasSize(1));
         assertThat(diff.hasChanges(), equalTo(Boolean.TRUE));
         assertThat(diff, changes(hasSize(1)));
         assertThat(diff, changes(hasItem(changeType(equalTo(FRAGMENT)))));

diff --git a/src/test/java/ru/lanwen/diff/uri/core/filters/AnyParamValueFilterTest.java b/src/test/java/ru/lanwen/diff/uri/core/filters/AnyParamValueFilterTest.java
@@ -0,0 +1,25 @@
+package ru.lanwen.diff.uri.core.filters;
+
+import org.junit.Test;
+
+import java.net.URI;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
+import static ru.lanwen.diff.uri.core.filters.AnyParamValueFilter.param;
+import static ru.lanwen.diff.uri.core.util.URLCoder.encode;
+
+/**
+ * @author lanwen (Merkushev Kirill)
+ */
+public class AnyParamValueFilterTest {
+
+    @Test // #8
+    public void shouldNotDecodeQueryTwiceWithParamFilter() throws Exception {
+        String templatedQueryPart = "{\"";
+        String encode = "/?y=" + encode(templatedQueryPart);
+        URI filtered = param("z").apply(URI.create(encode));
+        assertThat(filtered.toString(), containsString(encode(templatedQueryPart)));
+    }
+
+}