|
From: <pe...@us...> - 2003-11-21 04:44:35
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/transforms In directory sc8-pr-cvs1:/tmp/cvs-serv10728/src/test/org/neuclear/xml/transforms Modified Files: AbstractTransformTest.java ClearTransformTest.java DropSignatureTransformTest.java OpaqueTransformTest.java TransformFactoryTest.java XPathTransformTest.java Log Message: EncryptedFileStore now works. It uses the PBECipher with DES3 afair. Otherwise You will Finaliate. Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final. This should hopefully make everything more stable (and secure). Index: AbstractTransformTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/transforms/AbstractTransformTest.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** AbstractTransformTest.java 11 Nov 2003 16:33:31 -0000 1.1.1.1 --- AbstractTransformTest.java 21 Nov 2003 04:44:31 -0000 1.2 *************** *** 14,17 **** --- 14,23 ---- * $Id$ * $Log$ + * Revision 1.2 2003/11/21 04:44:31 pelle + * EncryptedFileStore now works. It uses the PBECipher with DES3 afair. + * Otherwise You will Finaliate. + * Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final. + * This should hopefully make everything more stable (and secure). + * * Revision 1.1.1.1 2003/11/11 16:33:31 pelle * Moved over from neudist.org *************** *** 37,41 **** */ public abstract class AbstractTransformTest extends TestCase { ! public AbstractTransformTest(String s) { super(s); tr=createTransform(); --- 43,47 ---- */ public abstract class AbstractTransformTest extends TestCase { ! public AbstractTransformTest(final String s) { super(s); tr=createTransform(); *************** *** 53,59 **** } ! public void testTransformElement() throws DocumentException { ! Object result=tr.transformNode(getTestElement()); ! Node expected=getExpectedResult(); if(expected==null) assertNull("The Transform did not return null as expected",result); --- 59,65 ---- } ! public final void testTransformElement() throws DocumentException { ! final Object result=tr.transformNode(getTestElement()); ! final Node expected=getExpectedResult(); if(expected==null) assertNull("The Transform did not return null as expected",result); *************** *** 64,67 **** } ! protected Transform tr; } --- 70,73 ---- } ! protected final Transform tr; } Index: ClearTransformTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/transforms/ClearTransformTest.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ClearTransformTest.java 11 Nov 2003 16:33:31 -0000 1.1.1.1 --- ClearTransformTest.java 21 Nov 2003 04:44:31 -0000 1.2 *************** *** 11,14 **** --- 11,20 ---- * $Id$ * $Log$ + * Revision 1.2 2003/11/21 04:44:31 pelle + * EncryptedFileStore now works. It uses the PBECipher with DES3 afair. + * Otherwise You will Finaliate. + * Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final. + * This should hopefully make everything more stable (and secure). + * * Revision 1.1.1.1 2003/11/11 16:33:31 pelle * Moved over from neudist.org *************** *** 30,43 **** * */ ! public class ClearTransformTest extends AbstractTransformTest { ! public ClearTransformTest(String s) { super(s); } ! public Transform createTransform() { return new ClearTransform(); } ! public Element getExpectedResult() throws DocumentException { return getTestElement(); } --- 36,49 ---- * */ ! public final class ClearTransformTest extends AbstractTransformTest { ! public ClearTransformTest(final String s) { super(s); } ! public final Transform createTransform() { return new ClearTransform(); } ! public final Element getExpectedResult() throws DocumentException { return getTestElement(); } Index: DropSignatureTransformTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/transforms/DropSignatureTransformTest.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DropSignatureTransformTest.java 11 Nov 2003 16:33:31 -0000 1.1.1.1 --- DropSignatureTransformTest.java 21 Nov 2003 04:44:31 -0000 1.2 *************** *** 9,12 **** --- 9,18 ---- * $Id$ * $Log$ + * Revision 1.2 2003/11/21 04:44:31 pelle + * EncryptedFileStore now works. It uses the PBECipher with DES3 afair. + * Otherwise You will Finaliate. + * Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final. + * This should hopefully make everything more stable (and secure). + * * Revision 1.1.1.1 2003/11/11 16:33:31 pelle * Moved over from neudist.org *************** *** 33,46 **** import org.dom4j.Element; ! public class DropSignatureTransformTest extends AbstractTransformTest { ! public DropSignatureTransformTest(String s) { super(s); } ! public Transform createTransform() { return new DropSignatureTransform(); } ! public Element getTestElement() { try { return DocumentHelper.parseText(TESTELEMENT).getRootElement(); --- 39,52 ---- import org.dom4j.Element; ! public final class DropSignatureTransformTest extends AbstractTransformTest { ! public DropSignatureTransformTest(final String s) { super(s); } ! public final Transform createTransform() { return new DropSignatureTransform(); } ! public final Element getTestElement() { try { return DocumentHelper.parseText(TESTELEMENT).getRootElement(); *************** *** 51,55 **** } ! public Element getExpectedResult() { try { return DocumentHelper.parseText(TESTRESULT).getRootElement(); --- 57,61 ---- } ! public final Element getExpectedResult() { try { return DocumentHelper.parseText(TESTRESULT).getRootElement(); *************** *** 60,64 **** } ! private static String TESTELEMENT="<test><test2/><ds:Signature xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"/></test>"; ! private static String TESTRESULT="<test><test2/></test>"; } --- 66,70 ---- } ! private static final String TESTELEMENT="<test><test2/><ds:Signature xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"/></test>"; ! private static final String TESTRESULT="<test><test2/></test>"; } Index: OpaqueTransformTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/transforms/OpaqueTransformTest.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OpaqueTransformTest.java 11 Nov 2003 16:33:31 -0000 1.1.1.1 --- OpaqueTransformTest.java 21 Nov 2003 04:44:31 -0000 1.2 *************** *** 9,12 **** --- 9,18 ---- * $Id$ * $Log$ + * Revision 1.2 2003/11/21 04:44:31 pelle + * EncryptedFileStore now works. It uses the PBECipher with DES3 afair. + * Otherwise You will Finaliate. + * Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final. + * This should hopefully make everything more stable (and secure). + * * Revision 1.1.1.1 2003/11/11 16:33:31 pelle * Moved over from neudist.org *************** *** 23,36 **** import org.dom4j.Element; ! public class OpaqueTransformTest extends AbstractTransformTest { ! public OpaqueTransformTest(String s) { super(s); } ! public Transform createTransform() { return new OpaqueTransform(); } ! public Element getExpectedResult() { return null; } --- 29,42 ---- import org.dom4j.Element; ! public final class OpaqueTransformTest extends AbstractTransformTest { ! public OpaqueTransformTest(final String s) { super(s); } ! public final Transform createTransform() { return new OpaqueTransform(); } ! public final Element getExpectedResult() { return null; } Index: TransformFactoryTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/transforms/TransformFactoryTest.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TransformFactoryTest.java 11 Nov 2003 16:33:31 -0000 1.1.1.1 --- TransformFactoryTest.java 21 Nov 2003 04:44:31 -0000 1.2 *************** *** 8,11 **** --- 8,17 ---- * $Id$ * $Log$ + * Revision 1.2 2003/11/21 04:44:31 pelle + * EncryptedFileStore now works. It uses the PBECipher with DES3 afair. + * Otherwise You will Finaliate. + * Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final. + * This should hopefully make everything more stable (and secure). + * * Revision 1.1.1.1 2003/11/11 16:33:31 pelle * Moved over from neudist.org *************** *** 32,37 **** import org.neuclear.xml.xmlsec.XMLSecTools; ! public class TransformFactoryTest extends TestCase{ ! public TransformFactoryTest(String s) { super(s); { --- 38,43 ---- import org.neuclear.xml.xmlsec.XMLSecTools; ! public final class TransformFactoryTest extends TestCase{ ! public TransformFactoryTest(final String s) { super(s); { *************** *** 41,45 **** } } ! public void testCreateFromAlgorithmName() throws XMLTransformNotFoundException { assertNotNull(TransformerFactory.make("uri:neuclear-test-clear-transform")); assertNotNull(TransformerFactory.make("uri:neuclear-test-opaque-transform")); --- 47,51 ---- } } ! public final void testCreateFromAlgorithmName() throws XMLTransformNotFoundException { assertNotNull(TransformerFactory.make("uri:neuclear-test-clear-transform")); assertNotNull(TransformerFactory.make("uri:neuclear-test-opaque-transform")); *************** *** 52,65 **** } ! public void testCreateFromElement() throws XMLTransformNotFoundException { ! Element clear=XMLSecTools.createElementInSignatureSpace("Transform"); clear.addAttribute("Algorithm","uri:neuclear-test-clear-transform"); assertNotNull(TransformerFactory.make(clear)); ! Element opaque=XMLSecTools.createElementInSignatureSpace("Transform"); opaque.addAttribute("Algorithm","uri:neuclear-test-opaque-transform"); assertNotNull(TransformerFactory.make(opaque)); ! Element dud=XMLSecTools.createElementInSignatureSpace("Transform"); dud.addAttribute("Algorithm","uri:neuclear-test-non-existent"); try { --- 58,71 ---- } ! public final void testCreateFromElement() throws XMLTransformNotFoundException { ! final Element clear=XMLSecTools.createElementInSignatureSpace("Transform"); clear.addAttribute("Algorithm","uri:neuclear-test-clear-transform"); assertNotNull(TransformerFactory.make(clear)); ! final Element opaque=XMLSecTools.createElementInSignatureSpace("Transform"); opaque.addAttribute("Algorithm","uri:neuclear-test-opaque-transform"); assertNotNull(TransformerFactory.make(opaque)); ! final Element dud=XMLSecTools.createElementInSignatureSpace("Transform"); dud.addAttribute("Algorithm","uri:neuclear-test-non-existent"); try { Index: XPathTransformTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/transforms/XPathTransformTest.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** XPathTransformTest.java 11 Nov 2003 16:33:31 -0000 1.1.1.1 --- XPathTransformTest.java 21 Nov 2003 04:44:31 -0000 1.2 *************** *** 9,12 **** --- 9,18 ---- * $Id$ * $Log$ + * Revision 1.2 2003/11/21 04:44:31 pelle + * EncryptedFileStore now works. It uses the PBECipher with DES3 afair. + * Otherwise You will Finaliate. + * Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final. + * This should hopefully make everything more stable (and secure). + * * Revision 1.1.1.1 2003/11/11 16:33:31 pelle * Moved over from neudist.org *************** *** 37,54 **** import java.util.Iterator; ! public class XPathTransformTest extends AbstractTransformTest { ! public XPathTransformTest(String s) { super(s); } ! public Transform createTransform() { return new XPathTransform("/test"); } ! public Element getExpectedResult() throws DocumentException { return DocumentHelper.parseText("<test/>").getRootElement(); } ! public void testXPathFun() throws DocumentException { doc=DocumentHelper.parseText("<test><test2><test one=\"1\">text</test></test2></test>"); System.out.println("testXPathFun"); --- 43,60 ---- import java.util.Iterator; ! public final class XPathTransformTest extends AbstractTransformTest { ! public XPathTransformTest(final String s) { super(s); } ! public final Transform createTransform() { return new XPathTransform("/test"); } ! public final Element getExpectedResult() throws DocumentException { return DocumentHelper.parseText("<test/>").getRootElement(); } ! public final void testXPathFun() throws DocumentException { doc=DocumentHelper.parseText("<test><test2><test one=\"1\">text</test></test2></test>"); System.out.println("testXPathFun"); *************** *** 64,79 **** } ! public void testNoDoc() throws DocumentException { ! Element elem=DocumentHelper.createElement("test"); assertNotNull(tr.transformNode(elem)); } ! private void listXPath(String expr) { System.out.println("Testing: "+expr); ! XPath xp=DocumentHelper.createXPath(expr); ! Iterator iter=xp.selectNodes(doc).iterator(); while (iter.hasNext()) { ! Node node = (Node) iter.next(); System.out.println("Matched: "+node.toString()); } --- 70,85 ---- } ! public final void testNoDoc() throws DocumentException { ! final Element elem=DocumentHelper.createElement("test"); assertNotNull(tr.transformNode(elem)); } ! private void listXPath(final String expr) { System.out.println("Testing: "+expr); ! final XPath xp=DocumentHelper.createXPath(expr); ! final Iterator iter=xp.selectNodes(doc).iterator(); while (iter.hasNext()) { ! final Node node = (Node) iter.next(); System.out.println("Matched: "+node.toString()); } |