diff options
Diffstat (limited to 'tests/uamtests.py')
| -rw-r--r-- | tests/uamtests.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/tests/uamtests.py b/tests/uamtests.py index b2a5901..d1b18c4 100644 --- a/tests/uamtests.py +++ b/tests/uamtests.py @@ -18,13 +18,13 @@ import unittest -from sugar.tutorius.uam import parse_uri, SchemeError +from sugar.tutorius.uam import URI, SchemeError PARSE_SUITE={ #URI SCHEME HOST PARAMS PATH QUERY FRAGMENT -"tap://act.tut.org/": ["tap", "act.tut.org","", "/", "", ""], -"tap.gtk://a.t.o/0/1": ["tap.gtk","a.t.o","","/0/1","","",""], -"tap.gobject://a.t.o/Timer?timeout=5":["tap.gobject","a.t.o","","/Timer","timeout=5",""], +"tap://act.tut.org/": ["tap", "act.tut.org","", "/", dict(), ""], +"tap.gtk://a.t.o/0/1": ["tap.gtk","a.t.o","","/0/1", dict(), ""], +"tap.gobject://a.t.o/Timer?timeout=5":["tap.gobject","a.t.o","","/Timer",dict(timeout=["5"]),""], } class ParseUriTests(unittest.TestCase): @@ -32,25 +32,26 @@ class ParseUriTests(unittest.TestCase): def test_parse_uri(self): """Test parsing results""" for uri, test in PARSE_SUITE.items(): - res = parse_uri(uri) + res = URI(uri) + assert res.uri == uri, "%s : Expected uri %s, got %s" % (uri, uri, res.uri) assert res.scheme == test[0], "%s : Expected scheme %s, got %s" % (uri, test[0], res.scheme) - assert res.netloc == test[1], "%s : Expected netloc %s, got %s" % (uri, test[1], res.netloc) - assert res.params == test[2], "%s : Expected params %s, got %s" % (uri, test[2], res.params) + assert res.activity == test[1], "%s : Expected netloc %s, got %s" % (uri, test[1], res.netloc) + #Unused, assert res.params == test[2], "%s : Expected params %s, got %s" % (uri, test[2], res.params) assert res.path == test[3], "%s : Expected path %s, got %s" % (uri, test[3], res.path) - assert res.query == test[4], "%s : Expected query %s, got %s" % (uri, test[4], res.query) - assert res.fragment == test[5], "%s : Expected fragment %s, got %s" % (uri, test[5], res.fragment) + assert res.query == test[4], "%s : Expected query %s, got %s" % (uri, test[4], str(res.query)) + assert res.addon == test[5], "%s : Expected fragment %s, got %s" % (uri, test[5], res.fragment) def test_errors(self): """Test exceptions""" try: - parse_uri("http://something.org/path") + URI("http://something.org/path") assert False, "Parsing http should fail" except SchemeError: pass try: - parse_uri("tap.notarealsubscheme://something.org/path") + URI("tap.notarealsubscheme://something.org/path") assert False, "Invalid Subscheme should fail" except SchemeError: pass |