update

Author: kvnglb

tests/test_netargparse.py

@@ -33,6 +33,16 @@ def main(args):
     nap.parser.add_argument("--var_true", action="store_true")
     nap(main, resp_delay=0.2, parse_args=["nap", "--port", "7001"])
 
+def tcp_socket_autoformat_mult_args():
+    def main(args):
+        return vars(args)
+
+    nap = NetArgumentParser()
+    nap.parser.add_argument("-x", type=int, nargs="+")
+    nap.parser.add_argument("-y", type=int, action="append")
+    nap.parser.add_argument("-z", type=int, nargs="+", action="append")
+    nap(main, resp_delay=0.2, parse_args=["nap", "--port", "7002"])
+
 def http_no_autoformat():
     def main(args):
         if args.var_str == "damn":
@@ -43,7 +53,7 @@ def main(args):
     nap.parser.add_argument("--var_str", type=str)
     nap.parser.add_argument("--var_int", type=int)
     nap.parser.add_argument("--var_true", action="store_true")
-    nap(main, False, 0.2, ["nap", "--port", "7002", "--http"])
+    nap(main, False, 0.2, ["nap", "--port", "7003", "--http"])
 
 def http_autoformat():
     def main(args):
@@ -55,7 +65,17 @@ def main(args):
     nap.parser.add_argument("--var_str", type=str)
     nap.parser.add_argument("--var_int", type=int)
     nap.parser.add_argument("--var_true", action="store_true")
-    nap(main, resp_delay=0.2, parse_args=["nap", "--port", "7003", "--http"])
+    nap(main, resp_delay=0.2, parse_args=["nap", "--port", "7004", "--http"])
+
+def http_autoformat_mult_args():
+    def main(args):
+        return vars(args)
+
+    nap = NetArgumentParser()
+    nap.parser.add_argument("-x", type=int, nargs="+")
+    nap.parser.add_argument("-y", type=int, action="append")
+    nap.parser.add_argument("-z", type=int, nargs="+", action="append")
+    nap(main, resp_delay=0.2, parse_args=["nap", "--port", "7005", "--http"])
 
 
 class TcpSocketRequest:
@@ -153,6 +173,16 @@ def test_plain_xml_a_func_exc(self):
         self.assertEqual(ans, b"<nap><response></response><exception>division by zero</exception><finished>1</finished></nap>")
         self.assertResponse(ans, "xml")
 
+    def test_plain_xml_a_ma(self):
+        ans = s_tcp_a_ma.txrx(b"<nap><_x>1 2 3</_x><_x>11 22 33</_x><_y>1</_y><_y>11</_y><_z>1 2 3</_z><_z>11 22 33</_z></nap>")
+        self.assertEqual(ans, b"<nap><response><x>[11, 22, 33]</x><y>[1, 11]</y><z>[[1, 2, 3], [11, 22, 33]]</z><_cmd>nap</_cmd></response><exception></exception><finished>1</finished></nap>")
+        self.assertResponse(ans, "xml")
+
+    def test_plain_xml_invalid_a_ma(self):
+        ans = s_tcp_a_ma.txrx(b"<nap><_x>1 2 3</_x><_x>11 22 33</_x><_y>1 2</_y><_y>11 22</_y><_z>1 2 3</_z><_z>11 22 33</_z></nap>")
+        self.assertEqual(ans, b"<nap><response></response><exception>unrecognized arguments: 2 22</exception><finished>1</finished></nap>")
+        self.assertResponse(ans, "xml")
+
     # Plain json, autoformat
     def test_plain_json_a_valid_tx(self):
         ans = s_tcp_a.txrx(b'{"--var_str": "value", "--var_int": "2"}')
@@ -174,6 +204,21 @@ def test_plain_json_a_func_exc(self):
         self.assertEqual(ans, b'{"response": "", "exception": "division by zero", "finished": 1}')
         self.assertResponse(ans, "json")
 
