9:12 p.m.
Author: anil.saldhana(a)jboss.com
Date: 2010-12-09 15:12:48 -0500 (Thu, 09 Dec 2010)
New Revision: 590
Modified:
federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java
Log:
use junit4
Modified:
federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java
===================================================================
---
federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java 2010-12-09
20:11:59 UTC (rev 589)
+++
federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java 2010-12-09
20:12:48 UTC (rev 590)
@@ -21,6 +21,10 @@
*/
package org.picketlink.test.identity.federation.web.workflow.saml2;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
@@ -34,13 +38,12 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
-import junit.framework.TestCase;
-
+import org.junit.Test;
import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request;
import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
import org.picketlink.identity.federation.core.util.Base64;
import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType;
-import org.picketlink.identity.federation.saml.v2.SAML2Object;
+import org.picketlink.identity.federation.saml.v2.SAML2Object;
import org.picketlink.identity.federation.web.constants.GeneralConstants;
import org.picketlink.identity.federation.web.core.IdentityServer;
import org.picketlink.identity.federation.web.filters.SPFilter;
@@ -63,10 +66,10 @@
* @author Anil.Saldhana(a)redhat.com
* @since Oct 7, 2009
*/
-public class SAML2LogoutWorkflowUnitTestCase extends TestCase
+public class SAML2LogoutWorkflowUnitTestCase
{
private String profile = "saml2/logout";
- private ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ private ClassLoader tcl;
private String employee = "http://localhost:8080/employee/";
private String sales = "http://localhost:8080/sales/";
@@ -76,8 +79,11 @@
* @see {@code GeneralConstants#GLOBAL_LOGOUT}
* @throws Exception
*/
+ @Test
public void testSPFilterLogOutRequestGeneration() throws Exception
{
+ tcl = Thread.currentThread().getContextClassLoader();
+
MockHttpSession session = new MockHttpSession();
session.setAttribute(GeneralConstants.PRINCIPAL_ID, new Principal()
{
@@ -141,8 +147,10 @@
* f) employee app invalidates its session
* @throws Exception
*/
+ @Test
public void testSAML2LogOutFromIDPServlet() throws Exception
{
+ tcl = Thread.currentThread().getContextClassLoader();
MockHttpSession session = new MockHttpSession();
MockContextClassLoader mclIDP = setupTCL(profile + "/idp");