From 690b8b4f4e00d60b373b5a1481930f21bbc5054a Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Wed, 5 Aug 2015 21:32:53 +0200
Subject: add move tests and code from mitmproxy

---
 test/test_utils.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'test/test_utils.py')

diff --git a/test/test_utils.py b/test/test_utils.py
index 5e681eb6..aafa1571 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -101,3 +101,34 @@ def test_get_header_tokens():
     assert utils.get_header_tokens(h, "foo") == ["bar", "voing"]
     h["foo"] = ["bar, voing", "oink"]
     assert utils.get_header_tokens(h, "foo") == ["bar", "voing", "oink"]
+
+
+
+
+
+def test_multipartdecode():
+    boundary = 'somefancyboundary'
+    headers = odict.ODict(
+        [('content-type', ('multipart/form-data; boundary=%s' % boundary))])
+    content = "--{0}\n" \
+              "Content-Disposition: form-data; name=\"field1\"\n\n" \
+              "value1\n" \
+              "--{0}\n" \
+              "Content-Disposition: form-data; name=\"field2\"\n\n" \
+              "value2\n" \
+              "--{0}--".format(boundary)
+
+    form = utils.multipartdecode(headers, content)
+
+    assert len(form) == 2
+    assert form[0] == ('field1', 'value1')
+    assert form[1] == ('field2', 'value2')
+
+
+def test_parse_content_type():
+    p = utils.parse_content_type
+    assert p("text/html") == ("text", "html", {})
+    assert p("text") is None
+
+    v = p("text/html; charset=UTF-8")
+    assert v == ('text', 'html', {'charset': 'UTF-8'})
-- 
cgit v1.2.3


From 476badf45cd085d69b6162cd48983e3cd22cefcc Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Mon, 10 Aug 2015 20:36:47 +0200
Subject: cleanup imports

---
 test/test_utils.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'test/test_utils.py')

diff --git a/test/test_utils.py b/test/test_utils.py
index aafa1571..27fc5cc5 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,4 +1,3 @@
-import urlparse
 
 from netlib import utils, odict, tutils
 
-- 
cgit v1.2.3


From ff27d65f08d00c312a162965c5b1db711aa8f6ed Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Mon, 10 Aug 2015 20:44:36 +0200
Subject: cleanup whitespace

---
 test/test_utils.py | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'test/test_utils.py')

diff --git a/test/test_utils.py b/test/test_utils.py
index 27fc5cc5..89ce0f17 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -29,8 +29,6 @@ def test_pretty_size():
     assert utils.pretty_size(1024 * 1024) == "1MB"
 
 
-
-
 def test_parse_url():
     assert not utils.parse_url("")
 
@@ -85,7 +83,6 @@ def test_urlencode():
     assert utils.urlencode([('foo', 'bar')])
 
 
-
 def test_urldecode():
     s = "one=two&three=four"
     assert len(utils.urldecode(s)) == 2
@@ -102,9 +99,6 @@ def test_get_header_tokens():
     assert utils.get_header_tokens(h, "foo") == ["bar", "voing", "oink"]
 
 
-
-
-
 def test_multipartdecode():
     boundary = 'somefancyboundary'
     headers = odict.ODict(
-- 
cgit v1.2.3


From 6a30ad2ad236fa20d086e271ff962ebc907da027 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Mon, 10 Aug 2015 20:50:05 +0200
Subject: fix minor style offences

---
 test/test_utils.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'test/test_utils.py')

diff --git a/test/test_utils.py b/test/test_utils.py
index 89ce0f17..fc7174d6 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,4 +1,3 @@
-
 from netlib import utils, odict, tutils
 
 
-- 
cgit v1.2.3