Skip to content

Commit

Permalink
Improve unittest
Browse files Browse the repository at this point in the history
  • Loading branch information
andresriancho committed Nov 29, 2019
1 parent 9401963 commit 06f73d2
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion w3af/core/data/url/handlers/tests/test_blacklist.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def test_blacklist_handler_block(self):
response = opener.open(request)

self.assertEqual(response.code, NO_CONTENT)
self.assertIsInstance(httpretty.last_request(), httpretty.core.HTTPrettyRequestEmpty)

@httpretty.activate
def test_blacklist_handler_pass(self):
Expand All @@ -83,6 +84,7 @@ def test_blacklist_handler_pass(self):
response = opener.open(request)

self.assertEqual(response.code, 200)
self.assertEqual(httpretty.last_request().method, httpretty.GET)

@httpretty.activate
def test_handler_order_block(self):
Expand All @@ -105,6 +107,7 @@ def test_handler_order_block(self):

self.assertEqual(response.code, NO_CONTENT)
self.assertEqual(response.id, 1)
self.assertIsInstance(httpretty.last_request(), httpretty.core.HTTPrettyRequestEmpty)

@httpretty.activate
def test_handler_order_pass(self):
Expand All @@ -130,15 +133,19 @@ def test_handler_order_pass(self):

request = HTTPRequest(safe_url)
response = opener.open(request)


last_request = httpretty.last_request()

self.assertEqual(response.code, 200)
self.assertEqual(response.id, 1)
self.assertEqual(last_request.method, httpretty.GET)

request = HTTPRequest(blocked_url)
response = opener.open(request)

self.assertEqual(response.code, 204)
self.assertEqual(response.id, 2)
self.assertIs(last_request, httpretty.last_request())

@httpretty.activate
def test_handler_order_pass_with_ignore_regex(self):
Expand Down Expand Up @@ -167,6 +174,8 @@ def test_handler_order_pass_with_ignore_regex(self):
request = HTTPRequest(safe_url)
response = opener.open(request)

last_request = httpretty.last_request()

self.assertEqual(response.code, 200)
self.assertEqual(response.id, 1)

Expand All @@ -175,6 +184,7 @@ def test_handler_order_pass_with_ignore_regex(self):

self.assertEqual(response.code, 204)
self.assertEqual(response.id, 2)
self.assertIs(last_request, httpretty.last_request())

@httpretty.activate
def test_handler_order_pass_with_both_methods(self):
Expand Down Expand Up @@ -205,6 +215,8 @@ def test_handler_order_pass_with_both_methods(self):
request = HTTPRequest(safe_url)
response = opener.open(request)

last_request = httpretty.last_request()

self.assertEqual(response.code, 200)
self.assertEqual(response.id, 1)

Expand All @@ -213,3 +225,4 @@ def test_handler_order_pass_with_both_methods(self):

self.assertEqual(response.code, 204)
self.assertEqual(response.id, 2)
self.assertIs(last_request, httpretty.last_request())

0 comments on commit 06f73d2

Please sign in to comment.