'[CommitOpenAM] [14896] branches/AME-7905-Refactor-SAML2/openam/openam-federation/'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       forgerock-openam-commit
Subject:    [CommitOpenAM] [14896] branches/AME-7905-Refactor-SAML2/openam/openam-federation/
From:       noreply () forgerock ! org
Date:       2015-07-30 14:20:48
Message-ID: 20150730142048.A9ADF3F8E4 () sources ! internal ! forgerock ! com
[Download RAW message or body]

[Attachment #2 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14896] branches/AME-7905-Refactor-SAML2/openam/openam-federation/openam-federation-library/src: \
Minimal refactor to allow unit testing.</title> </head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt;  } #msg dl a { font-weight: \
bold} #msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
 #patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
                .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/openam/?cs=14896">14896</a></dd> \
<dt>Author</dt> <dd>neil.madden</dd> <dt>Date</dt> <dd>2015-07-30 15:20:48 +0100 \
(Thu, 30 Jul 2015)</dd> </dl>

<h3>Log Message</h3>
<pre>Minimal refactor to allow unit testing.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesAME7905RefactorSAML2openamopenamfederationopenamfederationlibrar \
ysrcmainjavacomsunidentitysaml2profileIDPSSOFederatejava">branches/AME-7905-Refactor-S \
AML2/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSSOFederate.java</a></li>
 </ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchesAME7905RefactorSAML2openamopenamfederationopenamfederationlibrar \
ysrctestjavacomsunidentitysaml2profileIDPSSOFederateTestjava">branches/AME-7905-Refact \
or-SAML2/openam/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPSSOFederateTest.java</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesAME7905RefactorSAML2openamopenamfederationopenamfederationlibrarysrcmainjavacomsunidentitysaml2profileIDPSSOFederatejava"></a>
 <div class="modfile"><h4>Modified: \
branches/AME-7905-Refactor-SAML2/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSSOFederate.java \
(14895 => 14896)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-7905-Refactor-SAML2/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSSOFederate.java	2015-07-30 \
                14:18:26 UTC (rev 14895)
+++ branches/AME-7905-Refactor-SAML2/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSSOFederate.java	2015-07-30 \
14:20:48 UTC (rev 14896) </span><span class="lines">@@ -103,14 +103,6 @@
</span><span class="cx">     private static final String BINDING = \
&quot;binding&quot;; </span><span class="cx">     private static final String REQ_ID \
= &quot;ReqID&quot;; </span><span class="cx"> 
</span><del>-    private static FedMonAgent agent;
-    private static FedMonSAML2Svc saml2Svc;
-  
-    static {
-        agent = MonitorManager.getAgent();
-        saml2Svc = MonitorManager.getSAML2Svc();
-    }
-
</del><span class="cx">     private IDPSSOFederate() {
</span><span class="cx">     }
</span><span class="cx">  
</span><span class="lines">@@ -1047,12 +1039,12 @@
</span><span class="cx">                     if (sessionIndex != null &amp;&amp; \
(sessionIndex.length() != 0 )) {  </span><span class="cx">                         \
IDPCache.idpSessionsByIndices.put(sessionIndex,oldSess); </span><span class="cx"> 
</span><del>-                        if ((agent != null) &amp;&amp;
-                            agent.isRunning() &amp;&amp;
-                            (saml2Svc != null))
-                        {
-                            saml2Svc.setIdpSessionCount(
-		                (long)IDPCache.idpSessionsByIndices.size());
</del><ins>+                        final FedMonAgent agent = \
MonitorManager.getAgent(); +                        if (agent != null &amp;&amp; \
agent.isRunning()) { +                            final FedMonSAML2Svc saml2Svc = \
MonitorManager.getSAML2Svc(); +                            if (saml2Svc != null) {
+                                \
saml2Svc.setIdpSessionCount(IDPCache.idpSessionsByIndices.size()); +                  \
} </ins><span class="cx">                         }
</span><span class="cx">                     }
</span><span class="cx">                 }
</span></span></pre></div>
<a id="branchesAME7905RefactorSAML2openamopenamfederationopenamfederationlibrarysrctestjavacomsunidentitysaml2profileIDPSSOFederateTestjava"></a>
 <div class="addfile"><h4>Added: \
branches/AME-7905-Refactor-SAML2/openam/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPSSOFederateTest.java \
(0 => 14896)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-7905-Refactor-SAML2/openam/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPSSOFederateTest.java	 \
                (rev 0)
+++ branches/AME-7905-Refactor-SAML2/openam/openam-federation/openam-federation-librar \
y/src/test/java/com/sun/identity/saml2/profile/IDPSSOFederateTest.java	2015-07-30 \
14:20:48 UTC (rev 14896) </span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in \
compliance with the + * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for \
the + * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file \
and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the \
following below the CDDL + * Header, with the fields enclosed by brackets [] replaced \
by your own identifying + * information: &quot;Portions copyright [year] [name of \
copyright owner]&quot;. + *
+ * Copyright 2015 ForgeRock AS.
+ */
+
+package com.sun.identity.saml2.profile;
+
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+
+public class IDPSSOFederateTest {
+
+    @Mock
+    private HttpServletRequest mockRequest;
+
+    @Mock
+    private HttpServletResponse mockResponse;
+
+    @Mock
+    private PrintWriter mockPrintWriter;
+
+    @Mock
+    private RequestDispatcher mockRequestDispatcher;
+
+    @BeforeMethod
+    public void initMocks() {
+        MockitoAnnotations.initMocks(this);
+
+        given(mockRequest.getRequestDispatcher(anyString())).willReturn(mockRequestDispatcher);
 +    }
+
+    @Test
+    public void shouldBeTestable() {
+        // Given
+        String requestBinding = &quot;test&quot;;
+
+        // When
+        IDPSSOFederate.doSSOFederate(mockRequest, mockResponse, mockPrintWriter, \
requestBinding); +
+        // Then - nothing went boom...
+    }
+
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>

</body>
</html>


_______________________________________________
CommitOpenAM mailing list
CommitOpenAM@forgerock.org
https://lists.forgerock.org/mailman/listinfo/commitopenam


[prev in list] [next in list] [prev in thread] [next in thread]