Merge pull request #101 from jdufresne/asserIn

Replace deprecated assert_ with more specific assertIn

Author: knaperek

djangosaml2/tests/__init__.py

@@ -137,8 +137,8 @@ def test_login_one_idp(self):
         self.assertEqual(url.path, '/simplesaml/saml2/idp/SSOService.php')
 
         params = parse_qs(url.query)
-        self.assert_('SAMLRequest' in params)
-        self.assert_('RelayState' in params)
+        self.assertIn('SAMLRequest', params)
+        self.assertIn('RelayState', params)
 
         saml_request = params['SAMLRequest'][0]
         if PY_VERSION < (3,):
@@ -163,8 +163,8 @@ def test_login_one_idp(self):
         self.assertEqual(url.path, '/simplesaml/saml2/idp/SSOService.php')
 
         params = parse_qs(url.query)
-        self.assert_('SAMLRequest' in params)
-        self.assert_('RelayState' in params)
+        self.assertIn('SAMLRequest', params)
+        self.assertIn('RelayState', params)
         self.assertEqual(params['RelayState'][0], next)
 
     def test_login_several_idps(self):
@@ -195,8 +195,8 @@ def test_login_several_idps(self):
         self.assertEqual(url.path, '/simplesaml/saml2/idp/SSOService.php')
 
         params = parse_qs(url.query)
-        self.assert_('SAMLRequest' in params)
-        self.assert_('RelayState' in params)
+        self.assertIn('SAMLRequest', params)
+        self.assertIn('RelayState', params)
 
         saml_request = params['SAMLRequest'][0]
         if PY_VERSION < (3,):
@@ -307,7 +307,7 @@ def test_logout(self):
                          '/simplesaml/saml2/idp/SingleLogoutService.php')
 
         params = parse_qs(url.query)
-        self.assert_('SAMLRequest' in params)
+        self.assertIn('SAMLRequest', params)
 
         saml_request = params['SAMLRequest'][0]
         if PY_VERSION < (3,):
@@ -338,7 +338,7 @@ def test_logout_service_local(self):
                          '/simplesaml/saml2/idp/SingleLogoutService.php')
 
         params = parse_qs(url.query)
-        self.assert_('SAMLRequest' in params)
+        self.assertIn('SAMLRequest', params)
 
         saml_request = params['SAMLRequest'][0]
         if PY_VERSION < (3,):
@@ -390,7 +390,7 @@ def test_logout_service_global(self):
                          '/simplesaml/saml2/idp/SingleLogoutService.php')
 
         params = parse_qs(url.query)
-        self.assert_('SAMLResponse' in params)
+        self.assertIn('SAMLResponse', params)
 
         saml_response = params['SAMLResponse'][0]
         if PY_VERSION < (3,):