From c580c0b03bfe620ff5b291dca54ba9eb58f71fab Mon Sep 17 00:00:00 2001 From: Ziad Sawalha Date: Fri, 20 May 2011 15:35:01 -0500 Subject: More version fixes --- test/IdentitySOAPUI.xml | 218 +++++++++++++++++++++---------------------- test/unit/test_exthandler.py | 12 +-- test/unit/test_server.py | 2 +- 3 files changed, 116 insertions(+), 116 deletions(-) (limited to 'test') diff --git a/test/IdentitySOAPUI.xml b/test/IdentitySOAPUI.xml index 86795a38..d5832df8 100644 --- a/test/IdentitySOAPUI.xml +++ b/test/IdentitySOAPUI.xml @@ -28,7 +28,7 @@ -]]>file:/Users/jorgew/projects/keystone/keystone/identity.wadl +]]>file:/Users/jorgew/projects/keystone/keystone/identity.wadl @@ -73,13 +73,13 @@ - + - + - + @@ -91,16 +91,16 @@ - + - + - + - + @@ -113,13 +113,13 @@ - + - + - + @@ -128,27 +128,27 @@ - + - + - + - + - + - + - + @@ -159,27 +159,27 @@ - + - + - - + + - + - + - + - + @@ -188,22 +188,22 @@ - + - + - + - + - + - + @@ -216,26 +216,26 @@ - + - + - + - + - + - + - + @@ -243,30 +243,30 @@ - + - + - + - + - + - + - + - + @@ -274,26 +274,26 @@ - + - + - + - + - + - + - + @@ -301,30 +301,30 @@ - + - + - + - + - + - + - + - + @@ -333,40 +333,40 @@ - + - + - + - + - + - + -]]>http://wadl.dev.java.net/2009/02file:/Users/jorgew/projects/keystone/keystone/xsd/api.xsd<schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:idm="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +]]>http://wadl.dev.java.net/2009/02file:/Users/jorgew/projects/keystone/keystone/xsd/api.xsd<schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.openstack.org/identity/api/v2.0" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:identity="http://docs.openstack.org/identity/api/v2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <include schemaLocation="token.xsd"/> <include schemaLocation="tenant.xsd"/> <include schemaLocation="fault.xsd"/> -</schema>http://www.w3.org/2001/XMLSchemafile:/Users/jorgew/projects/keystone/keystone/xsd/token.xsd +</schema>http://www.w3.org/2001/XMLSchemafile:/Users/jorgew/projects/keystone/keystone/xsd/token.xsd - - + + - + @@ -379,8 +379,8 @@ - - + + @@ -395,7 +395,7 @@ - + @@ -404,7 +404,7 @@ - + @@ -414,16 +414,16 @@ -]]>http://www.w3.org/2001/XMLSchemafile:/Users/jorgew/projects/keystone/keystone/xsd/tenant.xsd +]]>http://www.w3.org/2001/XMLSchemafile:/Users/jorgew/projects/keystone/keystone/xsd/tenant.xsd - - + + - + @@ -780,19 +780,19 @@ -]]>http://www.w3.org/2001/XMLSchemafile:/Users/jorgew/projects/keystone/keystone/xsd/fault.xsd +]]>http://www.w3.org/2001/XMLSchemafile:/Users/jorgew/projects/keystone/keystone/xsd/fault.xsd - - - - - - - - - + + + + + + + + + - + @@ -825,42 +825,42 @@ - + - + - + - + - + - + - + - + @@ -1094,47 +1094,47 @@ -]]>http://www.w3.org/2001/XMLSchemahttp://localhost:8080aliasTEMPLATExs:stringapplication/xml200 203v1:extensionapplication/json200 203application/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json400 404 500 503<xml-fragment/>http://localhost:8080application/xml200 203v1:extensionsapplication/json200 203application/xml400v1:badRequestapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json400 500 503<xml-fragment/>http://localhost:8080X-Auth-TokenHEADERxs:stringtokenIdTEMPLATExs:stringbelongsToQUERYxs:stringapplication/xml200 203v1:authapplication/json200 203application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml403v1:userDisabledapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json400 401 403 404 500 503<xml-fragment/>http://localhost:8080 +]]>http://www.w3.org/2001/XMLSchemahttp://localhost:8080aliasTEMPLATExs:stringapplication/xml200 203v1:extensionapplication/json200 203application/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json400 404 500 503<xml-fragment/>http://localhost:8080application/xml200 203v1:extensionsapplication/json200 203application/xml400v1:badRequestapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json400 500 503<xml-fragment/>http://localhost:8080X-Auth-TokenHEADERxs:stringtokenIdTEMPLATExs:stringbelongsToQUERYxs:stringapplication/xml200 203v1:authapplication/json200 203application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml403v1:userDisabledapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json400 401 403 404 500 503<xml-fragment/>http://localhost:8080 -application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json400 401 403 404 500 503<xml-fragment/>http://localhost:8080 +application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json400 401 403 404 500 503<xml-fragment/>http://localhost:8080 application/xmlv1:passwordCredentialsapplication/jsonapplication/xml200 203v1:authapplication/json200 -203application/xml401v1:unauthorizedapplication/xml403v1:userDisabledapplication/xml400v1:badRequestapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json401 +203application/xml401v1:unauthorizedapplication/xml403v1:userDisabledapplication/xml400v1:badRequestapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json401 403 400 500 503<xml-fragment/>http://localhost:8080<passwordCredentials password="secrete" username="joeuser" xmlns="http://docs.openstack.org/identity/api/v2.0"/>X-Auth-TokenHEADERxs:stringtenantIdTEMPLATExs:stringapplication/xml200 203v1:tenantapplication/json200 -203application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json400 +203application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json400 401 403 404 500 503<xml-fragment/>http://localhost:8080 -application/xmlv1:tenantapplication/jsonapplication/xml200v1:tenantapplication/json200application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml404v1:itemNotFoundapplication/xml400v1:badRequestapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json401 +application/xmlv1:tenantapplication/jsonapplication/xml200v1:tenantapplication/json200application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml404v1:itemNotFoundapplication/xml400v1:badRequestapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json401 403 404 400 500 503<xml-fragment/>http://localhost:8080<v1:tenant enabled="true" xmlns:v1="http://docs.openstack.org/identity/api/v2.0"> <v1:description>New Description</v1:description> </v1:tenant> -application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json400 +application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json400 401 403 404 500 503<entry key="Accept" value="application/xml" xmlns="http://eviware.com/soapui/config"/>http://localhost:8080 markerQUERYxs:stringlimitQUERYxs:intapplication/xml200 203v1:tenantsapplication/json200 -203application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json400 +203application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml400v1:badRequestapplication/xml404v1:itemNotFoundapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json400 401 403 404 500 503<xml-fragment/>http://localhost:8080application/xmlv1:tenantapplication/jsonapplication/xml201v1:tenantapplication/json201application/xml401v1:unauthorizedapplication/xml403v1:forbiddenapplication/xml 409v1:tenantConflictapplication/xml -400v1:badRequestapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json401 +400v1:badRequestapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json401 403 400 409 500 503<xml-fragment/>http://localhost:8080<v1:tenant enabled="true" id="my_new_tenant" xmlns:v1="http://docs.openstack.org/identity/api/v2.0"><v1:description>This is a description of my tenant. Thank you very much.</v1:description></v1:tenant>application/xml200 203v1:versionapplication/json200 -203application/xml400v1:badRequestapplication/xml500v1:idmFaultapplication/xml503v1:serviceUnavailableapplication/json400 +203application/xml400v1:badRequestapplication/xml500v1:identityFaultapplication/xml503v1:serviceUnavailableapplication/json400 500 503<xml-fragment/>http://localhost:8080SEQUENTIAL<xml-fragment/>http://localhost:8080authfalsefalsetokenfalsefalseuserfalsefalse diff --git a/test/unit/test_exthandler.py b/test/unit/test_exthandler.py index 4d09c148..5d41aeac 100644 --- a/test/unit/test_exthandler.py +++ b/test/unit/test_exthandler.py @@ -26,22 +26,22 @@ class UrlExtensionFilterTest(unittest.TestCase): self.filter = UrlExtensionFilter(MockWsgiApp(), {}) def test_xml_extension(self): - env = {'PATH_INFO': '/v1.0/someresource.xml'} + env = {'PATH_INFO': '/v2.0/someresource.xml'} self.filter(env, _start_response) - self.assertEqual('/v1.0/someresource', env['PATH_INFO']) + self.assertEqual('/v2.0/someresource', env['PATH_INFO']) self.assertEqual('application/xml', env['HTTP_ACCEPT']) def test_json_extension(self): - env = {'PATH_INFO': '/v1.0/someresource.json'} + env = {'PATH_INFO': '/v2.0/someresource.json'} self.filter(env, _start_response) - self.assertEqual('/v1.0/someresource', env['PATH_INFO']) + self.assertEqual('/v2.0/someresource', env['PATH_INFO']) self.assertEqual('application/json', env['HTTP_ACCEPT']) def test_extension_overrides_header(self): - env = {'PATH_INFO': '/v1.0/someresource.json', + env = {'PATH_INFO': '/v2.0/someresource.json', 'HTTP_ACCEPT': 'application/xml'} self.filter(env, _start_response) - self.assertEqual('/v1.0/someresource', env['PATH_INFO']) + self.assertEqual('/v2.0/someresource', env['PATH_INFO']) self.assertEqual('application/json', env['HTTP_ACCEPT']) diff --git a/test/unit/test_server.py b/test/unit/test_server.py index a6b98892..294b1e54 100644 --- a/test/unit/test_server.py +++ b/test/unit/test_server.py @@ -65,7 +65,7 @@ class TestServer(unittest.TestCase): self.assertTrue(server.get_auth_token(self.request),"Test Token") def test_get_normalized_request_content_exception(self): - self.assertRaises(fault.IDMFault,server.get_normalized_request_content,None,self.request) + self.assertRaises(fault.IdentityFault,server.get_normalized_request_content,None,self.request) def test_get_normalized_request_content_xml(self): self.request.environ["CONTENT_TYPE"]="application/xml" -- cgit