From f45f4e677e8cddba8160d1e4e02ca8a4515e3456 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Thu, 20 Oct 2016 10:11:58 +1300
Subject: netlib.strutils -> mitmproxy.utils.strutils

---
 test/mitmproxy/test_utils_strutils.py | 96 +++++++++++++++++++++++++++++++++++
 test/netlib/test_strutils.py          | 95 ----------------------------------
 2 files changed, 96 insertions(+), 95 deletions(-)
 create mode 100644 test/mitmproxy/test_utils_strutils.py
 delete mode 100644 test/netlib/test_strutils.py

(limited to 'test')

diff --git a/test/mitmproxy/test_utils_strutils.py b/test/mitmproxy/test_utils_strutils.py
new file mode 100644
index 00000000..2843688f
--- /dev/null
+++ b/test/mitmproxy/test_utils_strutils.py
@@ -0,0 +1,96 @@
+from mitmproxy.utils import strutils
+from netlib import tutils
+
+
+def test_always_bytes():
+    assert strutils.always_bytes(bytes(bytearray(range(256)))) == bytes(bytearray(range(256)))
+    assert strutils.always_bytes("foo") == b"foo"
+    with tutils.raises(ValueError):
+        strutils.always_bytes(u"\u2605", "ascii")
+    with tutils.raises(TypeError):
+        strutils.always_bytes(42, "ascii")
+
+
+def test_native():
+    with tutils.raises(TypeError):
+        strutils.native(42)
+    assert strutils.native(u"foo") == u"foo"
+    assert strutils.native(b"foo") == u"foo"
+
+
+def test_escape_control_characters():
+    assert strutils.escape_control_characters(u"one") == u"one"
+    assert strutils.escape_control_characters(u"\00ne") == u".ne"
+    assert strutils.escape_control_characters(u"\nne") == u"\nne"
+    assert strutils.escape_control_characters(u"\nne", False) == u".ne"
+    assert strutils.escape_control_characters(u"\u2605") == u"\u2605"
+    assert (
+        strutils.escape_control_characters(bytes(bytearray(range(128))).decode()) ==
+        u'.........\t\n..\r.................. !"#$%&\'()*+,-./0123456789:;<'
+        u'=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~.'
+    )
+    assert (
+        strutils.escape_control_characters(bytes(bytearray(range(128))).decode(), False) ==
+        u'................................ !"#$%&\'()*+,-./0123456789:;<'
+        u'=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~.'
+    )
+
+    with tutils.raises(ValueError):
+        strutils.escape_control_characters(b"foo")
+
+
+def test_bytes_to_escaped_str():
+    assert strutils.bytes_to_escaped_str(b"foo") == "foo"
+    assert strutils.bytes_to_escaped_str(b"\b") == r"\x08"
+    assert strutils.bytes_to_escaped_str(br"&!?=\)") == r"&!?=\\)"
+    assert strutils.bytes_to_escaped_str(b'\xc3\xbc') == r"\xc3\xbc"
+    assert strutils.bytes_to_escaped_str(b"'") == r"'"
+    assert strutils.bytes_to_escaped_str(b'"') == r'"'
+
+    assert strutils.bytes_to_escaped_str(b"'", escape_single_quotes=True) == r"\'"
+    assert strutils.bytes_to_escaped_str(b'"', escape_single_quotes=True) == r'"'
+
+    assert strutils.bytes_to_escaped_str(b"\r\n\t") == "\\r\\n\\t"
+    assert strutils.bytes_to_escaped_str(b"\r\n\t", True) == "\r\n\t"
+
+    assert strutils.bytes_to_escaped_str(b"\n", True) == "\n"
+    assert strutils.bytes_to_escaped_str(b"\\n", True) == "\\ \\ n".replace(" ", "")
+    assert strutils.bytes_to_escaped_str(b"\\\n", True) == "\\ \\ \n".replace(" ", "")
+    assert strutils.bytes_to_escaped_str(b"\\\\n", True) == "\\ \\ \\ \\ n".replace(" ", "")
+
+    with tutils.raises(ValueError):
+        strutils.bytes_to_escaped_str(u"such unicode")
+
+
+def test_escaped_str_to_bytes():
+    assert strutils.escaped_str_to_bytes("foo") == b"foo"
+    assert strutils.escaped_str_to_bytes("\x08") == b"\b"
+    assert strutils.escaped_str_to_bytes("&!?=\\\\)") == br"&!?=\)"
+    assert strutils.escaped_str_to_bytes(u"\\x08") == b"\b"
+    assert strutils.escaped_str_to_bytes(u"&!?=\\\\)") == br"&!?=\)"
+    assert strutils.escaped_str_to_bytes(u"\u00fc") == b'\xc3\xbc'
+
+    with tutils.raises(ValueError):
+        strutils.escaped_str_to_bytes(b"very byte")
+
+
+def test_is_mostly_bin():
+    assert not strutils.is_mostly_bin(b"foo\xFF")
+    assert strutils.is_mostly_bin(b"foo" + b"\xFF" * 10)
+    assert not strutils.is_mostly_bin("")
+
+
+def test_is_xml():
+    assert not strutils.is_xml(b"foo")
+    assert strutils.is_xml(b"<foo")
+    assert strutils.is_xml(b"  \n<foo")
+
+
+def test_clean_hanging_newline():
+    s = "foo\n"
+    assert strutils.clean_hanging_newline(s) == "foo"
+    assert strutils.clean_hanging_newline("foo") == "foo"
+
+
+def test_hexdump():
+    assert list(strutils.hexdump(b"one\0" * 10))
diff --git a/test/netlib/test_strutils.py b/test/netlib/test_strutils.py
deleted file mode 100644
index 36f709da..00000000
--- a/test/netlib/test_strutils.py
+++ /dev/null
@@ -1,95 +0,0 @@
-from netlib import strutils, tutils
-
-
-def test_always_bytes():
-    assert strutils.always_bytes(bytes(bytearray(range(256)))) == bytes(bytearray(range(256)))
-    assert strutils.always_bytes("foo") == b"foo"
-    with tutils.raises(ValueError):
-        strutils.always_bytes(u"\u2605", "ascii")
-    with tutils.raises(TypeError):
-        strutils.always_bytes(42, "ascii")
-
-
-def test_native():
-    with tutils.raises(TypeError):
-        strutils.native(42)
-    assert strutils.native(u"foo") == u"foo"
-    assert strutils.native(b"foo") == u"foo"
-
-
-def test_escape_control_characters():
-    assert strutils.escape_control_characters(u"one") == u"one"
-    assert strutils.escape_control_characters(u"\00ne") == u".ne"
-    assert strutils.escape_control_characters(u"\nne") == u"\nne"
-    assert strutils.escape_control_characters(u"\nne", False) == u".ne"
-    assert strutils.escape_control_characters(u"\u2605") == u"\u2605"
-    assert (
-        strutils.escape_control_characters(bytes(bytearray(range(128))).decode()) ==
-        u'.........\t\n..\r.................. !"#$%&\'()*+,-./0123456789:;<'
-        u'=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~.'
-    )
-    assert (
-        strutils.escape_control_characters(bytes(bytearray(range(128))).decode(), False) ==
-        u'................................ !"#$%&\'()*+,-./0123456789:;<'
-        u'=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~.'
-    )
-
-    with tutils.raises(ValueError):
-        strutils.escape_control_characters(b"foo")
-
-
-def test_bytes_to_escaped_str():
-    assert strutils.bytes_to_escaped_str(b"foo") == "foo"
-    assert strutils.bytes_to_escaped_str(b"\b") == r"\x08"
-    assert strutils.bytes_to_escaped_str(br"&!?=\)") == r"&!?=\\)"
-    assert strutils.bytes_to_escaped_str(b'\xc3\xbc') == r"\xc3\xbc"
-    assert strutils.bytes_to_escaped_str(b"'") == r"'"
-    assert strutils.bytes_to_escaped_str(b'"') == r'"'
-
-    assert strutils.bytes_to_escaped_str(b"'", escape_single_quotes=True) == r"\'"
-    assert strutils.bytes_to_escaped_str(b'"', escape_single_quotes=True) == r'"'
-
-    assert strutils.bytes_to_escaped_str(b"\r\n\t") == "\\r\\n\\t"
-    assert strutils.bytes_to_escaped_str(b"\r\n\t", True) == "\r\n\t"
-
-    assert strutils.bytes_to_escaped_str(b"\n", True) == "\n"
-    assert strutils.bytes_to_escaped_str(b"\\n", True) == "\\ \\ n".replace(" ", "")
-    assert strutils.bytes_to_escaped_str(b"\\\n", True) == "\\ \\ \n".replace(" ", "")
-    assert strutils.bytes_to_escaped_str(b"\\\\n", True) == "\\ \\ \\ \\ n".replace(" ", "")
-
-    with tutils.raises(ValueError):
-        strutils.bytes_to_escaped_str(u"such unicode")
-
-
-def test_escaped_str_to_bytes():
-    assert strutils.escaped_str_to_bytes("foo") == b"foo"
-    assert strutils.escaped_str_to_bytes("\x08") == b"\b"
-    assert strutils.escaped_str_to_bytes("&!?=\\\\)") == br"&!?=\)"
-    assert strutils.escaped_str_to_bytes(u"\\x08") == b"\b"
-    assert strutils.escaped_str_to_bytes(u"&!?=\\\\)") == br"&!?=\)"
-    assert strutils.escaped_str_to_bytes(u"\u00fc") == b'\xc3\xbc'
-
-    with tutils.raises(ValueError):
-        strutils.escaped_str_to_bytes(b"very byte")
-
-
-def test_is_mostly_bin():
-    assert not strutils.is_mostly_bin(b"foo\xFF")
-    assert strutils.is_mostly_bin(b"foo" + b"\xFF" * 10)
-    assert not strutils.is_mostly_bin("")
-
-
-def test_is_xml():
-    assert not strutils.is_xml(b"foo")
-    assert strutils.is_xml(b"<foo")
-    assert strutils.is_xml(b"  \n<foo")
-
-
-def test_clean_hanging_newline():
-    s = "foo\n"
-    assert strutils.clean_hanging_newline(s) == "foo"
-    assert strutils.clean_hanging_newline("foo") == "foo"
-
-
-def test_hexdump():
-    assert list(strutils.hexdump(b"one\0" * 10))
-- 
cgit v1.2.3