[jboss-cvs] Picketlink SVN: r596 - in federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings: workflow and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2010-12-09 17:46:33 -0500 (Thu, 09 Dec 2010)
New Revision: 596

Modified:
   federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java
   federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContextClassLoader.java
   federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java
Log:
minor 

Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java
===================================================================
--- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java	2010-12-09 22:45:57 UTC (rev 595)
+++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java	2010-12-09 22:46:33 UTC (rev 596)
@@ -899,7 +899,8 @@
 
    public InputStream getResourceAsStream(String arg0)
    {
-      return Thread.currentThread().getContextClassLoader().getResourceAsStream(arg0);
+      ClassLoader tcl = Thread.currentThread().getContextClassLoader(); 
+      return tcl.getResourceAsStream( arg0 );
    }
 
    public Set getResourcePaths(String arg0)

Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContextClassLoader.java
===================================================================
--- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContextClassLoader.java	2010-12-09 22:45:57 UTC (rev 595)
+++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContextClassLoader.java	2010-12-09 22:46:33 UTC (rev 596)
@@ -56,6 +56,9 @@
    {
       if(profile == null)
          throw new RuntimeException("null profile");
-      return delegate.getResourceAsStream(profile + "/" + name);
+      InputStream is = delegate.getResourceAsStream(profile + "/" + name);
+      if( is == null )
+         is = super.getResourceAsStream(name);
+      return is;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java	2010-12-09 22:45:57 UTC (rev 595)
+++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java	2010-12-09 22:46:33 UTC (rev 596)
@@ -21,6 +21,8 @@
  */
 package org.picketlink.test.identity.federation.bindings.workflow;
 
+import static org.junit.Assert.*;
+
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -37,12 +39,13 @@
 
 import org.apache.catalina.deploy.LoginConfig;
 import org.apache.catalina.realm.GenericPrincipal;
+import org.junit.Test;
 import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request;
 import org.picketlink.identity.federation.api.saml.v2.response.SAML2Response;
 import org.picketlink.identity.federation.bindings.tomcat.idp.IDPWebBrowserSSOValve;
 import org.picketlink.identity.federation.bindings.tomcat.sp.SPRedirectFormAuthenticator;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType;
-import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType;
+import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; 
+import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType;
 import org.picketlink.identity.federation.web.constants.GeneralConstants;
 import org.picketlink.identity.federation.web.core.IdentityServer;
 import org.picketlink.identity.federation.web.util.RedirectBindingUtil;
@@ -60,10 +63,10 @@
  * @since Oct 21, 2009
  */
 @SuppressWarnings("unused")
-public class SAML2LogoutTomcatWorkflowUnitTestCase extends TestCase
+public class SAML2LogoutTomcatWorkflowUnitTestCase
 {
    private String profile = "saml2/logout";
-   private ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+   private ClassLoader tcl;
 
    private String IDP = "http://localhost:8080/idp/"; 
    private String employee = "http://localhost:8080/employee/"; 
@@ -80,6 +83,7 @@
     * @see {@code GeneralConstants#GLOBAL_LOGOUT}
     * @throws Exception
     */
+   @Test
    public void testSPLogOutRequestGeneration() throws Exception
    { 
       MockCatalinaSession session = new MockCatalinaSession();
@@ -128,8 +132,10 @@
       assertEquals("Match Employee URL", employee, lor.getIssuer().getValue());
    }
    
+
+   @Test
    public void testSAML2LogOutFromIDP() throws Exception
-   { 
+   {  
       MockCatalinaSession session = new MockCatalinaSession();
       
       MockCatalinaContextClassLoader mclIDP = setupTCL(profile + "/idp");
@@ -305,6 +311,7 @@
 
    private MockCatalinaContextClassLoader setupTCL(String resource)
    {
+      tcl = Thread.currentThread().getContextClassLoader();
       URL[] urls = new URL[] {tcl.getResource(resource)};
       
       MockCatalinaContextClassLoader mcl = new MockCatalinaContextClassLoader(urls);