Updated Python high-level binding and tests.

May all the lights be green!

5 files changed, 15 insertions, 20 deletions

diff --git a/python/tests/IdentityProvider.py b/python/tests/IdentityProvider.py
index 8ea800e6..90673d61 100644
--- a/python/tests/IdentityProvider.py
+++ b/python/tests/IdentityProvider.py
@@ -55,7 +55,7 @@ class IdentityProviderMixin(Provider.ProviderMixin):
         lassoServer = self.getLassoServer()
         if handler.httpRequest.method == 'GET':
             # Single sign-on using HTTP redirect.
-            login = lasso.Login.new(lassoServer)
+            login = lasso.Login(lassoServer)
             session = handler.session
             if session is not None and session.lassoSessionDump is not None:
                 login.set_session_from_dump(session.lassoSessionDump)
@@ -82,7 +82,7 @@ class IdentityProviderMixin(Provider.ProviderMixin):
         elif handler.httpRequest.method == 'POST' \
                and handler.httpRequest.headers.get('Content-Type', None) == 'text/xml':
             # SOAP request => LECP single sign-on.
-            lecp = lasso.Lecp.new(lassoServer)
+            lecp = lasso.Lecp(lassoServer)
             session = handler.session
             if session is not None and session.lassoSessionDump is not None:
                 lecp.set_session_from_dump(session.lassoSessionDump)
@@ -160,7 +160,7 @@ class IdentityProviderMixin(Provider.ProviderMixin):
         requestType = lasso.get_request_type_from_soap_msg(soapRequestMsg)
         if requestType == lasso.requestTypeLogin:
             lassoServer = self.getLassoServer()
-            login = lasso.Login.new(lassoServer)
+            login = lasso.Login(lassoServer)
             # FIXME: What should we return when there is an error in process_request_msg?
             # FIXME: Create a new Lasso function build_response_msg, with either None or
             # soapResponseMessage as argument. It is called after process_request_message and
@@ -177,7 +177,7 @@ class IdentityProviderMixin(Provider.ProviderMixin):
                 headers = {'Content-Type': 'text/xml'}, body = soapResponseMsg)
         elif requestType == lasso.requestTypeLogout:
             lassoServer = self.getLassoServer()
-            logout = lasso.Logout.new(lassoServer, lasso.providerTypeIdp)
+            logout = lasso.Logout(lassoServer, lasso.providerTypeIdp)
             logout.process_request_msg(soapRequestMsg, lasso.httpMethodSoap)
             nameIdentifier = logout.nameIdentifier
             failUnless(nameIdentifier)
diff --git a/python/tests/LibertyEnabledClientProxy.py b/python/tests/LibertyEnabledClientProxy.py
index 7c4d5647..b925d8fc 100644
--- a/python/tests/LibertyEnabledClientProxy.py
+++ b/python/tests/LibertyEnabledClientProxy.py
@@ -92,7 +92,7 @@ class LibertyEnabledClientProxyMixin(abstractweb.WebClientMixin):
         failUnless(libertyEnabledHeader)
         failUnless('LIBV=urn:liberty:iff:2003-08' in libertyEnabledHeader)
         lassoServer = self.getLassoServer()
-        lecp = lasso.Lecp.new(lassoServer)
+        lecp = lasso.Lecp(lassoServer)
         authnRequestEnvelope = httpResponse.body
         lecp.process_authn_request_envelope_msg(authnRequestEnvelope)
         # FIXME: The service provider could return an IDPList in authnRequestEnvelope, so that
diff --git a/python/tests/ServiceProvider.py b/python/tests/ServiceProvider.py
index 3f06d0fe..a9d75a72 100644
--- a/python/tests/ServiceProvider.py
+++ b/python/tests/ServiceProvider.py
@@ -33,7 +33,7 @@ class ServiceProviderMixin(Provider.ProviderMixin):
 
     def assertionConsumer(self, handler):
         lassoServer = self.getLassoServer()
-        login = lasso.Login.new(lassoServer)
+        login = lasso.Login(lassoServer)
 
         if handler.httpRequest.method == 'GET':
             relayState = handler.httpRequest.getQueryField('RelayState', None)
@@ -170,7 +170,7 @@ class ServiceProviderMixin(Provider.ProviderMixin):
         libertyEnabled = handler.httpRequest.headers.get('Liberty-Enabled', None)
         userAgent = handler.httpRequest.headers.get('User-Agent', None)
         # FIXME: Lasso should have a function to compute useLecp.
-        # Or this should be done in lasso.Login.new(lassoServer, libertyEnabled, userAgent)
+        # Or this should be done in lasso.Login(lassoServer, libertyEnabled, userAgent)
         useLecp = False
         if libertyEnabled:
             useLecp = 'urn:liberty:iff:2003-08' in libertyEnabled
@@ -188,7 +188,7 @@ class ServiceProviderMixin(Provider.ProviderMixin):
         relayState = handler.httpRequest.getQueryField('RelayState', None)
         lassoServer = self.getLassoServer()
         if useLecp:
