Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 11068eb42 -> 272031389
Removing old configuration tag Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/56d12546 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/56d12546 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/56d12546 Branch: refs/heads/3.0.x-fixes Commit: 56d12546c6348f387d2214ac779abd07d53f68b0 Parents: 11068eb Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Apr 24 15:32:37 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Apr 24 15:36:00 2015 +0100 ---------------------------------------------------------------------- .../systest/jaxrs/security/saml/JAXRSSamlTest.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/56d12546/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java index 36773f8..0337c7d 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java @@ -60,7 +60,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { public void testGetBookSAMLTokenAsHeader() throws Exception { String address = "https://localhost:"; + PORT + "/samlheader/bookstore/books/123"; - WebClient wc = createWebClient(address, new SamlHeaderOutInterceptor(), null, true); + WebClient wc = createWebClient(address, new SamlHeaderOutInterceptor(), null); try { Book book = wc.get(Book.class); @@ -100,8 +100,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { String address = "https://localhost:"; + PORT + "/samlform/bookstore/books"; FormEncodingProvider<Form> formProvider = new FormEncodingProvider<Form>(); formProvider.setExpectedEncoded(true); - WebClient wc = createWebClient(address, new SamlFormOutInterceptor(), - formProvider, true); + WebClient wc = createWebClient(address, new SamlFormOutInterceptor(), formProvider); wc.type(MediaType.APPLICATION_FORM_URLENCODED).accept(MediaType.APPLICATION_XML); try { @@ -179,8 +178,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { public void doTestEnvelopedSAMLToken(boolean signed) throws Exception { String address = "https://localhost:"; + PORT + "/samlxml/bookstore/books"; - WebClient wc = createWebClient(address, new SamlEnvelopedOutInterceptor(!signed), - null, signed); + WebClient wc = createWebClient(address, new SamlEnvelopedOutInterceptor(!signed), null); XmlSigOutInterceptor xmlSig = new XmlSigOutInterceptor(); if (signed) { xmlSig.setStyle(XmlSigOutInterceptor.DETACHED_SIG); @@ -205,8 +203,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { private WebClient createWebClient(String address, Interceptor<Message> outInterceptor, - Object provider, - boolean selfSign) { + Object provider) { JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean(); bean.setAddress(address); @@ -223,9 +220,6 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { properties.put("ws-security.signature.username", "alice"); properties.put("ws-security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); - if (selfSign) { - properties.put("ws-security.self-sign-saml-assertion", "true"); - } bean.setProperties(properties); bean.getOutInterceptors().add(outInterceptor);
