santuario-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1056263 [6/10] - in /santuario/xml-security-java/trunk: ./ src/test/java/javax/xml/crypto/test/ src/test/java/javax/xml/crypto/test/dsig/ src/test/java/javax/xml/crypto/test/dsig/dom/ src/test/java/javax/xml/crypto/test/dsig/keyinfo/ src/t...
Date Fri, 07 Jan 2011 11:23:13 GMT
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyValueTest.java Fri Jan  7 11:23:09 2011
@@ -22,80 +22,71 @@ package javax.xml.crypto.test.dsig.keyin
 import java.security.*;
 import javax.xml.crypto.dsig.keyinfo.*;
 
-import junit.framework.*;
-
 /**
  * Unit test for javax.xml.crypto.dsig.keyinfo.KeyValue
  *
- * @version $Id$
  * @author Valerie Peng
  */
-public class KeyValueTest extends TestCase {
+public class KeyValueTest extends org.junit.Assert {
 
     private static final String[] ALGOS = { "DSA", "RSA" };
     private KeyInfoFactory fac;
     private PublicKey keys[] = null;
 
-    public KeyValueTest() {
-	super("KeyValueTest");
-    }
-
-    public KeyValueTest(String name) {
-	super(name);
-    }
-
-    private PublicKey genPublicKey(String algo, int keysize) throws Exception {
-        KeyPairGenerator kpg = KeyPairGenerator.getInstance(algo);
-        kpg.initialize(keysize, new SecureRandom(("Not so random bytes" 
-	    + System.currentTimeMillis() ).getBytes() ));
-        KeyPair kp = kpg.generateKeyPair();
-        return kp.getPublic();
-    }
+    public KeyValueTest() throws Exception { 
+        fac = KeyInfoFactory.getInstance
+            ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
+        // generate PublicKey(s) and XMLStructure(s) for DSA and RSA
+        keys = new PublicKey[ALGOS.length];
 
-    public void setUp() throws Exception { 
-	fac = KeyInfoFactory.getInstance
-	    ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
-	// generate PublicKey(s) and XMLStructure(s) for DSA and RSA
-	keys = new PublicKey[ALGOS.length];
-
-	for (int i = 0; i<ALGOS.length; i++) {
-	    keys[i] = genPublicKey(ALGOS[i], 512);
-	}
+        for (int i = 0; i < ALGOS.length; i++) {
+            keys[i] = genPublicKey(ALGOS[i], 512);
+        }
     }
 
-    public void tearDown() { }
-
+    @org.junit.Test
     public void testgetPublicKey() {
-	try {
-	    KeyValue kv = fac.newKeyValue(keys[0]);
-	    assertNotNull(kv.getPublicKey());
+        try {
+            KeyValue kv = fac.newKeyValue(keys[0]);
+            assertNotNull(kv.getPublicKey());
         } catch (KeyException ke) {
-	    fail("Should pass instead of throwing KeyException");
+            fail("Should pass instead of throwing KeyException");
         }
     }
 
+    @org.junit.Test
     public void testConstructor() {
-	// test newKeyValue(PublicKey pk)
-	for (int i = 0; i < keys.length; i++) {
-	    try {
-	        KeyValue kv = fac.newKeyValue(keys[i]);
-	        assertEquals(keys[i], kv.getPublicKey());
-	    } catch (KeyException ke) {
-		fail("Should pass instead of throwing KeyException");
-	    }
-	}
+        // test newKeyValue(PublicKey pk)
+        for (int i = 0; i < keys.length; i++) {
+            try {
+                KeyValue kv = fac.newKeyValue(keys[i]);
+                assertEquals(keys[i], kv.getPublicKey());
+            } catch (KeyException ke) {
+                fail("Should pass instead of throwing KeyException");
+            }
+        }
     }
 
+    @org.junit.Test
     public void testisFeatureSupported() {
-	KeyValue kv = null;
+        KeyValue kv = null;
         try {
-	    kv = fac.newKeyValue(keys[0]);
-	    kv.isFeatureSupported(null); 
-	    fail("Should raise a NPE for null feature"); 
+            kv = fac.newKeyValue(keys[0]);
+            kv.isFeatureSupported(null); 
+            fail("Should raise a NPE for null feature"); 
         } catch (KeyException ke) {
-	    fail("Should raise a NPE for null feature"); 
+            fail("Should raise a NPE for null feature"); 
         } catch (NullPointerException npe) {}
-	    
+            
         assertTrue(!kv.isFeatureSupported("not supported"));
     }
+    
+    private PublicKey genPublicKey(String algo, int keysize) throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance(algo);
+        kpg.initialize(keysize, new SecureRandom(("Not so random bytes" 
+            + System.currentTimeMillis() ).getBytes() ));
+        KeyPair kp = kpg.generateKeyPair();
+        return kp.getPublic();
+    }
+
 }

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java Fri Jan  7 11:23:09 2011
@@ -25,119 +25,111 @@ import java.util.List;
 import javax.xml.crypto.*;
 import javax.xml.crypto.dsig.keyinfo.*;
 
-import junit.framework.*;
-
 /**
  * Unit test for javax.xml.crypto.dsig.keyinfo.PGPData
  *
- * @version $Id$
  * @author Valerie Peng
  */
-public class PGPDataTest extends TestCase {
+public class PGPDataTest extends org.junit.Assert {
 
     private KeyInfoFactory fac;
     private byte[][] values = { 
-	{
+        {
             0x01, 0x02, 0x03, 0x04,
             0x05, 0x06, 0x07, 0x08
-	},
-	{
-	    (byte)0xc6, (byte)0x01, (byte)0x00
-	}
+        },
+        {
+            (byte)0xc6, (byte)0x01, (byte)0x00
+        }
     };
 
-    public PGPDataTest() {
-	super("PGPDataTest");
-    }
-
-    public PGPDataTest(String name) {
-	super(name);
-    }
-
-    public void setUp() throws Exception { 
-	fac = KeyInfoFactory.getInstance
-	    ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
+    public PGPDataTest() throws Exception { 
+        fac = KeyInfoFactory.getInstance
+            ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
     }
 
-    public void tearDown() { }
-
+    @org.junit.Test
     public void testgetExternalElements() {
-	PGPData[] pds = {
-	    fac.newPGPData(values[0]),
-	    fac.newPGPData(values[0], values[1], null),
-	    fac.newPGPData(values[1], null)
-	};
-	for (int i=0; i<pds.length; i++) {
-	    List li = pds[i].getExternalElements();
-	    assertNotNull(li);
-	    if (!li.isEmpty()) {
-		Object[] types = li.toArray();
-		for (int j=0; j<types.length; j++) {
-		    if (!(types[j] instanceof XMLStructure)) {
-			fail("PGP element has the wrong type");
-		    };
-		}
-	    } 
+        PGPData[] pds = {
+            fac.newPGPData(values[0]),
+            fac.newPGPData(values[0], values[1], null),
+            fac.newPGPData(values[1], null)
+        };
+        for (int i=0; i<pds.length; i++) {
+            List<?> li = pds[i].getExternalElements();
+            assertNotNull(li);
+            if (!li.isEmpty()) {
+                Object[] types = li.toArray();
+                for (int j=0; j<types.length; j++) {
+                    if (!(types[j] instanceof XMLStructure)) {
+                        fail("PGP element has the wrong type");
+                    };
+                }
+            } 
+        }
+        try {
+            fac.newPGPData
+                (values[0], Collections.singletonList(new Object()));
+            fail("Added PGP element of wrong type");
+        } catch (ClassCastException ex) {
+            // expected
         }
-	try {
-	    fac.newPGPData
-		(values[0], Collections.singletonList(new Object()));
-	    fail("Added PGP element of wrong type");
-	} catch (ClassCastException ex) {
-	    // expected
-	}
     }
 
+    @org.junit.Test
     public void testgetKeyId() {
-	PGPData pd = fac.newPGPData(values[0]);
-	assertNotNull(pd.getKeyId());
-	pd = fac.newPGPData(values[0], values[1], null);
-	assertNotNull(pd.getKeyId());
-	pd = fac.newPGPData(values[1], null);
+        PGPData pd = fac.newPGPData(values[0]);
+        assertNotNull(pd.getKeyId());
+        pd = fac.newPGPData(values[0], values[1], null);
+        assertNotNull(pd.getKeyId());
+        pd = fac.newPGPData(values[1], null);
     }
 
+    @org.junit.Test
     public void testgetKeyPacket() {
-	PGPData pd = fac.newPGPData(values[0]);
-	pd = fac.newPGPData(values[0], values[1], null);
-	assertNotNull(pd.getKeyPacket());
+        PGPData pd = fac.newPGPData(values[0]);
+        pd = fac.newPGPData(values[0], values[1], null);
+        assertNotNull(pd.getKeyPacket());
         pd = fac.newPGPData(values[1], null);
-	assertNotNull(pd.getKeyPacket());
+        assertNotNull(pd.getKeyPacket());
     }
 
+    @org.junit.Test
     public void testConstructor() {
-	// test newPGPKeyData(byte[])
-	PGPData pd = fac.newPGPData(values[0]);
-	assertTrue(Arrays.equals(values[0], pd.getKeyId()));
-
-	// test newPGPData(byte[], byte[], List)
-	pd = fac.newPGPData(values[0], values[1], null);
-	assertTrue(Arrays.equals(values[0], pd.getKeyId()));
-	assertTrue(Arrays.equals(values[1], pd.getKeyPacket()));
-	    
-	// test newPGPData(byte[], List)
-	pd = fac.newPGPData(values[1], null);
-	assertTrue(Arrays.equals(values[1], pd.getKeyPacket()));
+        // test newPGPKeyData(byte[])
+        PGPData pd = fac.newPGPData(values[0]);
+        assertTrue(Arrays.equals(values[0], pd.getKeyId()));
+
+        // test newPGPData(byte[], byte[], List)
+        pd = fac.newPGPData(values[0], values[1], null);
+        assertTrue(Arrays.equals(values[0], pd.getKeyId()));
+        assertTrue(Arrays.equals(values[1], pd.getKeyPacket()));
+            
+        // test newPGPData(byte[], List)
+        pd = fac.newPGPData(values[1], null);
+        assertTrue(Arrays.equals(values[1], pd.getKeyPacket()));
     }
 
+    @org.junit.Test
     public void testisFeatureSupported() {
-	PGPData pd = null;
-	for (int i=0; i<3; i++) {
-	    switch (i) {
-	    case 0:
-		pd = fac.newPGPData(values[0]);
-		break;
-	    case 1:
-		pd = fac.newPGPData(values[0], values[1], null);
-		break;
-	    case 2:
-		pd = fac.newPGPData(values[1], null);
-	    }
-	    try {
-		pd.isFeatureSupported(null); 
-		fail("Should raise a NPE for null feature"); 
-	    } catch (NullPointerException npe) {}
-	    
-	    assertTrue(!pd.isFeatureSupported("not supported"));
-	}
+        PGPData pd = null;
+        for (int i = 0; i < 3; i++) {
+            switch (i) {
+            case 0:
+                pd = fac.newPGPData(values[0]);
+                break;
+            case 1:
+                pd = fac.newPGPData(values[0], values[1], null);
+                break;
+            case 2:
+                pd = fac.newPGPData(values[1], null);
+            }
+            try {
+                pd.isFeatureSupported(null); 
+                fail("Should raise a NPE for null feature"); 
+            } catch (NullPointerException npe) {}
+            
+            assertTrue(!pd.isFeatureSupported("not supported"));
+        }
     }
 }

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java Fri Jan  7 11:23:09 2011
@@ -21,63 +21,54 @@ package javax.xml.crypto.test.dsig.keyin
 
 import javax.xml.crypto.dsig.keyinfo.*;
 
-import junit.framework.*;
-
 /**
  * Unit test for javax.xml.crypto.dsig.keyinfo.RetrievalMethod
  *
- * @version $Id$
  * @author Sean Mullan
  */
-public class RetrievalMethodTest extends TestCase {
+public class RetrievalMethodTest extends org.junit.Assert {
 
     private KeyInfoFactory fac;
 
-    public RetrievalMethodTest() {
-	super("RetrievalMethodTest");
-    }
-
-    public RetrievalMethodTest(String name) {
-	super(name);
+    public RetrievalMethodTest() throws Exception { 
+        fac = KeyInfoFactory.getInstance
+            ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
     }
 
-    public void setUp() throws Exception { 
-	fac = KeyInfoFactory.getInstance
-	    ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
-    }
-
-    public void tearDown() { }
-
+    @org.junit.Test
     public void testgetURI() {
         RetrievalMethod rm = fac.newRetrievalMethod("#X509Data");
         assertNotNull(rm.getURI());
     }
 
+    @org.junit.Test
     public void testgetTransforms() {
         RetrievalMethod rm = fac.newRetrievalMethod("#X509Data");
         assertNotNull(rm.getTransforms());
     }
 
+    @org.junit.Test
     public void testgetType() {
         RetrievalMethod rm = fac.newRetrievalMethod("#X509Data");
         assertNull(rm.getType());
     }
 
+    @org.junit.Test
     public void testConstructors() {
         final String uri = "#X509CertChain";
         // test RetrievalMethod(String)
         RetrievalMethod rm = fac.newRetrievalMethod(uri);
         assertEquals(uri, rm.getURI());
 
-	try {
-	    rm = fac.newRetrievalMethod(null); 
-	    fail("Should raise a NullPointerException"); 
+        try {
+            rm = fac.newRetrievalMethod(null); 
+            fail("Should raise a NullPointerException"); 
         } catch (NullPointerException npe) {}
 
-	// test RetrievalMethod(String, String, Transform[])
-	try {
-	    rm = fac.newRetrievalMethod(null, null, null); 
-	    fail("Should raise a NullPointerException"); 
+        // test RetrievalMethod(String, String, Transform[])
+        try {
+            rm = fac.newRetrievalMethod(null, null, null); 
+            fail("Should raise a NullPointerException"); 
         } catch (NullPointerException npe) {}
 
         final String type = "http://www.w3.org/2000/09/xmldsig#X509Data";
@@ -86,25 +77,26 @@ public class RetrievalMethodTest extends
         assertEquals(type, rm.getType());
     }
 
+    @org.junit.Test
     public void testisFeatureSupported() throws Exception {
-	String uri = "#X509CertChain";
+        String uri = "#X509CertChain";
         String type = "http://www.w3.org/2000/09/xmldsig#X509Data";
-	RetrievalMethod rm = null;
-	for (int i=0; i<2; i++) {
-	    switch (i) {
-	    case 0:
-		rm = fac.newRetrievalMethod(uri);
-		break;
-	    case 1:
-		rm = fac.newRetrievalMethod(uri, type, null);
-		break;
-	    }		
-	    try {
-		rm.isFeatureSupported(null); 
-		fail("Should raise a NPE for null feature"); 
-	    } catch (NullPointerException npe) {}
-	    
-	    assertTrue(!rm.isFeatureSupported("not supported"));
-	}
+        RetrievalMethod rm = null;
+        for (int i = 0; i < 2; i++) {
+            switch (i) {
+            case 0:
+                rm = fac.newRetrievalMethod(uri);
+                break;
+            case 1:
+                rm = fac.newRetrievalMethod(uri, type, null);
+                break;
+            }		
+            try {
+                rm.isFeatureSupported(null); 
+                fail("Should raise a NPE for null feature"); 
+            } catch (NullPointerException npe) {}
+            
+            assertTrue(!rm.isFeatureSupported("not supported"));
+        }
     }
 }

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java Fri Jan  7 11:23:09 2011
@@ -25,77 +25,69 @@ import java.security.cert.X509CRL;
 import javax.xml.crypto.*;
 import javax.xml.crypto.dsig.keyinfo.*;
 
-import junit.framework.*;
-
 /**
  * Unit test for javax.xml.crypto.dsig.keyinfo.X509Data
  *
  * @version $Id$
  * @author Valerie Peng
  */
-public class X509DataTest extends TestCase {
+public class X509DataTest extends org.junit.Assert {
 
     private KeyInfoFactory fac;
 
-    public X509DataTest() {
-	super("X509DataTest");
-    }
-
-    public X509DataTest(String name) {
-	super(name);
+    public X509DataTest() throws Exception { 
+        fac = KeyInfoFactory.getInstance
+            ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
     }
 
-    public void setUp() throws Exception { 
-	fac = KeyInfoFactory.getInstance
-	    ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
-    }
-
-    public void tearDown() { }
-
+    @org.junit.Test
+    @SuppressWarnings("unchecked")
     public void testgetTypes() {
-	X509Data x509 = fac.newX509Data(Collections.singletonList("cn=foo"));
-	List li = x509.getContent();
-	assertNotNull(li);
-	if (!li.isEmpty()) {
-	    Object[] content = li.toArray();
-	    for (int j=0; j<content.length; j++) {
-		if (!(content[j] instanceof String) &&
-		    !(content[j] instanceof byte[]) &&
-		    !(content[j] instanceof X509Certificate) &&
-		    !(content[j] instanceof X509CRL) &&
-		    !(content[j] instanceof XMLStructure)) {
-		    fail("X509 element has the wrong type");
-		};
-	    }
-	} else {
-	    li.add("any string");
-	    li.add(new byte[5]);
-	    //@@@@@li.add(X509Certificate);
-	    //@@@@@li.add(X509CRL);
-	    //@@@@@li.add(XMLStructure);
-	    try {
-		li.add(new Object());
-		fail("Added X509 element of wrong type");
-	    } catch (ClassCastException ex) {
-		// expected
-	    }
-	}
+        X509Data x509 = fac.newX509Data(Collections.singletonList("cn=foo"));
+        List li = x509.getContent();
+        assertNotNull(li);
+        if (!li.isEmpty()) {
+            Object[] content = li.toArray();
+            for (int j=0; j<content.length; j++) {
+                if (!(content[j] instanceof String) &&
+                    !(content[j] instanceof byte[]) &&
+                    !(content[j] instanceof X509Certificate) &&
+                    !(content[j] instanceof X509CRL) &&
+                    !(content[j] instanceof XMLStructure)) {
+                    fail("X509 element has the wrong type");
+                };
+            }
+        } else {
+            li.add("any string");
+            li.add(new byte[5]);
+            //@@@@@li.add(X509Certificate);
+            //@@@@@li.add(X509CRL);
+            //@@@@@li.add(XMLStructure);
+            try {
+                li.add(new Object());
+                fail("Added X509 element of wrong type");
+            } catch (ClassCastException ex) {
+                // expected
+            }
+        }
     }
 
+    @org.junit.Test
     public void testConstructor() {
-	// test newX509Data()
-	X509Data x509 = fac.newX509Data(Collections.singletonList("cn=foo"));
-	assertNotNull(x509);
+        // test newX509Data()
+        X509Data x509 = fac.newX509Data(Collections.singletonList("cn=foo"));
+        assertNotNull(x509);
     }
 
+    @org.junit.Test
     public void testisFeatureSupported() {
 
-	X509Data x509 = fac.newX509Data(Collections.singletonList("cn=foo"));
-	try {
-	    x509.isFeatureSupported(null); 
-	    fail("Should raise a NPE for null feature"); 
-	} catch (NullPointerException npe) {}
-	
-	assertTrue(!x509.isFeatureSupported("not supported"));
+        X509Data x509 = fac.newX509Data(Collections.singletonList("cn=foo"));
+        try {
+            x509.isFeatureSupported(null); 
+            fail("Should raise a NPE for null feature"); 
+        } catch (NullPointerException npe) {}
+        
+        assertTrue(!x509.isFeatureSupported("not supported"));
     }
 }

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java Fri Jan  7 11:23:09 2011
@@ -22,76 +22,69 @@ package javax.xml.crypto.test.dsig.keyin
 import java.math.BigInteger;
 import javax.xml.crypto.dsig.keyinfo.*;
 
-import junit.framework.*;
-
 /**
  * Unit test for javax.xml.crypto.dsig.keyinfo.X509IssuerSerial
  *
  * @version $Id: X509IssuerSerialTest.java,v 1.1 2004/04/07 21:11:36 mullan Exp $
  * @author Valerie Peng
  */
-public class X509IssuerSerialTest extends TestCase {
+public class X509IssuerSerialTest extends org.junit.Assert {
 
     private KeyInfoFactory fac;
     private String name;
 
-    public X509IssuerSerialTest() {
-	super("X509IssuerSerialTest");
-    }
-
-    public X509IssuerSerialTest(String name) {
-	super(name);
+    public X509IssuerSerialTest() throws Exception { 
+        fac = KeyInfoFactory.getInstance
+            ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
+        name = "CN = Wolfgang";
     }
 
-    public void setUp() throws Exception { 
-	fac = KeyInfoFactory.getInstance
-	    ("DOM", new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
-	name = "CN = Wolfgang";
-    }
-
-    public void tearDown() { }
-
+    @org.junit.Test
     public void testgetIssuerName() {
-	X509IssuerSerial x509is = fac.newX509IssuerSerial(name,BigInteger.ZERO);
-	assertNotNull(x509is.getIssuerName());	
+        X509IssuerSerial x509is = fac.newX509IssuerSerial(name,BigInteger.ZERO);
+        assertNotNull(x509is.getIssuerName());	
     }
 
+    @org.junit.Test
     public void testgetSerialNumber() {
-	X509IssuerSerial x509is = fac.newX509IssuerSerial(name,BigInteger.ZERO);
-	assertNotNull(x509is.getSerialNumber());	
+        X509IssuerSerial x509is = fac.newX509IssuerSerial(name,BigInteger.ZERO);
+        assertNotNull(x509is.getSerialNumber());	
     }
 
+    @org.junit.Test
     public void testConstructor() {
-	// test newX509IssuerSerial(String, BigInteger)
-	X509IssuerSerial x509is = fac.newX509IssuerSerial(name, BigInteger.ONE);
-	assertEquals(name, x509is.getIssuerName());
-	assertEquals(BigInteger.ONE, x509is.getSerialNumber());
+        // test newX509IssuerSerial(String, BigInteger)
+        X509IssuerSerial x509is = fac.newX509IssuerSerial(name, BigInteger.ONE);
+        assertEquals(name, x509is.getIssuerName());
+        assertEquals(BigInteger.ONE, x509is.getSerialNumber());
     }
 
     /*
      * Confirm that an IllegalArgumentException is thrown when an issuer
      * distinguished name does not conform to RFC 2253.
      */
+    @org.junit.Test
     public void testConstructorBadIssuerName() {
-	// test newX509IssuerSerial(String, BigInteger)
-	String badName = "cn=bad,=+bad,";
-	try {
-	    fac.newX509IssuerSerial(badName,BigInteger.ONE);
-	    fail("Should raise an IllegalArgumentException when issuer " +
-		"distinguished name does not conform to RFC 2253"); 
-	} catch (IllegalArgumentException e) {
-	    // success
-	}
+        // test newX509IssuerSerial(String, BigInteger)
+        String badName = "cn=bad,=+bad,";
+        try {
+            fac.newX509IssuerSerial(badName,BigInteger.ONE);
+            fail("Should raise an IllegalArgumentException when issuer " +
+                "distinguished name does not conform to RFC 2253"); 
+        } catch (IllegalArgumentException e) {
+            // success
+        }
     }
 
+    @org.junit.Test
     public void testisFeatureSupported() {
-	
-	X509IssuerSerial x509is = fac.newX509IssuerSerial(name, BigInteger.ONE);
-	try {
-	    x509is.isFeatureSupported(null); 
-	    fail("Should raise a NPE for null feature"); 
-	} catch (NullPointerException npe) {}
-	
-	assertTrue(!x509is.isFeatureSupported("not supported"));
+        
+        X509IssuerSerial x509is = fac.newX509IssuerSerial(name, BigInteger.ONE);
+        try {
+            x509is.isFeatureSupported(null); 
+            fail("Should raise a NPE for null feature"); 
+        } catch (NullPointerException npe) {}
+        
+        assertTrue(!x509is.isFeatureSupported("not supported"));
     }
 }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/AllTests.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/AllTests.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/AllTests.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/AllTests.java Fri Jan  7 11:23:09 2011
@@ -21,14 +21,14 @@ 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;
-	}
+        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: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTableTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTableTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTableTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTableTest.java Fri Jan  7 11:23:09 2011
@@ -29,21 +29,21 @@ import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 
 public class NameSpaceSymbTableTest extends TestCase {
-	public static Test suite() {
-	      return new TestSuite(NameSpaceSymbTableTest.class);
-	   }
-	static Attr node1,node2;
+        public static Test suite() {
+              return new TestSuite(NameSpaceSymbTableTest.class);
+           }
+        static Attr node1,node2;
     static {
-    	try {
+        try {
             Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-			node1=doc.createAttributeNS("a","b");
+                        node1=doc.createAttributeNS("a","b");
             node2=doc.createAttributeNS("b","c");
-		} catch (Exception e) {
-			e.printStackTrace();
-		} 
+                } catch (Exception e) {
+                        e.printStackTrace();
+                } 
     }
-	public void testNullFirstXmlns() {
-		NameSpaceSymbTable ns=new NameSpaceSymbTable();
+        public void testNullFirstXmlns() {
+                NameSpaceSymbTable ns=new NameSpaceSymbTable();
         assertNull(ns.getMapping("xmlns"));
     }
     public void testXmlnsPut() {
@@ -91,7 +91,7 @@ public class NameSpaceSymbTableTest exte
         assertNull(ns.getMapping("xmlns"));             
     }
     public void testPrefix() {
-    	NameSpaceSymbTable ns=new NameSpaceSymbTable();
+        NameSpaceSymbTable ns=new NameSpaceSymbTable();
         ns.push();
         ns.addMapping("a","http://a",node1);
         assertEquals(node1,ns.getMapping("a"));
@@ -107,7 +107,7 @@ public class NameSpaceSymbTableTest exte
         assertEquals(node1,ns.getMapping("a"));
     }
     public void testSeveralPrefixes() {
-    	NameSpaceSymbTable ns=new NameSpaceSymbTable();
+        NameSpaceSymbTable ns=new NameSpaceSymbTable();
         ns.push();
         ns.addMapping("a","http://a",node1);
         ns.addMapping("b","http://b",node2);
@@ -126,7 +126,7 @@ public class NameSpaceSymbTableTest exte
         assertEquals(node1,ns.getMapping("a"));        
      }
     public void testGetUnrenderedNodes() {
-    	NameSpaceSymbTable ns=new NameSpaceSymbTable();
+        NameSpaceSymbTable ns=new NameSpaceSymbTable();
         ns.push();
         List l=new ArrayList();
         ns.addMapping("xmlns","http://a",node1);
@@ -138,7 +138,7 @@ public class NameSpaceSymbTableTest exte
         assertEquals(n, node2);
     }
     public void testUnrederedNodes() {
-    	NameSpaceSymbTable ns=new NameSpaceSymbTable();
+        NameSpaceSymbTable ns=new NameSpaceSymbTable();
         ns.push();
         List l=new ArrayList();
         ns.getUnrenderedNodes(l);
@@ -167,7 +167,7 @@ public class NameSpaceSymbTableTest exte
         
     }
     public void testBug38655() {
-    	 NameSpaceSymbTable ns=new NameSpaceSymbTable();
+         NameSpaceSymbTable ns=new NameSpaceSymbTable();
          ns.push();
          
          ns.addMappingAndRender("generated-command","http://foo.com/command",node1);        	 
@@ -181,6 +181,6 @@ public class NameSpaceSymbTableTest exte
          ns.addMappingAndRender("xmlns","http://www.w3.org/1999/xhtml",node1);
          ns.addMappingAndRender("ctrl","http://foo.com/controls",node1);
          ns.addMappingAndRender("wiki","http://foo.com/samples/wiki",node1);
-    		  
+                  
     }
 }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/UtfHelperTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/UtfHelperTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/UtfHelperTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/c14n/implementations/UtfHelperTest.java Fri Jan  7 11:23:09 2011
@@ -25,49 +25,49 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 public class UtfHelperTest extends TestCase {
-	public void testBug40156() {
-		String s="\u00e4\u00f6\u00fc";
-		byte a[]=UtfHelpper.getStringInUtf8(s);
-		try {
-			byte correct[]=s.getBytes("UTF8");
-			boolean equals=Arrays.equals(correct, a);
-			assertTrue(equals);
-		} catch (UnsupportedEncodingException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-	}
-	public void testUtf() throws Exception {
-		int chunk=1<<16; int j=0;
-		ByteArrayOutputStream charByCharOs=new ByteArrayOutputStream();
-		ByteArrayOutputStream strOs=new ByteArrayOutputStream();
-		
-		char chs[]=new char[chunk];
-		for (int i=0;i<chunk; i++) {
-			int ch=(chunk*j)+i;
-			if (ch==0xDBFF) {
-				ch=1;
-			}
-			chs[i]=(char)ch;
-			UtfHelpper.writeCharToUtf8((char) ch, charByCharOs);
-		}
-		String str=new String(chs);
-		byte a[]=UtfHelpper.getStringInUtf8(str);
-		try {
-			// System.out.println("chunk:"+j);
-			byte correct[]=str.getBytes("UTF8");
-			assertTrue("UtfHelper.getStringInUtf8 failse",Arrays.equals(correct, a));
-			assertTrue("UtfHelper.getStringInUtf8 failse",Arrays.equals(correct, charByCharOs.toByteArray()));
-			UtfHelpper.writeStringToUtf8(str, strOs);
-			assertTrue("UtfHelper.writeStringToUtf8 failse",Arrays.equals(correct, strOs.toByteArray()));
-			
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		
-	}
-	public static Test suite() {
-		return new TestSuite(UtfHelperTest.class);
-	}
+        public void testBug40156() {
+                String s="\u00e4\u00f6\u00fc";
+                byte a[]=UtfHelpper.getStringInUtf8(s);
+                try {
+                        byte correct[]=s.getBytes("UTF8");
+                        boolean equals=Arrays.equals(correct, a);
+                        assertTrue(equals);
+                } catch (UnsupportedEncodingException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                
+        }
+        public void testUtf() throws Exception {
+                int chunk=1<<16; int j=0;
+                ByteArrayOutputStream charByCharOs=new ByteArrayOutputStream();
+                ByteArrayOutputStream strOs=new ByteArrayOutputStream();
+                
+                char chs[]=new char[chunk];
+                for (int i=0;i<chunk; i++) {
+                        int ch=(chunk*j)+i;
+                        if (ch==0xDBFF) {
+                                ch=1;
+                        }
+                        chs[i]=(char)ch;
+                        UtfHelpper.writeCharToUtf8((char) ch, charByCharOs);
+                }
+                String str=new String(chs);
+                byte a[]=UtfHelpper.getStringInUtf8(str);
+                try {
+                        // System.out.println("chunk:"+j);
+                        byte correct[]=str.getBytes("UTF8");
+                        assertTrue("UtfHelper.getStringInUtf8 failse",Arrays.equals(correct, a));
+                        assertTrue("UtfHelper.getStringInUtf8 failse",Arrays.equals(correct, charByCharOs.toByteArray()));
+                        UtfHelpper.writeStringToUtf8(str, strOs);
+                        assertTrue("UtfHelper.writeStringToUtf8 failse",Arrays.equals(correct, strOs.toByteArray()));
+                        
+                } catch (UnsupportedEncodingException e) {
+                        e.printStackTrace();
+                }
+                
+        }
+        public static Test suite() {
+                return new TestSuite(UtfHelperTest.class);
+        }
 }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/AllTests.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/AllTests.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/AllTests.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/AllTests.java Fri Jan  7 11:23:09 2011
@@ -32,7 +32,7 @@ public class AllTests extends TestCase {
    /** {@link org.apache.commons.logging} logging facility */
     static org.apache.commons.logging.Log log = 
         org.apache.commons.logging.LogFactory.getLog(
-			    AllTests.class.getName());
+                            AllTests.class.getName());
 
    public AllTests(String test) {
       super(test);
@@ -50,7 +50,6 @@ public class AllTests extends TestCase {
 
       //J-
       suite.addTest(org.apache.xml.security.test.ModuleTest.suite());
-      suite.addTest(org.apache.xml.security.test.InteropTest.suite());
       suite.addTest(org.apache.xml.security.test.EncryptionTest.suite());
       //J+
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/EncryptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/EncryptionTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/EncryptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/EncryptionTest.java Fri Jan  7 11:23:09 2011
@@ -33,7 +33,7 @@ public class EncryptionTest extends Test
     }
 
     public static void main(String[] args) {
-		org.apache.xml.security.Init.init();
+                org.apache.xml.security.Init.init();
         
         processCmdLineArgs(args);
         TestRunner.run(suite());

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/ModuleTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/ModuleTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/ModuleTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/ModuleTest.java Fri Jan  7 11:23:09 2011
@@ -47,7 +47,6 @@ public class ModuleTest extends TestCase
       suite.addTest(org.apache.xml.security.test.c14n.helper.AttrCompareTest.suite());
       suite.addTest(org.apache.xml.security.test.c14n.implementations.Canonicalizer20010315Test.suite());
       suite.addTest(org.apache.xml.security.test.c14n.implementations.Canonicalizer20010315ExclusiveTest.suite());
-      suite.addTest(org.apache.xml.security.test.c14n.implementations.ExclusiveC14NInterop.suite());
       suite.addTest(org.apache.xml.security.test.c14n.implementations.Bug45961Test.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());

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/TestUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/TestUtils.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/TestUtils.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/TestUtils.java Fri Jan  7 11:23:09 2011
@@ -22,27 +22,27 @@ import org.w3c.dom.Element;
 
 public class TestUtils {
 
-	/**
-	    * Method createDSctx
-	    *
-	    * @param doc
-	    * @param prefix
-	    * @param namespace
-	    * @return the element.
-	    */
-	   public static Element createDSctx(Document doc, String prefix,
-	                                     String namespace) {
-	
-	      if ((prefix == null) || (prefix.trim().length() == 0)) {
-	         throw new IllegalArgumentException("You must supply a prefix");
-	      }
-	
-	      Element ctx = doc.createElementNS(null, "namespaceContext");
-	
-	      ctx.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix.trim(),
-	                         namespace);
-	
-	      return ctx;
-	   }
+        /**
+            * Method createDSctx
+            *
+            * @param doc
+            * @param prefix
+            * @param namespace
+            * @return the element.
+            */
+           public static Element createDSctx(Document doc, String prefix,
+                                             String namespace) {
+        
+              if ((prefix == null) || (prefix.trim().length() == 0)) {
+                 throw new IllegalArgumentException("You must supply a prefix");
+              }
+        
+              Element ctx = doc.createElementNS(null, "namespaceContext");
+        
+              ctx.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix.trim(),
+                                 namespace);
+        
+              return ctx;
+           }
 
 }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/algorithms/AllTests.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/algorithms/AllTests.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/algorithms/AllTests.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/algorithms/AllTests.java Fri Jan  7 11:23:09 2011
@@ -21,13 +21,13 @@ import junit.framework.TestSuite;
 
 public class AllTests {
 
-	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for org.apache.xml.security.test.algorithms");
-		//$JUnit-BEGIN$
-		suite.addTest(SignatureAlgorithmTest.suite());
-		//$JUnit-END$
-		return suite;
-	}
+        public static Test suite() {
+                TestSuite suite = new TestSuite(
+                                "Test for org.apache.xml.security.test.algorithms");
+                //$JUnit-BEGIN$
+                suite.addTest(SignatureAlgorithmTest.suite());
+                //$JUnit-END$
+                return suite;
+        }
 
 }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/algorithms/SignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/algorithms/SignatureAlgorithmTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/algorithms/SignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/algorithms/SignatureAlgorithmTest.java Fri Jan  7 11:23:09 2011
@@ -36,31 +36,31 @@ public class SignatureAlgorithmTest exte
     static org.apache.commons.logging.Log log = 
         org.apache.commons.logging.LogFactory.getLog(SignatureAlgorithmTest.class.getName());
 
-	static {
-	    org.apache.xml.security.Init.init();
-	}
+        static {
+            org.apache.xml.security.Init.init();
+        }
 
-	public void testSameKeySeveralAlgorithmSigning() throws Exception {
-		Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-		SignatureAlgorithm signatureAlgorithm = new SignatureAlgorithm(doc,XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1);
-		PrivateKey pk=KeyPairGenerator.getInstance("RSA").genKeyPair().getPrivate();
-		signatureAlgorithm.initSign(pk);
-		signatureAlgorithm.update((byte)2);
-		signatureAlgorithm.sign();
-		SignatureAlgorithm otherSignatureAlgorithm =
+        public void testSameKeySeveralAlgorithmSigning() throws Exception {
+                Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+                SignatureAlgorithm signatureAlgorithm = new SignatureAlgorithm(doc,XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1);
+                PrivateKey pk=KeyPairGenerator.getInstance("RSA").genKeyPair().getPrivate();
+                signatureAlgorithm.initSign(pk);
+                signatureAlgorithm.update((byte)2);
+                signatureAlgorithm.sign();
+                SignatureAlgorithm otherSignatureAlgorithm =
              new SignatureAlgorithm(doc, XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256);
 
-		try {
-		    otherSignatureAlgorithm.initSign(pk);
-		} catch (XMLSecurityException ex) {
+                try {
+                    otherSignatureAlgorithm.initSign(pk);
+                } catch (XMLSecurityException ex) {
             log.warn("Test testSameKeySeveralAlgorithmSigning skipped as necessary algorithms not available");
             return;
         }
-		    
-		otherSignatureAlgorithm.update((byte)2);
-		otherSignatureAlgorithm.sign();
-	}
-	public static Test suite() {
-		return new TestSuite(SignatureAlgorithmTest.class);
-	}
+                    
+                otherSignatureAlgorithm.update((byte)2);
+                otherSignatureAlgorithm.sign();
+        }
+        public static Test suite() {
+                return new TestSuite(SignatureAlgorithmTest.class);
+        }
 }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Bug45961Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Bug45961Test.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Bug45961Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Bug45961Test.java Fri Jan  7 11:23:09 2011
@@ -44,25 +44,25 @@ import junit.framework.TestSuite;
 
 public class Bug45961Test extends TestCase {
 
-	private static final String OBJECT_ID = "Object";
-	private static final String MOCK_CANONICALIZATION_METHOD = MockCanonicalizationMethod.MOCK_CANONICALIZATION_METHOD;
-	private static final char[] PASSWORD = "changeit".toCharArray();
-	private static final String ALIAS = "mullan";
-	private DocumentBuilder _builder;
-	private ObjectContainer object;
-	
-	public static Test suite() {
-		return new TestSuite(Bug45961Test.class);
-	}
-
-	protected void setUp() throws Exception {
-		Init.init();
-		Canonicalizer.register(MOCK_CANONICALIZATION_METHOD,
-				MockCanonicalizationMethod.class.getName());
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(true);
-		_builder = factory.newDocumentBuilder();
-	}
+        private static final String OBJECT_ID = "Object";
+        private static final String MOCK_CANONICALIZATION_METHOD = MockCanonicalizationMethod.MOCK_CANONICALIZATION_METHOD;
+        private static final char[] PASSWORD = "changeit".toCharArray();
+        private static final String ALIAS = "mullan";
+        private DocumentBuilder _builder;
+        private ObjectContainer object;
+        
+        public static Test suite() {
+                return new TestSuite(Bug45961Test.class);
+        }
+
+        protected void setUp() throws Exception {
+                Init.init();
+                Canonicalizer.register(MOCK_CANONICALIZATION_METHOD,
+                                MockCanonicalizationMethod.class.getName());
+                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+                factory.setNamespaceAware(true);
+                _builder = factory.newDocumentBuilder();
+        }
 
         public void testBug() throws Exception {
                 Document document = getSignedDocument();
@@ -76,24 +76,24 @@ public class Bug45961Test extends TestCa
                 try {
                         signature.checkSignatureValue(certificate);
                 } catch (XMLSignatureException e) {
-               		fail(e.getMessage());
+                        fail(e.getMessage());
                 }
         }
 
-	private Document getSignedDocument() throws Exception {
-		KeyStore ks = KeyStore.getInstance("JKS");
-		FileInputStream fis = new FileInputStream(getAbsolutePath("data/test.jks"));
-		ks.load(fis, PASSWORD);
-		fis.close();
-		PrivateKey privateKey = (PrivateKey) ks.getKey(ALIAS, PASSWORD);
-		X509Certificate signingCert = (X509Certificate) ks
-				.getCertificate(ALIAS);
-
-		Document document = _builder.newDocument();
-
-		XMLSignature signature = new XMLSignature(document, null,
-				XMLSignature.ALGO_ID_SIGNATURE_DSA,
-				MOCK_CANONICALIZATION_METHOD);
+        private Document getSignedDocument() throws Exception {
+                KeyStore ks = KeyStore.getInstance("JKS");
+                FileInputStream fis = new FileInputStream(getAbsolutePath("data/test.jks"));
+                ks.load(fis, PASSWORD);
+                fis.close();
+                PrivateKey privateKey = (PrivateKey) ks.getKey(ALIAS, PASSWORD);
+                X509Certificate signingCert = (X509Certificate) ks
+                                .getCertificate(ALIAS);
+
+                Document document = _builder.newDocument();
+
+                XMLSignature signature = new XMLSignature(document, null,
+                                XMLSignature.ALGO_ID_SIGNATURE_DSA,
+                                MOCK_CANONICALIZATION_METHOD);
 
                 Element root = document.createElementNS("", "RootElement");
                 root.appendChild(document.createTextNode("Some simple test\n"));
@@ -102,19 +102,19 @@ public class Bug45961Test extends TestCa
 
 //		document.appendChild(signature.getElement());
 
-		Element root2 = document.createElementNS("", "RootElement");
-		root2.appendChild(document.createTextNode("Some simple test\n"));
-		object = new ObjectContainer(document);
-		object.appendChild(root2);
-		object.setId(OBJECT_ID);
-
-		signature.addDocument("#" + OBJECT_ID);
-		signature.addDocument("", getTransforms(document));
-
-		signature.addKeyInfo(signingCert);
-		signature.sign(privateKey);
-		return document;
-	}
+                Element root2 = document.createElementNS("", "RootElement");
+                root2.appendChild(document.createTextNode("Some simple test\n"));
+                object = new ObjectContainer(document);
+                object.appendChild(root2);
+                object.setId(OBJECT_ID);
+
+                signature.addDocument("#" + OBJECT_ID);
+                signature.addDocument("", getTransforms(document));
+
+                signature.addKeyInfo(signingCert);
+                signature.sign(privateKey);
+                return document;
+        }
 
         private Transforms getTransforms(Document document) throws Exception {
                 Transforms transforms = new Transforms(document);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315ExclusiveTest.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315ExclusiveTest.java Fri Jan  7 11:23:09 2011
@@ -343,7 +343,7 @@ public class Canonicalizer20010315Exclus
                                  "(//. | //@* | //namespace::*)[ancestor-or-self::p]");
       Canonicalizer20010315Excl c = new Canonicalizer20010315ExclWithComments();
       byte[] reference = JavaUtils.getBytesFromFile(
-      		getAbsolutePath("data/org/apache/xml/security/c14n/inExcl/example2_2_3_c14nized_exclusive.xml") );
+                getAbsolutePath("data/org/apache/xml/security/c14n/inExcl/example2_2_3_c14nized_exclusive.xml") );
       byte[] result = c.engineCanonicalizeXPathNodeSet(nodes);
       assertEquals(new String(reference),new String(result));
    }
@@ -368,24 +368,24 @@ public class Canonicalizer20010315Exclus
             + "</env:Body>"
             + "</env:Envelope>";
 
-	final String c14nXML =
-	    "<env:Body"
-	    + " xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\""
-	    + " xmlns:ns0=\"http://xmlsoap.org/Ping\""
-	    + " xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\""
-	    + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-	    + " wsu:Id=\"body\">"
-	    + "<ns0:Ping xsi:type=\"ns0:ping\">"
-	    + "<ns0:text xsi:type=\"xsd:string\">hello</ns0:text>"
-	    + "</ns0:Ping>"
-	    + "</env:Body>";
+        final String c14nXML =
+            "<env:Body"
+            + " xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\""
+            + " xmlns:ns0=\"http://xmlsoap.org/Ping\""
+            + " xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\""
+            + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
+            + " wsu:Id=\"body\">"
+            + "<ns0:Ping xsi:type=\"ns0:ping\">"
+            + "<ns0:text xsi:type=\"xsd:string\">hello</ns0:text>"
+            + "</ns0:Ping>"
+            + "</env:Body>";
 
         Document doc = this.db.parse(new InputSource(new StringReader(XML)));
         Canonicalizer20010315ExclOmitComments c14n = 
-	    new Canonicalizer20010315ExclOmitComments();
+            new Canonicalizer20010315ExclOmitComments();
         Set nodeSet = new HashSet();
         XMLUtils.getSet
-	    (doc.getDocumentElement().getFirstChild(), nodeSet, null, false);
+            (doc.getDocumentElement().getFirstChild(), nodeSet, null, false);
         XMLSignatureInput input = new XMLSignatureInput(nodeSet);
         byte[] bytes = c14n.engineCanonicalize(input, "env ns0 xsi wsu");
         assertEquals(c14nXML,new String(bytes));
@@ -393,11 +393,11 @@ public class Canonicalizer20010315Exclus
 
    private String getAbsolutePath(String path)
    {
-   	  String basedir = System.getProperty("basedir");
-   	  if(basedir != null && !"".equals(basedir)) {
-   		path = basedir + "/" + path;
-   	  }
-   	  return path;
+          String basedir = System.getProperty("basedir");
+          if(basedir != null && !"".equals(basedir)) {
+                path = basedir + "/" + path;
+          }
+          return path;
    }
    
 }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315Test.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315Test.java Fri Jan  7 11:23:09 2011
@@ -353,7 +353,7 @@ public class Canonicalizer20010315Test e
                   ParserConfigurationException, CanonicalizationException,
                   InvalidCanonicalizerException, TransformerException
    {
-   	
+        
 
       String descri =
          "3.4 Character Modifications and Character References. (uncommented)";
@@ -1163,9 +1163,9 @@ public class Canonicalizer20010315Test e
       if (result == false) {    	  
          File f = new File(fileOut);
          if (!f.exists()) {
-         	File parent = new File(f.getParent());
-         	parent.mkdirs();
-         	f.createNewFile();
+                File parent = new File(f.getParent());
+                parent.mkdirs();
+                f.createNewFile();
          }
          FileOutputStream fos = new FileOutputStream(f);
 
@@ -1223,10 +1223,10 @@ public class Canonicalizer20010315Test e
          throw new RuntimeException(urlEx.getMessage());
       }
       */
-   	  prefix = "data/org/apache/xml/security/c14n/";
-   	  String basedir = System.getProperty("basedir");
-   	  if(basedir != null && !"".equals(basedir)) {
-   		prefix = basedir + "/" + prefix;
+          prefix = "data/org/apache/xml/security/c14n/";
+          String basedir = System.getProperty("basedir");
+          if(basedir != null && !"".equals(basedir)) {
+                prefix = basedir + "/" + prefix;
       }
       
       org.apache.xml.security.Init.init();

Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInteropTest.java (from r1054975, santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInterop.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInteropTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInteropTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInterop.java&r1=1054975&r2=1056263&rev=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInterop.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInteropTest.java Fri Jan  7 11:23:09 2011
@@ -17,16 +17,11 @@
  */
 package org.apache.xml.security.test.c14n.implementations;
 
-
-
 import java.io.File;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.xml.security.signature.Reference;
 import org.apache.xml.security.signature.XMLSignature;
-import org.apache.xml.security.test.interop.InteropTest;
+import org.apache.xml.security.test.interop.InteropTestBase;
 import org.apache.xml.security.utils.Constants;
 import org.apache.xml.security.utils.JavaUtils;
 import org.w3c.dom.Element;
@@ -37,175 +32,154 @@ import org.w3c.dom.Element;
  *
  * @author Christian Geuer-Pollmann
  */
-public class ExclusiveC14NInterop extends InteropTest {
+public class ExclusiveC14NInteropTest extends InteropTestBase {
 
-   /** {@link org.apache.commons.logging} logging facility */
+    /** {@link org.apache.commons.logging} logging facility */
     static org.apache.commons.logging.Log log = 
-        org.apache.commons.logging.LogFactory.getLog(ExclusiveC14NInterop.class.getName());
+        org.apache.commons.logging.LogFactory.getLog(ExclusiveC14NInteropTest.class.getName());
 
     static {
         org.apache.xml.security.Init.init();
     }
-   /**
-    * Method suite
-    *
-    *
-    */
-   public static Test suite() {
-      return new TestSuite(ExclusiveC14NInterop.class);
-   }
-
-   /**
-    *  Constructor ExclusiveC14NInterop
-    *
-    *  @param Name_
-    */
-   public ExclusiveC14NInterop(String Name_) {
-      super(Name_);
-   }
-
-   /**
-    * Method main
-    *
-    * @param args
-    */
-   public static void main(String[] args) {
-
-      String[] testCaseName = { "-noloading",
-                                ExclusiveC14NInterop.class.getName() };
-
-      org.apache.xml.security.Init.init();
-      junit.textui.TestRunner.main(testCaseName);
-   }
-
-   /**
-    * Method test_Y1
-    *
-    * @throws Exception
-    */
-   public void test_Y1() throws Exception {
-
-      String success = t("data/interop/c14n/Y1", "exc-signature.xml");
-
-      assertTrue(success, success == null);
-   }
-
-   /**
-    * Method test_Y2
-    *
-    * @throws Exception
-    */
-   public void test_Y2() throws Exception {
-
-      String success = t("data/interop/c14n/Y2", "signature-joseph-exc.xml");
-
-      assertTrue(success, success == null);
-   }
-
-   /**
-    * Method test_Y3
-    *
-    * @throws Exception
-    */
-   public void test_Y3() throws Exception {
-
-      String success = t("data/interop/c14n/Y3", "signature.xml");
-
-      assertTrue(success, success == null);
-   }
-
-   /**
-    * Method test_Y4
-    *
-    * @throws Exception
-    */
-   public void test_Y4() throws Exception {
-
-      String success = t("data/interop/c14n/Y4", "signature.xml");
-
-      assertTrue(success, success == null);
-   }
-
-   public void test_xfilter2() throws Exception {
-
-      String success = t("data/interop/xfilter2/merlin-xpath-filter2-three", "sign-spec.xml");
-
-      assertTrue(success, success == null);
-   }
-
-   /**
-    * Method t
-    *
-    * @param directory
-    * @param file
-    *
-    * @throws Exception
-    */
-   public String t(String directory, String file) throws Exception
-   {
-   	  String basedir = System.getProperty("basedir");
-   	  if(basedir != null && !"".equals(basedir)) {
-   	  	directory = basedir + "/" + directory;
-   	  }
-
-      File f = new File(directory + "/" + file);
-      javax.xml.parsers.DocumentBuilderFactory dbf =
-         javax.xml.parsers.DocumentBuilderFactory.newInstance();
-
-      dbf.setNamespaceAware(true);
-
-      javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
-      org.w3c.dom.Document doc = db.parse(f);
-      
-      Element sigElement =
-         (Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
-                                              Constants._TAG_SIGNATURE).item(0);
-      XMLSignature signature = new XMLSignature(sigElement,
-                                                f.toURL().toString());
-      boolean verify =
-         signature.checkSignatureValue(signature.getKeyInfo().getPublicKey());
-
-      log.debug("   signature.checkSignatureValue finished: " + verify);
-
-      int failures = 0;
-
-      // if (!verify) {
-      if (true) {
-         StringBuffer sb = new StringBuffer();
-
-         for (int i = 0; i < signature.getSignedInfo().getLength(); i++) {
-            boolean refVerify =
-               signature.getSignedInfo().getVerificationResult(i);
-            JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
+    
+    /**
+     *  Constructor ExclusiveC14NInteropTest
+     */
+    public ExclusiveC14NInteropTest() {
+        super();
+    }
 
-            if (refVerify) {
-               log.debug("Reference " + i + " was OK");
-            } else {
-               failures++;
+    /**
+     * Method test_Y1
+     *
+     * @throws Exception
+     */
+    @org.junit.Test
+    public void test_Y1() throws Exception {
+
+        String success = t("data/interop/c14n/Y1", "exc-signature.xml");
 
-               sb.append(i + " ");
+        assertTrue(success, success == null);
+    }
 
-               JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.txt", signature.getSignedInfo().item(i).getContentsAfterTransformation().getBytes());
-               JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
+    /**
+     * Method test_Y2
+     *
+     * @throws Exception
+     */
+    @org.junit.Test
+    public void test_Y2() throws Exception {
 
-               Reference reference = signature.getSignedInfo().item(i);
-               int length = reference.getTransforms().getLength();
-               String algo = reference.getTransforms().item(length
-                  - 1).getURI();
+        String success = t("data/interop/c14n/Y2", "signature-joseph-exc.xml");
+
+        assertTrue(success, success == null);
+    }
+
+    /**
+     * Method test_Y3
+     *
+     * @throws Exception
+     */
+    @org.junit.Test
+    public void test_Y3() throws Exception {
+
+        String success = t("data/interop/c14n/Y3", "signature.xml");
+
+        assertTrue(success, success == null);
+    }
 
-               log.debug("Reference " + i + " failed: " + algo);
+    /**
+     * Method test_Y4
+     *
+     * @throws Exception
+     */
+    @org.junit.Test
+    public void test_Y4() throws Exception {
+
+        String success = t("data/interop/c14n/Y4", "signature.xml");
+
+        assertTrue(success, success == null);
+    }
+
+    @org.junit.Test
+    public void test_xfilter2() throws Exception {
+
+        String success = t("data/interop/xfilter2/merlin-xpath-filter2-three", "sign-spec.xml");
+
+        assertTrue(success, success == null);
+    }
+
+    /**
+     * Method t
+     *
+     * @param directory
+     * @param file
+     *
+     * @throws Exception
+     */
+    private String t(String directory, String file) throws Exception {
+        String basedir = System.getProperty("basedir");
+        if (basedir != null && !"".equals(basedir)) {
+            directory = basedir + "/" + directory;
+        }
+
+        File f = new File(directory + "/" + file);
+        javax.xml.parsers.DocumentBuilderFactory dbf =
+            javax.xml.parsers.DocumentBuilderFactory.newInstance();
+
+        dbf.setNamespaceAware(true);
+
+        javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+        org.w3c.dom.Document doc = db.parse(f);
+
+        Element sigElement =
+            (Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
+                                                 Constants._TAG_SIGNATURE).item(0);
+        XMLSignature signature = new XMLSignature(sigElement, f.toURI().toURL().toString());
+        boolean verify =
+            signature.checkSignatureValue(signature.getKeyInfo().getPublicKey());
+
+        log.debug("   signature.checkSignatureValue finished: " + verify);
+
+        int failures = 0;
+
+        // if (!verify) {
+        if (true) {
+            StringBuffer sb = new StringBuffer();
+
+            for (int i = 0; i < signature.getSignedInfo().getLength(); i++) {
+                boolean refVerify =
+                    signature.getSignedInfo().getVerificationResult(i);
+                JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
+
+                if (refVerify) {
+                    log.debug("Reference " + i + " was OK");
+                } else {
+                    failures++;
+
+                    sb.append(i + " ");
+
+                    JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.txt", signature.getSignedInfo().item(i).getContentsAfterTransformation().getBytes());
+                    JavaUtils.writeBytesToFilename(directory + "/c14n-" + i + ".apache.html", signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
+
+                    Reference reference = signature.getSignedInfo().item(i);
+                    int length = reference.getTransforms().getLength();
+                    String algo = reference.getTransforms().item(length - 1).getURI();
+
+                    log.debug("Reference " + i + " failed: " + algo);
+                }
             }
-         }
 
-         String r = sb.toString().trim();
+            String r = sb.toString().trim();
 
-         if (r.length() == 0) {
+            if (r.length() == 0) {
+                return null;
+            } else {
+                return r;
+            }
+        } else {
             return null;
-         } else {
-            return r;
-         }
-      } else {
-         return null;
-      }
-   }
+        }
+    }
+    
 }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/MockCanonicalizationMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/MockCanonicalizationMethod.java?rev=1056263&r1=1056262&r2=1056263&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/MockCanonicalizationMethod.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/c14n/implementations/MockCanonicalizationMethod.java Fri Jan  7 11:23:09 2011
@@ -27,44 +27,44 @@ import org.w3c.dom.Node;
 
 public class MockCanonicalizationMethod extends CanonicalizerSpi {
 
-	public static final String MOCK_CANONICALIZATION_METHOD = "mock.canonicalization.method";
-	private Canonicalizer11_OmitComments _impl;
+        public static final String MOCK_CANONICALIZATION_METHOD = "mock.canonicalization.method";
+        private Canonicalizer11_OmitComments _impl;
 
-	public MockCanonicalizationMethod() {
-		_impl = new Canonicalizer11_OmitComments();
-	}
-
-	public byte[] engineCanonicalizeSubTree(Node rootNode)
-			throws CanonicalizationException {
-		return _impl.engineCanonicalizeSubTree(rootNode);
-	}
-
-	public byte[] engineCanonicalizeSubTree(Node rootNode,
-			String inclusiveNamespaces) throws CanonicalizationException {
-		return _impl.engineCanonicalizeSubTree(rootNode, inclusiveNamespaces);
-	}
-
-	public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet)
-			throws CanonicalizationException {
-		return _impl.engineCanonicalizeXPathNodeSet(xpathNodeSet);
-	}
-
-	public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet,
-			String inclusiveNamespaces) throws CanonicalizationException {
-		return _impl.engineCanonicalizeXPathNodeSet(xpathNodeSet,
-				inclusiveNamespaces);
-	}
-
-	public boolean engineGetIncludeComments() {
-		return _impl.engineGetIncludeComments();
-	}
-
-	public String engineGetURI() {
-		return MOCK_CANONICALIZATION_METHOD;
-	}
-
-	public void setWriter(OutputStream os) {
-		_impl.setWriter(os);
-	}
+        public MockCanonicalizationMethod() {
+                _impl = new Canonicalizer11_OmitComments();
+        }
+
+        public byte[] engineCanonicalizeSubTree(Node rootNode)
+                        throws CanonicalizationException {
+                return _impl.engineCanonicalizeSubTree(rootNode);
+        }
+
+        public byte[] engineCanonicalizeSubTree(Node rootNode,
+                        String inclusiveNamespaces) throws CanonicalizationException {
+                return _impl.engineCanonicalizeSubTree(rootNode, inclusiveNamespaces);
+        }
+
+        public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet)
+                        throws CanonicalizationException {
+                return _impl.engineCanonicalizeXPathNodeSet(xpathNodeSet);
+        }
+
+        public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet,
+                        String inclusiveNamespaces) throws CanonicalizationException {
+                return _impl.engineCanonicalizeXPathNodeSet(xpathNodeSet,
+                                inclusiveNamespaces);
+        }
+
+        public boolean engineGetIncludeComments() {
+                return _impl.engineGetIncludeComments();
+        }
+
+        public String engineGetURI() {
+                return MOCK_CANONICALIZATION_METHOD;
+        }
+
+        public void setWriter(OutputStream os) {
+                _impl.setWriter(os);
+        }
 
 }



Mime
View raw message