-            lecp = lasso.Lecp.new(lassoServer)
+            lecp = lasso.Lecp(lassoServer)
             lecp.init_authn_request()
             failUnlessEqual(lecp.request_type, lasso.messageTypeAuthnRequest)
 
@@ -222,7 +222,7 @@ class ServiceProviderMixin(Provider.ProviderMixin):
             headers.update(self.libertyEnabledHeaders)
             return handler.respond(headers = headers, body = authnRequestEnvelopeMsg)
         else:
-            login = lasso.Login.new(lassoServer)
+            login = lasso.Login(lassoServer)
             login.init_authn_request()
             failUnlessEqual(login.request_type, lasso.messageTypeAuthnRequest)
             if forceAuthn:
@@ -270,7 +270,7 @@ class ServiceProviderMixin(Provider.ProviderMixin):
 
     def logout_do(self, handler, session, user):
         lassoServer = self.getLassoServer()
-        logout = lasso.Logout.new(lassoServer, lasso.providerTypeSp)
+        logout = lasso.Logout(lassoServer, lasso.providerTypeSp)
         if user.lassoIdentityDump is not None:
             logout.set_identity_from_dump(user.lassoIdentityDump)
         if session.lassoSessionDump is not None:
diff --git a/python/tests/errorchecking_tests.py b/python/tests/errorchecking_tests.py
index ab15bd69..adf2ac78 100644
--- a/python/tests/errorchecking_tests.py
+++ b/python/tests/errorchecking_tests.py
@@ -37,8 +37,6 @@ import lasso
 
 class ErrorCheckingTestCase(unittest.TestCase):
     def DISABLEDtest01(self):
-        # the user should call lasso.Login.new(); but what if it doesn't ?
-        # An exception should be raised; the program should not segfault.
         try:
             lasso.Login(None).msg_url
         except:
@@ -54,13 +52,13 @@ class ErrorCheckingTestCase(unittest.TestCase):
     def test03(self):
         # This time; we got something wrong as query string; we pass it to
         # init_from_authn_request_msg; surely it shouldn't segfault
-        server = lasso.Server.new(
+        server = lasso.Server(
             '../../tests/data/idp1-la/metadata.xml',
             None, # '../../tests/data/idp1-la/public-key.pem' is no more used
             '../../tests/data/idp1-la/private-key-raw.pem',
             '../../tests/data/idp1-la/certificate.pem',
             lasso.signatureMethodRsaSha1)
-        login = lasso.Login.new(server)
+        login = lasso.Login(server)
         try:
             login.init_from_authn_request_msg("", lasso.httpMethodRedirect)
         except:
diff --git a/python/tests/login_tests.py b/python/tests/login_tests.py
index 72735643..9f8e877e 100644
--- a/python/tests/login_tests.py
+++ b/python/tests/login_tests.py
@@ -44,7 +44,7 @@ class LoginTestCase(unittest.TestCase):
         site = IdentityProvider(internet, 'https://idp1')
         site.providerId = 'https://idp1/metadata'
 
-        lassoServer = lasso.Server.new(
+        lassoServer = lasso.Server(
             '../../tests/data/idp1-la/metadata.xml',
             None, # '../../tests/data/idp1-la/public-key.pem' is no more used
             '../../tests/data/idp1-la/private-key-raw.pem',
@@ -56,7 +56,6 @@ class LoginTestCase(unittest.TestCase):
             '../../tests/data/ca1-la/certificate.pem')
         site.lassoServerDump = lassoServer.dump()
         failUnless(site.lassoServerDump)
-        lassoServer.destroy()
 
         site.newUser('Chantereau')
         site.newUser('Clapies')
@@ -67,21 +66,20 @@ class LoginTestCase(unittest.TestCase):
 
     def generateLibertyEnabledClientProxy(self, internet):
         clientProxy = LibertyEnabledClientProxy(internet)
-        lassoServer = lasso.Server.new()
+        lassoServer = lasso.Server()
         lassoServer.add_provider(
             '../../tests/data/idp1-la/metadata.xml',
             '../../tests/data/idp1-la/public-key.pem',
             '../../tests/data/ca1-la/certificate.pem')
         clientProxy.lassoServerDump = lassoServer.dump()
         failUnless(clientProxy.lassoServerDump)
-        lassoServer.destroy()
         return clientProxy
         
     def generateSpSite(self, internet):
         site = ServiceProvider(internet, 'https://sp1')
         site.providerId = 'https://service-provider/metadata'
 
-        lassoServer = lasso.Server.new(
+        lassoServer = lasso.Server(
             '../../tests/data/sp1-la/metadata.xml',
             None, # '../../tests/data/sp1-la/public-key.pem' is no more used
             '../../tests/data/sp1-la/private-key-raw.pem',
@@ -93,7 +91,6 @@ class LoginTestCase(unittest.TestCase):
             '../../tests/data/ca1-la/certificate.pem')
         site.lassoServerDump = lassoServer.dump()
         failUnless(site.lassoServerDump)
-        lassoServer.destroy()
 
         site.newUser('Nicolas')
         site.newUser('Romain')