+    def test_plain_json_a_ma(self):
+        ans = s_tcp_a_ma.txrx(b'{"-x": ["1 2 3", "11 22 33"], "-y": [1, 11], "-z": ["1 2 3", "11 22 33"]}')
+        self.assertEqual(ans, b'{"response": {"x": [11, 22, 33], "y": [1, 11], "z": [[1, 2, 3], [11, 22, 33]], "_cmd": "nap"}, "exception": "", "finished": 1}')
+        self.assertResponse(ans, "json")
+
+    def test_plain_json_a_ma_double_key(self):
+        ans = s_tcp_a_ma.txrx(b'{"-x": "1 2 3", "-x": "11 22 33", "-y": 1, "-y": 11, "-z": "11 22 33", "-z": "11 22 33"}')
+        self.assertEqual(ans, b'{"response": {"x": [11, 22, 33], "y": [11], "z": [[11, 22, 33]], "_cmd": "nap"}, "exception": "", "finished": 1}')
+        self.assertResponse(ans, "json")
+
+    def test_plain_json_invalid_a_ma(self):
+        ans = s_tcp_a_ma.txrx(b'{"-x": ["1 2 3", "11 22 33"], "-y": ["1 2", "11 22"], "-z": ["1 2 3", "11 22 33"]}')
+        self.assertEqual(ans, b'{"response": "", "exception": "unrecognized arguments: 2 22", "finished": 1}')
+        self.assertResponse(ans, "json")
+
     # HTTP, json resp, no autoformat
     def test_http_json_na_valid_tx(self):
         ans = s_http_na.txrx("/?--var_str=value&--var_int=2")
@@ -237,6 +282,16 @@ def test_http_json_a_func_exc(self):
         self.assertEqual(ans, '{"response": "", "exception": "division by zero", "finished": 1}')
         self.assertResponse(ans, "json")
 
+    def test_http_json_a_ma(self):
+        ans = s_http_a_ma.txrx("/?-x=1 2 3&-x=11 22 33&-y=1&-y=11&-z=1 2 3&-z=11 22 33")
+        self.assertEqual(ans, '{"response": {"x": [11, 22, 33], "y": [1, 11], "z": [[1, 2, 3], [11, 22, 33]], "_cmd": "nap"}, "exception": "", "finished": 1}')
+        self.assertResponse(ans, "json")
+
+    def test_http_json_invalid_a_ma(self):
+        ans = s_http_a_ma.txrx("/?-x=1 2 3&-x=11 22 33&-y=1 2&-y=11 22&-z=1 2 3&-z=11 22 33")
+        self.assertEqual(ans, '{"response": "", "exception": "unrecognized arguments: 2 22", "finished": 1}')
+        self.assertResponse(ans, "json")
+
     # HTTP, xml resp, autoformat
     def test_http_xml_a_valid_tx(self):
         ans = s_http_a.txrx("/xml?--var_str=value&--var_int=2")
@@ -260,7 +315,8 @@ def test_http_xml_a_func_exc(self):
 
 
 if __name__ == "__main__":
-    for t in [tcp_socket_no_autoformat, tcp_socket_autoformat, http_no_autoformat, http_autoformat]:
+    for t in [tcp_socket_no_autoformat, tcp_socket_autoformat, tcp_socket_autoformat_mult_args,
+              http_no_autoformat, http_autoformat, http_autoformat_mult_args]:
         Thread(target=t, daemon=True).start()
 
     for i in range(10):
@@ -271,10 +327,14 @@ def test_http_xml_a_func_exc(self):
                 s_tcp_na = TcpSocketRequest(7000)
             if not "s_tcp_a" in globals():
                 s_tcp_a = TcpSocketRequest(7001)
+            if not "s_tcp_a_ma" in globals():
+                s_tcp_a_ma = TcpSocketRequest(7002)
             if not "s_http_na" in globals():
-                s_http_na = HttpRequest(7002)
+                s_http_na = HttpRequest(7003)
             if not "s_http_a" in globals():
-                s_http_a = HttpRequest(7003)
+                s_http_a = HttpRequest(7004)
+            if not "s_http_a_ma" in globals():
+                s_http_a_ma = HttpRequest(7005)
             break
         except (ConnectionRefusedError, requests.exceptions.ConnectionError):
             time.sleep(1)