1 files changed, 52 insertions, 1 deletions
diff --git a/test/test_routing.py b/test/test_routing.py
index ef5622c2..167d2640 100644
--- a/test/test_routing.py
+++ b/test/test_routing.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import pytest
-
 from unit.applications.proto import TestApplicationProto
 from unit.option import option
 
@@ -1321,6 +1320,58 @@ class TestRouting(TestApplicationProto):
         self.route_match_invalid({"arguments": {"%%1F": ""}})
         self.route_match_invalid({"arguments": {"%7%F": ""}})
 
+    def test_routes_match_query(self):
+        self.route_match({"query": "!"})
+        assert self.get(url='/')['status'] == 404
+        assert self.get(url='/?')['status'] == 404
+        assert self.get(url='/?foo')['status'] == 200
+        assert self.get(url='/?foo=')['status'] == 200
+        assert self.get(url='/?foo=baz')['status'] == 200
+
+        self.route_match({"query": "foo=%26"})
+        assert self.get(url='/?foo=&')['status'] == 200
+
+        self.route_match({"query": "a=b&c=d"})
+        assert self.get(url='/?a=b&c=d')['status'] == 200
+
+        self.route_match({"query": "a=b%26c%3Dd"})
+        assert self.get(url='/?a=b%26c%3Dd')['status'] == 200
+        assert self.get(url='/?a=b&c=d')['status'] == 200
+
+        self.route_match({"query": "a=b%26c%3Dd+e"})
+        assert self.get(url='/?a=b&c=d e')['status'] == 200
+
+    def test_routes_match_query_array(self):
+        self.route_match({"query": ["foo", "bar"]})
+
+        assert self.get()['status'] == 404, 'no args'
+        assert self.get(url='/?foo')['status'] == 200, 'arg first'
+        assert self.get(url='/?bar')['status'] == 200, 'arg second'
+
+        assert 'success' in self.conf_delete(
+            'routes/0/match/query/1'
+        ), 'query array remove second'
+
+        assert self.get(url='/?foo')['status'] == 200, 'still arg first'
+        assert self.get(url='/?bar')['status'] == 404, 'no arg second'
+
+        self.route_match({"query": ["!f", "foo"]})
+
+        assert self.get(url='/?f')['status'] == 404, 'negative arg'
+        assert self.get(url='/?fo')['status'] == 404, 'negative arg 2'
+        assert self.get(url='/?foo')['status'] == 200, 'negative arg 3'
+
+        self.route_match({"query": []})
+        assert self.get()['status'] == 200, 'empty array'
+
+    def test_routes_match_query_invalid(self):
+        self.route_match_invalid({"query": [1]})
+        self.route_match_invalid({"query": "%"})
+        self.route_match_invalid({"query": "%1G"})
+        self.route_match_invalid({"query": "%0"})
+        self.route_match_invalid({"query": "%%1F"})
+        self.route_match_invalid({"query": ["foo", "%3D", "%%1F"]})
+
     def test_routes_match_cookies(self):
         self.route_match({"cookies": {"foO": "bar"}})