You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/11/28 17:15:17 UTC
cxf-fediz git commit: Revert "Close WebClient"
Repository: cxf-fediz
Updated Branches:
refs/heads/master 019cba632 -> bbf0ea557
Revert "Close WebClient"
This reverts commit ba70a56eb16decfdeb8b83b5054d2676e14b9fd0.
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/bbf0ea55
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/bbf0ea55
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/bbf0ea55
Branch: refs/heads/master
Commit: bbf0ea5574b21539e9b203ff20947a15b610c659
Parents: 019cba6
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 28 17:05:27 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 28 17:05:27 2016 +0000
----------------------------------------------------------------------
.../integrationtests/AbstractClientCertTests.java | 6 +++---
.../cxf/fediz/integrationtests/AbstractTests.java | 18 +++++++++---------
.../cxf/fediz/integrationtests/HTTPTestUtils.java | 10 +++++-----
3 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/bbf0ea55/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
index f0431b8..e8edc88 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/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();
@@ -175,7 +175,7 @@ public abstract class AbstractClientCertTests {
|| ex.getMessage().contains("403 Forbidden"));
}
- webClient2.close();
+ // webClient2.close();
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/bbf0ea55/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
index 28e3c66..547115e 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
@@ -354,7 +354,7 @@ public abstract class AbstractTests {
Assert.assertTrue(signature.checkSignatureValue(ki.getX509Certificate()));
- webClient.close();
+ // webClient.close();
}
@Test
@@ -399,7 +399,7 @@ public abstract class AbstractTests {
Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
- webClient.close();
+ // webClient.close();
}
@Test
@@ -444,7 +444,7 @@ public abstract class AbstractTests {
Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
- webClient.close();
+ // webClient.close();
}
@Test
@@ -489,7 +489,7 @@ public abstract class AbstractTests {
Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
- webClient.close();
+ // webClient.close();
}
@Test
@@ -540,7 +540,7 @@ public abstract class AbstractTests {
|| ex.getMessage().contains("403 Forbidden"));
}
- webClient.close();
+ // webClient.close();
}
@Test
@@ -587,7 +587,7 @@ public abstract class AbstractTests {
Assert.assertTrue("Unexpected content of RP page", bodyTextContent2.contains("Secure Test"));
- webClient.close();
+ // webClient.close();
}
@org.junit.Test
@@ -617,7 +617,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);
@@ -633,7 +633,7 @@ public abstract class AbstractTests {
} catch (FailingHttpStatusCodeException ex) {
Assert.assertEquals(ex.getStatusCode(), 400);
}
- webClient2.close();
+ // webClient2.close();
}
@Test
@@ -688,7 +688,7 @@ public abstract class AbstractTests {
|| ex.getMessage().contains("403 Forbidden"));
}
- webClient.close();
+ // webClient.close();
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/bbf0ea55/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/HTTPTestUtils.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/HTTPTestUtils.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/HTTPTestUtils.java
index f69a088..921e97f 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/HTTPTestUtils.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/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();
}
}