You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2005/04/02 21:16:49 UTC
cvs commit: xml-security/src_unitTests/org/apache/xml/security/test/signature XMLSignatureInputTest.java
raul 2005/04/02 11:16:49
Modified: src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI
AttributeAncestorOrSelfTest.java
XalanBug1425Test.java
src_unitTests/org/apache/xml/security/test/interop
InteropTest.java
src_unitTests/org/apache/xml/security/test AllTests.java
InteropTest.java ModuleTest.java
src_unitTests/org/apache/xml/security/test/signature
XMLSignatureInputTest.java
Log:
Removed xalan and xerces version printing in tests.
Revision Changes Path
1.3 +4 -9 xml-security/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/AttributeAncestorOrSelfTest.java
Index: AttributeAncestorOrSelfTest.java
===================================================================
RCS file: /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/AttributeAncestorOrSelfTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttributeAncestorOrSelfTest.java 8 Feb 2004 06:08:22 -0000 1.2
+++ AttributeAncestorOrSelfTest.java 2 Apr 2005 19:16:49 -0000 1.3
@@ -49,11 +49,6 @@
org.apache.commons.logging.LogFactory.getLog(
AttributeAncestorOrSelfTest.class.getName());
- /** Field xercesVerStr */
- static String xercesVerStr = XMLUtils.getXercesVersion();
-
- /** Field xalanVerStr */
- static String xalanVerStr = XMLUtils.getXalanVersion();
/**
* Method suite
@@ -137,7 +132,7 @@
String ctxNodeStr = "/ds:Signature/ds:Object";
String evalStr = "ancestor-or-self::ds:Signature";
- assertTrue("Bad " + ctxNodeStr + " " + evalStr + " " + xalanVerStr,
+ assertTrue("Bad " + ctxNodeStr + " " + evalStr + " ",
isAncestorOf(_nodeSetInput1, ctxNodeStr, evalStr));
}
@@ -151,7 +146,7 @@
String ctxNodeStr = "/ds:Signature/ds:Object/text()";
String evalStr = "ancestor-or-self::ds:Signature";
- assertTrue("Bad " + ctxNodeStr + " " + evalStr + " " + xalanVerStr,
+ assertTrue("Bad " + ctxNodeStr + " " + evalStr + " " ,
isAncestorOf(_nodeSetInput1, ctxNodeStr, evalStr));
}
@@ -165,7 +160,7 @@
String ctxNodeStr = "/ds:Signature/ds:Object/@Id";
String evalStr = "ancestor-or-self::ds:Object";
- assertTrue("Bad " + ctxNodeStr + " " + evalStr + " " + xalanVerStr,
+ assertTrue("Bad " + ctxNodeStr + " " + evalStr + " " ,
isAncestorOf(_nodeSetInput1, ctxNodeStr, evalStr));
}
1.9 +3 -8 xml-security/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/XalanBug1425Test.java
Index: XalanBug1425Test.java
===================================================================
RCS file: /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/XalanBug1425Test.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanBug1425Test.java 8 Feb 2004 06:08:22 -0000 1.8
+++ XalanBug1425Test.java 2 Apr 2005 19:16:49 -0000 1.9
@@ -51,11 +51,6 @@
org.apache.commons.logging.LogFactory.getLog(
XalanBug1425Test.class.getName());
- /** Field xercesVerStr */
- static String xercesVerStr = XMLUtils.getXercesVersion();
-
- /** Field xalanVerStr */
- static String xalanVerStr = XMLUtils.getXalanVersion();
/**
* Method suite
@@ -150,7 +145,7 @@
String desc = " # mixed content and following comment";
String xpath = "(//.)";
- assertTrue("Bad " + xml + desc + " " + xalanVerStr,
+ assertTrue("Bad " + xml + desc + " " ,
containsDocumentElement(xml, xpath));
}
@@ -165,7 +160,7 @@
String desc = " # mixed content and following PI";
String xpath = "(//.)";
- assertTrue("Bad " + xml + desc + " " + xalanVerStr,
+ assertTrue("Bad " + xml + desc + " " ,
containsDocumentElement(xml, xpath));
}
@@ -180,7 +175,7 @@
String desc = " # mixed content and following comment";
String xpath = "(//.)";
- assertTrue("Bad " + xml + desc + " " + xalanVerStr,
+ assertTrue("Bad " + xml + desc + " " ,
containsDocumentElement(xml, xpath));
}
1.12 +1 -7 xml-security/src_unitTests/org/apache/xml/security/test/interop/InteropTest.java
Index: InteropTest.java
===================================================================
RCS file: /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/interop/InteropTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- InteropTest.java 13 Feb 2005 12:09:32 -0000 1.11
+++ InteropTest.java 2 Apr 2005 19:16:49 -0000 1.12
@@ -43,13 +43,7 @@
/** {@link org.apache.commons.logging} logging facility */
static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(BaltimoreTest.class.getName());
-
- /** Field xercesVerStr */
- static String xercesVerStr = XMLUtils.getXercesVersion();
-
- /** Field xalanVerStr */
- static String xalanVerStr = XMLUtils.getXalanVersion();
-
+
/** Field dbf */
static javax.xml.parsers.DocumentBuilderFactory dbf = null;
1.17 +1 -1 xml-security/src_unitTests/org/apache/xml/security/test/AllTests.java
Index: AllTests.java
===================================================================
RCS file: /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/AllTests.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AllTests.java 3 Aug 2004 17:50:15 -0000 1.16
+++ AllTests.java 2 Apr 2005 19:16:49 -0000 1.17
@@ -65,7 +65,7 @@
*/
public static void main(String[] args) {
- XMLUtils.spitOutVersions(log);
+ //XMLUtils.spitOutVersions(log);
log.debug("java.class.path : " + System.getProperty("java.class.path"));
log.debug("java.library.path : " + System.getProperty("java.library.path"));
log.debug("java.runtime.name : " + System.getProperty("java.runtime.name"));
1.9 +2 -2 xml-security/src_unitTests/org/apache/xml/security/test/InteropTest.java
Index: InteropTest.java
===================================================================
RCS file: /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/InteropTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InteropTest.java 7 Mar 2004 18:16:02 -0000 1.8
+++ InteropTest.java 2 Apr 2005 19:16:49 -0000 1.9
@@ -85,7 +85,7 @@
*/
public static void main(String[] args) {
- XMLUtils.spitOutVersions(log);
+ //XMLUtils.spitOutVersions(log);
boolean useTextUI = true;
1.10 +1 -1 xml-security/src_unitTests/org/apache/xml/security/test/ModuleTest.java
Index: ModuleTest.java
===================================================================
RCS file: /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/ModuleTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ModuleTest.java 2 Apr 2005 18:33:57 -0000 1.9
+++ ModuleTest.java 2 Apr 2005 19:16:49 -0000 1.10
@@ -66,7 +66,7 @@
*/
public static void main(String[] args) {
- XMLUtils.spitOutVersions(log);
+ //XMLUtils.spitOutVersions(log);
boolean useTextUI = true;
1.16 +0 -11 xml-security/src_unitTests/org/apache/xml/security/test/signature/XMLSignatureInputTest.java
Index: XMLSignatureInputTest.java
===================================================================
RCS file: /home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/signature/XMLSignatureInputTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLSignatureInputTest.java 12 Feb 2005 12:04:36 -0000 1.15
+++ XMLSignatureInputTest.java 2 Apr 2005 19:16:49 -0000 1.16
@@ -99,18 +99,7 @@
junit.textui.TestRunner.main(testCaseName);
}
- /**
- * Method printNodeSet
- *
- * @param nl
- */
- private void printNodeSet(NodeList nl) {
- for (int i = 0; i < nl.getLength(); i++) {
- log.debug("Type "
- + XMLUtils.getNodeTypeString(nl.item(i).getNodeType()));
- }
- }
/**
* Method testSetOctetStreamGetOctetStream