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/09/24 19:48:16 UTC
svn commit: r449443 - in
/xml/security/trunk/src_unitTests/org/apache/xml/security:
c14n/implementations/ test/ test/transforms/implementations/ test/utils/
Author: raul
Date: Sun Sep 24 10:48:16 2006
New Revision: 449443
URL: http://svn.apache.org/viewvc?view=rev&rev=449443
Log:
Small refactors in the tests.
Added:
xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/AllTests.java
xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/OldApiTest.java
Modified:
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
xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/Xpath2TransformationTest.java
Added: xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/AllTests.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/AllTests.java?view=auto&rev=449443
==============================================================================
--- xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/AllTests.java (added)
+++ xml/security/trunk/src_unitTests/org/apache/xml/security/c14n/implementations/AllTests.java Sun Sep 24 10:48:16 2006
@@ -0,0 +1,18 @@
+package org.apache.xml.security.c14n.implementations;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite(
+ "Test for org.apache.xml.security.c14n.implementations");
+ //$JUnit-BEGIN$
+ suite.addTest(NameSpaceSymbTableTest.suite());
+ suite.addTest(UtfHelperTest.suite());
+ //$JUnit-END$
+ return suite;
+ }
+
+}
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?view=diff&rev=449443&r1=449442&r2=449443
==============================================================================
--- 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 Sep 24 10:48:16 2006
@@ -21,14 +21,12 @@
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;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
public class NameSpaceSymbTableTest extends TestCase {
public static Test suite() {
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?view=diff&rev=449443&r1=449442&r2=449443
==============================================================================
--- 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 Sep 24 10:48:16 2006
@@ -20,10 +20,6 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.xml.security.c14n.implementations.NameSpaceSymbTableTest;
-import org.apache.xml.security.c14n.implementations.UtfHelperTest;
-import org.apache.xml.security.test.transforms.implementations.Xpath2TransformationTest;
-
public class ModuleTest extends TestCase {
@@ -52,13 +48,10 @@
suite.addTest(org.apache.xml.security.test.c14n.implementations.Canonicalizer20010315ExclusiveTest.suite());
suite.addTest(org.apache.xml.security.test.external.org.apache.xalan.XPathAPI.XalanBug1425Test.suite());
suite.addTest(org.apache.xml.security.test.external.org.apache.xalan.XPathAPI.AttributeAncestorOrSelfTest.suite());
- suite.addTest(org.apache.xml.security.test.signature.AllTests.suite());
- suite.addTest(org.apache.xml.security.test.transforms.implementations.TransformBase64DecodeTest.suite());
- suite.addTest(org.apache.xml.security.test.utils.Base64Test.suite());
- suite.addTest(org.apache.xml.security.test.utils.IdResolverTest.suite());
- suite.addTest(NameSpaceSymbTableTest.suite());
- suite.addTest(UtfHelperTest.suite());
- suite.addTest(Xpath2TransformationTest.suite());
+ suite.addTest(org.apache.xml.security.test.signature.AllTests.suite());
+ suite.addTest(org.apache.xml.security.test.utils.AllTests.suite());
+ suite.addTest(org.apache.xml.security.c14n.implementations.AllTests.suite());
+ suite.addTest(org.apache.xml.security.test.transforms.implementations.AllTests.suite());
// suite.addTest(org.apache.xml.security.test.algorithms.implementations.KeyWrapTest.suite());
// suite.addTest(org.apache.xml.security.test.algorithms.implementations.BlockEncryptionTest.suite());
//J+
Added: xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/AllTests.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/AllTests.java?view=auto&rev=449443
==============================================================================
--- xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/AllTests.java (added)
+++ xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/AllTests.java Sun Sep 24 10:48:16 2006
@@ -0,0 +1,18 @@
+package org.apache.xml.security.test.transforms.implementations;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite(
+ "Test for org.apache.xml.security.test.transforms.implementations");
+ //$JUnit-BEGIN$
+ suite.addTest(TransformBase64DecodeTest.suite());
+ suite.addTest(Xpath2TransformationTest.suite());
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Modified: xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/Xpath2TransformationTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/Xpath2TransformationTest.java?view=diff&rev=449443&r1=449442&r2=449443
==============================================================================
--- xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/Xpath2TransformationTest.java (original)
+++ xml/security/trunk/src_unitTests/org/apache/xml/security/test/transforms/implementations/Xpath2TransformationTest.java Sun Sep 24 10:48:16 2006
@@ -1,19 +1,15 @@
package org.apache.xml.security.test.transforms.implementations;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
import org.apache.xml.security.Init;
-import org.apache.xml.security.signature.Reference;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.utils.Constants;
-import org.apache.xml.security.utils.JavaUtils;
import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class Xpath2TransformationTest extends TestCase {
static {
Added: xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/AllTests.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/AllTests.java?view=auto&rev=449443
==============================================================================
--- xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/AllTests.java (added)
+++ xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/AllTests.java Sun Sep 24 10:48:16 2006
@@ -0,0 +1,19 @@
+package org.apache.xml.security.test.utils;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite(
+ "Test for org.apache.xml.security.test.utils");
+ //$JUnit-BEGIN$
+ suite.addTest(IdResolverTest.suite());
+ suite.addTest(Base64Test.suite());
+ suite.addTestSuite(OldApiTest.class);
+ //$JUnit-END$
+ return suite;
+ }
+
+}
Added: xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/OldApiTest.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/OldApiTest.java?view=auto&rev=449443
==============================================================================
--- xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/OldApiTest.java (added)
+++ xml/security/trunk/src_unitTests/org/apache/xml/security/test/utils/OldApiTest.java Sun Sep 24 10:48:16 2006
@@ -0,0 +1,47 @@
+package org.apache.xml.security.test.utils;
+
+import java.io.IOException;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import junit.framework.TestCase;
+
+import org.apache.xml.security.Init;
+import org.apache.xml.security.c14n.CanonicalizationException;
+import org.apache.xml.security.c14n.InvalidCanonicalizerException;
+import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.Transform;
+import org.apache.xml.security.transforms.TransformSpi;
+import org.apache.xml.security.transforms.TransformationException;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+public class OldApiTest extends TestCase {
+ static Transform compare;
+ public static class OldTransform extends TransformSpi {
+ protected XMLSignatureInput enginePerformTransform(
+ XMLSignatureInput input)
+ throws IOException,
+ CanonicalizationException, InvalidCanonicalizerException,
+ TransformationException, ParserConfigurationException,
+ SAXException {
+ assertEquals(compare,_transformObject);
+ return null ;
+ }
+
+ protected String engineGetURI() {
+ // TODO Auto-generated method stub
+ return null;
+ };
+ };
+ public void testOldTransformSpiApi() throws Exception {
+ Init.init();
+ Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ Transform.register("old", OldTransform.class.getName());
+
+ Transform a=new Transform(doc,"old",null);
+ compare=a;
+ a.performTransform(null);
+ };
+}