mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
use assert[Not]In where appropriate
This commit is contained in:
Ezio Melotti
parent
0f77f465ff
commit
b58e0bd8bb
39 changed files with 176 additions and 173 deletions
|
|
@ -18,8 +18,8 @@ def server(evt, numrequests):
|
|||
serv.set_server_title("DocXMLRPCServer Test Documentation")
|
||||
serv.set_server_name("DocXMLRPCServer Test Docs")
|
||||
serv.set_server_documentation(
|
||||
"""This is an XML-RPC server's documentation, but the server can be used by
|
||||
POSTing to /RPC2. Try self.add, too.""")
|
||||
"This is an XML-RPC server's documentation, but the server "
|
||||
"can be used by POSTing to /RPC2. Try self.add, too.")
|
||||
|
||||
# Create and register classes and functions
|
||||
class TestClass(object):
|
||||
|
|
@ -106,9 +106,9 @@ class DocXMLRPCHTTPGETServer(unittest.TestCase):
|
|||
self.client.request("GET", "/")
|
||||
response = self.client.getresponse()
|
||||
|
||||
self.assertTrue(
|
||||
b"""<dl><dt><a name="-<lambda>"><strong><lambda></strong></a>(x, y)</dt></dl>"""
|
||||
in response.read())
|
||||
self.assertIn((b'<dl><dt><a name="-<lambda>"><strong>'
|
||||
b'<lambda></strong></a>(x, y)</dt></dl>'),
|
||||
response.read())
|
||||
|
||||
def test_autolinking(self):
|
||||
"""Test that the server correctly automatically wraps references to PEPS
|
||||
|
|
@ -120,9 +120,17 @@ b"""<dl><dt><a name="-<lambda>"><strong><lambda></strong></a>(x, y)<
|
|||
self.client.request("GET", "/")
|
||||
response = self.client.getresponse().read()
|
||||
|
||||
self.assertTrue( # This is ugly ... how can it be made better?
|
||||
b"""<dl><dt><a name="-add"><strong>add</strong></a>(x, y)</dt><dd><tt>Add two instances together. This follows <a href="http://www.python.org/dev/peps/pep-0008/">PEP008</a>, but has nothing<br>\nto do with <a href="http://www.rfc-editor.org/rfc/rfc1952.txt">RFC1952</a>. Case should matter: pEp008 and rFC1952. Things<br>\nthat start with http and ftp should be auto-linked, too:<br>\n<a href="http://google.com">http://google.com</a>.</tt></dd></dl>"""
|
||||
in response, response)
|
||||
self.assertIn(
|
||||
(b'<dl><dt><a name="-add"><strong>add</strong></a>(x, y)</dt><dd>'
|
||||
b'<tt>Add two instances together. This '
|
||||
b'follows <a href="http://www.python.org/dev/peps/pep-0008/">'
|
||||
b'PEP008</a>, but has nothing<br>\nto do '
|
||||
b'with <a href="http://www.rfc-editor.org/rfc/rfc1952.txt">'
|
||||
b'RFC1952</a>. Case should matter: pEp008 '
|
||||
b'and rFC1952. Things<br>\nthat start '
|
||||
b'with http and ftp should be '
|
||||
b'auto-linked, too:<br>\n<a href="http://google.com">'
|
||||
b'http://google.com</a>.</tt></dd></dl>'), response)
|
||||
|
||||
def test_system_methods(self):
|
||||
"""Test the precense of three consecutive system.* methods.
|
||||
|
|
@ -133,8 +141,26 @@ b"""<dl><dt><a name="-add"><strong>add</strong></a>(x, y)</dt><dd><tt>Add t
|
|||
self.client.request("GET", "/")
|
||||
response = self.client.getresponse().read()
|
||||
|
||||
self.assertTrue(
|
||||
b"""<dl><dt><a name="-system.methodHelp"><strong>system.methodHelp</strong></a>(method_name)</dt><dd><tt><a href="#-system.methodHelp">system.methodHelp</a>(\'add\') => "Adds two integers together"<br>\n <br>\nReturns a string containing documentation for the specified method.</tt></dd></dl>\n<dl><dt><a name="-system.methodSignature"><strong>system.methodSignature</strong></a>(method_name)</dt><dd><tt><a href="#-system.methodSignature">system.methodSignature</a>(\'add\') => [double, int, int]<br>\n <br>\nReturns a list describing the signature of the method. In the<br>\nabove example, the add method takes two integers as arguments<br>\nand returns a double result.<br>\n <br>\nThis server does NOT support system.methodSignature.</tt></dd></dl>\n<dl><dt><a name="-test_method"><strong>test_method</strong></a>(arg)</dt><dd><tt>Test method\'s docs. This method truly does very little.</tt></dd></dl>""" in response)
|
||||
self.assertIn(
|
||||
(b'<dl><dt><a name="-system.methodHelp"><strong>system.methodHelp'
|
||||
b'</strong></a>(method_name)</dt><dd><tt><a href="#-system.method'
|
||||
b'Help">system.methodHelp</a>(\'add\') => "Adds '
|
||||
b'two integers together"<br>\n <br>\nReturns a'
|
||||
b' string containing documentation for '
|
||||
b'the specified method.</tt></dd></dl>\n<dl><dt><a name'
|
||||
b'="-system.methodSignature"><strong>system.methodSignature</strong>'
|
||||
b'</a>(method_name)</dt><dd><tt><a href="#-system.methodSignature">'
|
||||
b'system.methodSignature</a>(\'add\') => [double, '
|
||||
b'int, int]<br>\n <br>\nReturns a list '
|
||||
b'describing the signature of the method.'
|
||||
b' In the<br>\nabove example, the add '
|
||||
b'method takes two integers as arguments'
|
||||
b'<br>\nand returns a double result.<br>\n '
|
||||
b'<br>\nThis server does NOT support system'
|
||||
b'.methodSignature.</tt></dd></dl>\n<dl><dt><a name="-test_method">'
|
||||
b'<strong>test_method</strong></a>(arg)</dt><dd><tt>Test '
|
||||
b'method\'s docs. This method truly does'
|
||||
b' very little.</tt></dd></dl>'), response)
|
||||
|
||||
def test_autolink_dotted_methods(self):
|
||||
"""Test that selfdot values are made strong automatically in the
|
||||
|
|
@ -142,8 +168,8 @@ b"""<dl><dt><a name="-system.methodHelp"><strong>system.methodHelp</strong></a>(
|
|||
self.client.request("GET", "/")
|
||||
response = self.client.getresponse()
|
||||
|
||||
self.assertTrue(b"""Try self.<strong>add</strong>, too.""" in
|
||||
response.read())
|
||||
self.assertIn(b"""Try self.<strong>add</strong>, too.""",
|
||||
response.read())
|
||||
|
||||
def test_main():
|
||||
support.run_unittest(DocXMLRPCHTTPGETServer)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue