cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [cxf-fediz] branch master updated: Removing old spring2 test config
Date Wed, 04 Oct 2017 18:21:21 GMT
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git


The following commit(s) were added to refs/heads/master by this push:
     new f829430  Removing old spring2 test config
f829430 is described below

commit f829430a9020466a2ed68067686e79f65085b0d5
Author: Colm O hEigeartaigh <coheigea@apache.org>
AuthorDate: Wed Oct 4 19:21:10 2017 +0100

    Removing old spring2 test config
---
 .../spring/src/test/resources/fediz_config.xml     | 39 ----------------------
 .../systests/common/AbstractClientCertTests.java   |  6 ++--
 .../cxf/fediz/systests/common/AbstractTests.java   | 23 +++++++------
 .../cxf/fediz/systests/common/HTTPTestUtils.java   | 10 +++---
 4 files changed, 20 insertions(+), 58 deletions(-)

diff --git a/systests/spring/src/test/resources/fediz_config.xml b/systests/spring/src/test/resources/fediz_config.xml
index 8bb4ca6..fb1509d 100644
--- a/systests/spring/src/test/resources/fediz_config.xml
+++ b/systests/spring/src/test/resources/fediz_config.xml
@@ -61,45 +61,6 @@
         <logoutURL>/secure/logout</logoutURL>
         <logoutRedirectTo>/index.html</logoutRedirectTo>
 	</contextConfig>
-	<contextConfig name="/fedizhelloworld_spring2">
-		<audienceUris>
-			<audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
-		</audienceUris>
-		<certificateStores>
-			<trustManager>
-				<keyStore file="clienttrust.jks" password="storepass" type="JKS" />
-			</trustManager>
-		</certificateStores>
-		<trustedIssuers>
-			<issuer certificateValidation="PeerTrust" />
-		</trustedIssuers>
-		<maximumClockSkew>1000</maximumClockSkew>
-		<signingKey keyAlias="mytomidpkey" keyPassword="tompass">
-            <keyStore file="server.jks" password="tompass" type="JKS" />
-        </signingKey>
-		<protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xsi:type="federationProtocolType" version="1.0.0">
-			<realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
-			<issuer>https://localhost:${idp.https.port}/fediz-idp/federation</issuer>
-			<roleDelimiter>,</roleDelimiter>
-			<roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
-            <reply>/j_spring_fediz_security_check</reply>
-			<!--<authenticationType type="String">some auth type</authenticationType>-->
-			<!--<homeRealm type="Class">org.apache.fediz.realm.MyHomeRealm</homeRealm>-->
-			<!--<freshness>0</freshness>-->
-			<!--<reply>reply value</reply>-->
-			<!--<request>REQUEST</request>-->
-			<homeRealm type="String">urn:org:apache:cxf:fediz:idp:realm-A</homeRealm>
-			<claimTypesRequested>
-				<claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="false"
/>
-				<claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
optional="true" />
-				<claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" optional="true"
/>
-				<claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
optional="true" />
-			</claimTypesRequested>
-		</protocol>
-        <logoutURL>/secure/logout</logoutURL>
-        <logoutRedirectTo>/index.html</logoutRedirectTo>
-	</contextConfig>
 	<contextConfig name="/fedizhelloworld_spring3">
 		<audienceUris>
 			<audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/AbstractClientCertTests.java
b/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/AbstractClientCertTests.java
index 0599559..0f3aab8 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/AbstractClientCertTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/AbstractClientCertTests.java
@@ -109,7 +109,7 @@ public abstract class AbstractClientCertTests {
         Assert.assertTrue("User " + user + " claim " + claim + " is not 'alice@realma.org'",
                           bodyTextContent.contains(claim + "=alice@realma.org"));
 
-        // webClient.close();
+        webClient.close();
     }
 
     @org.junit.Test
@@ -148,7 +148,7 @@ public abstract class AbstractClientCertTests {
         Assert.assertTrue(wctx != null && wtrealm != null);
         Assert.assertTrue(wresult != null
             && wresult.contains("urn:oasis:names:tc:SAML:2.0:cm:holder-of-key"));
-        // webClient.close();
+        webClient.close();
 
         // Now invoke on the RP using the saved parameters above, but a different client
cert!
         final WebClient webClient2 = new WebClient();
@@ -173,7 +173,7 @@ public abstract class AbstractClientCertTests {
             Assert.assertTrue(401 == ex.getStatusCode() || 403 == ex.getStatusCode());
         }
 
-        // webClient2.close();
+        webClient2.close();
     }
 
 }
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/AbstractTests.java
b/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/AbstractTests.java
index 6c48d68..4677ea2 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/AbstractTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/AbstractTests.java
@@ -359,7 +359,7 @@ public abstract class AbstractTests {
 
         Assert.assertTrue(signature.checkSignatureValue(ki.getX509Certificate()));
 
-        // webClient.close();
+        webClient.close();
     }
 
     @Test
@@ -402,7 +402,7 @@ public abstract class AbstractTests {
 
         Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
 
-        // webClient.close();
+        webClient.close();
     }
 
     @Test
@@ -445,7 +445,7 @@ public abstract class AbstractTests {
 
         Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
 
-        // webClient.close();
+        webClient.close();
     }
 
     @Test
@@ -488,7 +488,7 @@ public abstract class AbstractTests {
 
         Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
 
-        // webClient.close();
+        webClient.close();
     }
 
     @Test
@@ -531,7 +531,7 @@ public abstract class AbstractTests {
 
         Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
 
-        // webClient.close();
+        webClient.close();
     }
 
     @Test
@@ -580,7 +580,7 @@ public abstract class AbstractTests {
             Assert.assertTrue(401 == ex.getStatusCode() || 403 == ex.getStatusCode());
         }
 
-        // webClient.close();
+        webClient.close();
     }
 
     @Test
@@ -627,7 +627,7 @@ public abstract class AbstractTests {
 
         Assert.assertTrue("Unexpected content of RP page", bodyTextContent2.contains("Secure
Test"));
 
-        // webClient.close();
+        webClient.close();
     }
 
     @org.junit.Test
@@ -657,7 +657,7 @@ public abstract class AbstractTests {
         idpUrl += "?wa=wsignin1.0&wreply=" + URLEncoder.encode(maliciousURL, "UTF-8");
         idpUrl += "&wtrealm=urn%3Aorg%3Aapache%3Acxf%3Afediz%3Afedizhelloworld";
         idpUrl += "&whr=urn%3Aorg%3Aapache%3Acxf%3Afediz%3Aidp%3Arealm-A";
-        // webClient.close();
+        webClient.close();
 
         final WebClient webClient2 = new WebClient();
         webClient2.setCookieManager(cookieManager);
@@ -673,7 +673,7 @@ public abstract class AbstractTests {
         } catch (FailingHttpStatusCodeException ex) {
             Assert.assertEquals(ex.getStatusCode(), 400);
         }
-        // webClient2.close();
+        webClient2.close();
     }
 
     @Test
@@ -725,7 +725,7 @@ public abstract class AbstractTests {
             Assert.assertTrue(401 == ex.getStatusCode() || 403 == ex.getStatusCode());
         }
 
-        // webClient.close();
+        webClient.close();
     }
 
     @org.junit.Test
@@ -795,7 +795,8 @@ public abstract class AbstractTests {
             // expected
         }
 
-        // webClient.close();
+        webClient.close();
+        webClient2.close();
 
     }
 
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/HTTPTestUtils.java
b/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/HTTPTestUtils.java
index 4c2a694..fcbcbd5 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/HTTPTestUtils.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/systests/common/HTTPTestUtils.java
@@ -61,7 +61,7 @@ public final class HTTPTestUtils {
         Assert.assertTrue("WS Federation Systests Examples".equals(rpPage.getTitleText())
                             || "WS Federation Systests Spring Examples".equals(rpPage.getTitleText()));
 
-        // webClient.close();
+        webClient.close();
         return rpPage.getBody().getTextContent();
     }
 
@@ -75,7 +75,7 @@ public final class HTTPTestUtils {
         webClient.getOptions().setJavaScriptEnabled(false);
         final HtmlPage rpPage = webClient.getPage(url);
 
-        // webClient.close();
+        webClient.close();
         return rpPage.getBody().getTextContent();
     }
 
@@ -100,7 +100,7 @@ public final class HTTPTestUtils {
         Assert.assertTrue("WS Federation Systests Examples".equals(rpPage.getTitleText())
                           || "WS Federation Systests Spring Examples".equals(rpPage.getTitleText()));
 
-        // webClient.close();
+        webClient.close();
         return rpPage.getBody().getTextContent();
     }
 
@@ -126,7 +126,7 @@ public final class HTTPTestUtils {
             webClient.getPage(imgSrc);
         }
 
-        // webClient.close();
+        webClient.close();
     }
 
     public static void logoutCleanup(String url, CookieManager cookieManager) throws IOException
{
@@ -149,7 +149,7 @@ public final class HTTPTestUtils {
             webClient.getPage(imgSrc);
         }
 
-        // webClient.close();
+        webClient.close();
     }
 
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <commits@cxf.apache.org>'].

Mime
View raw message