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 2006/07/16 12:18:02 UTC
svn commit: r422427 - in /xml/security/trunk:
src/org/apache/xml/security/c14n/implementations/
src_unitTests/org/apache/xml/security/c14n/implementations/
src_unitTests/org/apache/xml/security/test/
Author: raul
Date: Sun Jul 16 03:17:57 2006
New Revision: 422427
URL: http://svn.apache.org/viewvc?rev=422427&view=rev
Log:
Fix bug http://issues.apache.org/bugzilla/show_bug.cgi?id=40032
Modified:
xml/security/trunk/src/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/NameSpaceSymbTableTest.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/ModuleTest.java
Modified: xml/security/trunk/src/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java?rev=422427&r1=422426&r2=422427&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java Sun Jul 16 03:17:57 2006
@@ -72,6 +72,7 @@
if ((!n.rendered) && (n.n!=null)) {
result.add(n.n);
n.rendered=true;
+ n.lastrendered=n.uri;
}
}
}
Modified: xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/NameSpaceSymbTableTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/NameSpaceSymbTableTest.java?rev=422427&r1=422426&r2=422427&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/NameSpaceSymbTableTest.java (original)
+++ xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/NameSpaceSymbTableTest.java Sun Jul 16 03:17:57 2006
@@ -21,14 +21,19 @@
import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.xml.security.test.utils.Base64Test;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
+import junit.framework.Test;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
public class NameSpaceSymbTableTest extends TestCase {
-
+ public static Test suite() {
+ return new TestSuite(NameSpaceSymbTableTest.class);
+ }
static Attr node1,node2;
static {
try {
@@ -120,9 +125,20 @@
ns.push();
assertEquals(node1,ns.getMapping("a"));
ns.pop();
- assertEquals(node1,ns.getMapping("a"));
-
+ assertEquals(node1,ns.getMapping("a"));
}
+ public void testGetUnrenderedNodes() {
+ NameSpaceSymbTable ns=new NameSpaceSymbTable();
+ ns.push();
+ List l=new ArrayList();
+ ns.addMapping("xmlns","http://a",node1);
+ ns.push();
+ ns.getUnrenderedNodes(l);
+ assertTrue(l.contains(node1));
+ Attr n=(Attr)ns.addMappingAndRender("xmlns","",node2);
+ assertNotNull("xmlns=\"\" not rendered",n);
+ assertEquals(n, node2);
+ }
public void notPasstestUnrederedNodes() {
NameSpaceSymbTable ns=new NameSpaceSymbTable();
ns.push();
Modified: xml/security/trunk/src_unitTests/org/apache/xml/security/test/ModuleTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/org/apache/xml/security/test/ModuleTest.java?rev=422427&r1=422426&r2=422427&view=diff
==============================================================================
--- xml/security/trunk/src_unitTests/org/apache/xml/security/test/ModuleTest.java (original)
+++ xml/security/trunk/src_unitTests/org/apache/xml/security/test/ModuleTest.java Sun Jul 16 03:17:57 2006
@@ -16,6 +16,8 @@
*/
package org.apache.xml.security.test;
+import org.apache.xml.security.c14n.implementations.NameSpaceSymbTableTest;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -52,6 +54,7 @@
suite.addTest(org.apache.xml.security.test.signature.UnknownAlgoSignatureTest.suite());
suite.addTest(org.apache.xml.security.test.transforms.implementations.TransformBase64DecodeTest.suite());
suite.addTest(org.apache.xml.security.test.utils.Base64Test.suite());
+ suite.addTest(NameSpaceSymbTableTest.suite());
// suite.addTest(org.apache.xml.security.test.algorithms.implementations.KeyWrapTest.suite());
// suite.addTest(org.apache.xml.security.test.algorithms.implementations.BlockEncryptionTest.suite());
//J+