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 2018/09/20 15:00:48 UTC
[cxf-fediz] branch 1.4.x-fixes updated: Removing unnecessary test
method
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 1.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/1.4.x-fixes by this push:
new 2dc898e Removing unnecessary test method
2dc898e is described below
commit 2dc898e8d913630bb31c47e526a327a29a4bd9f2
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Sep 19 17:29:53 2018 +0100
Removing unnecessary test method
---
.../fediz/core/federation/RequestedClaimsTest.java | 6 +-
.../core/federation/SAMLTokenValidatorOldTest.java | 68 ++--------------------
.../core/samlsso/SAMLResponseConformanceTest.java | 60 -------------------
.../cxf/fediz/core/samlsso/SAMLResponseTest.java | 61 +------------------
4 files changed, 8 insertions(+), 187 deletions(-)
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/RequestedClaimsTest.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/RequestedClaimsTest.java
index 45de6ad..177ebdf 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/RequestedClaimsTest.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/RequestedClaimsTest.java
@@ -73,7 +73,7 @@ import org.apache.wss4j.common.saml.bean.AudienceRestrictionBean;
import org.apache.wss4j.common.saml.bean.ConditionsBean;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
-
+import org.apache.wss4j.common.util.XMLUtils;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -326,10 +326,10 @@ public class RequestedClaimsTest {
Document doc = STSUtil.toSOAPPart(rstr);
Element token = assertion.toDOM(doc);
- Element e = SAMLTokenValidatorOldTest.findElement(doc, "RequestedSecurityToken",
+ Element e = XMLUtils.findElement(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_13_NS);
if (e == null) {
- e = SAMLTokenValidatorOldTest.findElement(doc, "RequestedSecurityToken",
+ e = XMLUtils.findElement(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_2005_02_NS);
}
e.appendChild(token);
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/SAMLTokenValidatorOldTest.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/SAMLTokenValidatorOldTest.java
index d8d1ae8..4c4ab6f 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/SAMLTokenValidatorOldTest.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/SAMLTokenValidatorOldTest.java
@@ -30,7 +30,6 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.apache.cxf.fediz.common.STSUtil;
import org.apache.cxf.fediz.common.SecurityTestUtil;
import org.apache.cxf.fediz.core.AbstractSAMLCallbackHandler;
@@ -58,6 +57,7 @@ import org.apache.wss4j.common.saml.bean.ConditionsBean;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
+import org.apache.wss4j.common.util.XMLUtils;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -312,10 +312,10 @@ public class SAMLTokenValidatorOldTest {
Document doc = STSUtil.toSOAPPart(rstr);
Element token = assertion.toDOM(doc);
- Element e = SAMLTokenValidatorOldTest.findElement(doc, "RequestedSecurityToken",
+ Element e = XMLUtils.findElement(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_13_NS);
if (e == null) {
- e = SAMLTokenValidatorOldTest.findElement(doc, "RequestedSecurityToken",
+ e = XMLUtils.findElement(doc, "RequestedSecurityToken",
FederationConstants.WS_TRUST_2005_02_NS);
}
e.appendChild(token);
@@ -323,70 +323,10 @@ public class SAMLTokenValidatorOldTest {
}
-
-
- /**
- * Returns the first element that matches <code>name</code> and
- * <code>namespace</code>. <p/> This is a replacement for a XPath lookup
- * <code>//name</code> with the given namespace. It's somewhat faster than
- * XPath, and we do not deal with prefixes, just with the real namespace URI
- *
- * @param startNode Where to start the search
- * @param name Local name of the element
- * @param namespace Namespace URI of the element
- * @return The found element or <code>null</code>
- */
- public static Element findElement(Node startNode, String name, String namespace) {
- //
- // Replace the formerly recursive implementation with a depth-first-loop
- // lookup
- //
- if (startNode == null) {
- return null;
- }
- Node startParent = startNode.getParentNode();
- Node processedNode = null;
-
- while (startNode != null) {
- // start node processing at this point
- if (startNode.getNodeType() == Node.ELEMENT_NODE
- && startNode.getLocalName().equals(name)) {
- String ns = startNode.getNamespaceURI();
- if (ns != null && ns.equals(namespace)) {
- return (Element)startNode;
- }
-
- if ((namespace == null || namespace.length() == 0)
- && (ns == null || ns.length() == 0)) {
- return (Element)startNode;
- }
- }
- processedNode = startNode;
- startNode = startNode.getFirstChild();
-
- // no child, this node is done.
- if (startNode == null) {
- // close node processing, get sibling
- startNode = processedNode.getNextSibling();
- }
- // no more siblings, get parent, all children
- // of parent are processed.
- while (startNode == null) {
- processedNode = processedNode.getParentNode();
- if (processedNode == startParent) {
- return null;
- }
- // close parent node processing (processed node now)
- startNode = processedNode.getNextSibling();
- }
- }
- return null;
- }
-
private void assertClaims(List<Claim> claims, String roleClaimType) {
for (Claim c : claims) {
Assert.assertTrue("Invalid ClaimType URI: " + c.getClaimType(),
- c.getClaimType().equals(roleClaimType)
+ c.getClaimType().toString().equals(roleClaimType)
|| c.getClaimType().equals(ClaimTypes.COUNTRY)
|| c.getClaimType().equals(AbstractSAMLCallbackHandler.CLAIM_TYPE_LANGUAGE)
);
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLResponseConformanceTest.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLResponseConformanceTest.java
index aa11e6c..2b0955f 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLResponseConformanceTest.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLResponseConformanceTest.java
@@ -35,7 +35,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.apache.cxf.fediz.common.SecurityTestUtil;
import org.apache.cxf.fediz.core.KeystoreCallbackHandler;
@@ -1156,65 +1155,6 @@ public class SAMLResponseConformanceTest {
return policyElement;
}
-
- /**
- * Returns the first element that matches <code>name</code> and
- * <code>namespace</code>. <p/> This is a replacement for a XPath lookup
- * <code>//name</code> with the given namespace. It's somewhat faster than
- * XPath, and we do not deal with prefixes, just with the real namespace URI
- *
- * @param startNode Where to start the search
- * @param name Local name of the element
- * @param namespace Namespace URI of the element
- * @return The found element or <code>null</code>
- */
- public static Element findElement(Node startNode, String name, String namespace) {
- //
- // Replace the formerly recursive implementation with a depth-first-loop
- // lookup
- //
- if (startNode == null) {
- return null;
- }
- Node startParent = startNode.getParentNode();
- Node processedNode = null;
-
- while (startNode != null) {
- // start node processing at this point
- if (startNode.getNodeType() == Node.ELEMENT_NODE
- && startNode.getLocalName().equals(name)) {
- String ns = startNode.getNamespaceURI();
- if (ns != null && ns.equals(namespace)) {
- return (Element)startNode;
- }
-
- if ((namespace == null || namespace.length() == 0)
- && (ns == null || ns.length() == 0)) {
- return (Element)startNode;
- }
- }
- processedNode = startNode;
- startNode = startNode.getFirstChild();
-
- // no child, this node is done.
- if (startNode == null) {
- // close node processing, get sibling
- startNode = processedNode.getNextSibling();
- }
- // no more siblings, get parent, all children
- // of parent are processed.
- while (startNode == null) {
- processedNode = processedNode.getParentNode();
- if (processedNode == startParent) {
- return null;
- }
- // close parent node processing (processed node now)
- startNode = processedNode.getNextSibling();
- }
- }
- return null;
- }
-
private String encodeResponse(Element response) throws IOException {
String responseMessage = DOM2Writer.nodeToString(response);
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLResponseTest.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLResponseTest.java
index f054471..180d1ee 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLResponseTest.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/samlsso/SAMLResponseTest.java
@@ -39,7 +39,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.apache.cxf.fediz.common.STSUtil;
@@ -1551,68 +1550,10 @@ public class SAMLResponseTest {
signableObject.releaseChildrenDOM(true);
}
- /**
- * Returns the first element that matches <code>name</code> and
- * <code>namespace</code>. <p/> This is a replacement for a XPath lookup
- * <code>//name</code> with the given namespace. It's somewhat faster than
- * XPath, and we do not deal with prefixes, just with the real namespace URI
- *
- * @param startNode Where to start the search
- * @param name Local name of the element
- * @param namespace Namespace URI of the element
- * @return The found element or <code>null</code>
- */
- public static Element findElement(Node startNode, String name, String namespace) {
- //
- // Replace the formerly recursive implementation with a depth-first-loop
- // lookup
- //
- if (startNode == null) {
- return null;
- }
- Node startParent = startNode.getParentNode();
- Node processedNode = null;
-
- while (startNode != null) {
- // start node processing at this point
- if (startNode.getNodeType() == Node.ELEMENT_NODE
- && startNode.getLocalName().equals(name)) {
- String ns = startNode.getNamespaceURI();
- if (ns != null && ns.equals(namespace)) {
- return (Element)startNode;
- }
-
- if ((namespace == null || namespace.length() == 0)
- && (ns == null || ns.length() == 0)) {
- return (Element)startNode;
- }
- }
- processedNode = startNode;
- startNode = startNode.getFirstChild();
-
- // no child, this node is done.
- if (startNode == null) {
- // close node processing, get sibling
- startNode = processedNode.getNextSibling();
- }
- // no more siblings, get parent, all children
- // of parent are processed.
- while (startNode == null) {
- processedNode = processedNode.getParentNode();
- if (processedNode == startParent) {
- return null;
- }
- // close parent node processing (processed node now)
- startNode = processedNode.getNextSibling();
- }
- }
- return null;
- }
-
private void assertClaims(List<Claim> claims, String roleClaimType) {
for (Claim c : claims) {
Assert.assertTrue("Invalid ClaimType URI: " + c.getClaimType(),
- c.getClaimType().equals(roleClaimType)
+ c.getClaimType().toString().equals(roleClaimType)
|| c.getClaimType().equals(ClaimTypes.COUNTRY)
|| c.getClaimType().equals(AbstractSAMLCallbackHandler.CLAIM_TYPE_LANGUAGE)
);