diff options
Diffstat (limited to 'moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api')
5 files changed, 56 insertions, 52 deletions
diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java index 767327d..8572179 100644 --- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java +++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/AllTests.java @@ -37,10 +37,10 @@ public class AllTests { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTestSuite(CreateXMLSignatureRequestParserTest.class); - suite.addTestSuite(TransformParserTest.class); - suite.addTestSuite(VerifyCMSSignatureRequestParserTest.class); - suite.addTestSuite(VerifyXMLSignatureRequestParserTest.class); +// suite.addTestSuite(CreateXMLSignatureRequestParserTest.class); +// suite.addTestSuite(TransformParserTest.class); +// suite.addTestSuite(VerifyCMSSignatureRequestParserTest.class); +// suite.addTestSuite(VerifyXMLSignatureRequestParserTest.class); return suite; } diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java index dc67231..2b285dc 100644 --- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java +++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java @@ -24,6 +24,7 @@ package test.at.gv.egovernment.moa.spss.api.xmlbind; +import org.junit.Assert; import org.w3c.dom.Element; import test.at.gv.egovernment.moa.spss.SPSSTestCase; @@ -65,31 +66,31 @@ public class CreateXMLSignatureRequestParserTest extends SPSSTestCase { CreateTransformsInfoProfileExplicit transProfile; CreateSignatureEnvironmentProfileExplicit envProfile; - assertNotNull(request); - assertEquals("PKCS12RSAKey1", request.getKeyIdentifier()); - assertEquals(1, request.getSingleSignatureInfos().size()); + Assert.assertNotNull(request); + Assert.assertEquals("PKCS12RSAKey1", request.getKeyIdentifier()); + Assert.assertEquals(1, request.getSingleSignatureInfos().size()); sigInfo = (SingleSignatureInfo) request.getSingleSignatureInfos().get(0); - assertEquals(1, sigInfo.getDataObjectInfos().size()); - assertFalse(sigInfo.isSecurityLayerConform()); + Assert.assertEquals(1, sigInfo.getDataObjectInfos().size()); + Assert.assertFalse(sigInfo.isSecurityLayerConform()); dataObjInfo = (DataObjectInfo) sigInfo.getDataObjectInfos().get(0); - assertNotNull(dataObjInfo.getDataObject()); + Assert.assertNotNull(dataObjInfo.getDataObject()); transProfile = (CreateTransformsInfoProfileExplicit) dataObjInfo .getCreateTransformsInfoProfile(); - assertNotNull( + Assert.assertNotNull( transProfile.getCreateTransformsInfo().getFinalDataMetaInfo()); envProfile = (CreateSignatureEnvironmentProfileExplicit) sigInfo .getCreateSignatureInfo() .getCreateSignatureEnvironmentProfile(); - assertEquals( + Assert.assertEquals( "//data:Document", envProfile.getCreateSignatureLocation().getXPathExpression()); - assertEquals(0, envProfile.getCreateSignatureLocation().getIndex()); + Assert.assertEquals(0, envProfile.getCreateSignatureLocation().getIndex()); } } diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java index be6a24d..2804434 100644 --- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java +++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java @@ -26,6 +26,7 @@ package test.at.gv.egovernment.moa.spss.api.xmlbind; import java.util.List; +import org.junit.Assert; import org.w3c.dom.Element; import test.at.gv.egovernment.moa.spss.SPSSTestCase; @@ -62,8 +63,8 @@ public class TransformParserTest extends SPSSTestCase { parseXml(TESTDATA_BASE + "transforms.xml").getDocumentElement(); List transforms = transformParser.parseTransforms(transformsElem); - assertNotNull(transforms); - assertEquals(3, transforms.size()); + Assert.assertNotNull(transforms); + Assert.assertEquals(3, transforms.size()); } @@ -73,8 +74,8 @@ public class TransformParserTest extends SPSSTestCase { CanonicalizationTransform transform = (CanonicalizationTransform) transformParser.parseTransform(transformElem); - assertNotNull(transform); - assertEquals( + Assert.assertNotNull(transform); + Assert.assertEquals( CanonicalizationTransform.CANONICAL_XML, transform.getAlgorithmURI()); } @@ -87,11 +88,11 @@ public class TransformParserTest extends SPSSTestCase { (ExclusiveCanonicalizationTransform) transformParser.parseTransform( transformElem); - assertNotNull(transform); - assertEquals( + Assert.assertNotNull(transform); + Assert.assertEquals( ExclusiveCanonicalizationTransform.EXCLUSIVE_CANONICAL_XML, transform.getAlgorithmURI()); - assertEquals(3, transform.getInclusiveNamespacePrefixes().size()); + Assert.assertEquals(3, transform.getInclusiveNamespacePrefixes().size()); } public void testParseEnvelopedTransform() throws Exception { @@ -101,7 +102,7 @@ public class TransformParserTest extends SPSSTestCase { (EnvelopedSignatureTransform) transformParser.parseTransform( transformElem); - assertNotNull(transform); + Assert.assertNotNull(transform); } public void testParseXPathTransform() throws Exception { @@ -110,9 +111,9 @@ public class TransformParserTest extends SPSSTestCase { XPathTransform transform = (XPathTransform) transformParser.parseTransform(transformElem); - assertNotNull(transform); - assertEquals("//ToBeSigned/Data", transform.getXPathExpression()); - assertEquals(1, transform.getNamespaceDeclarations().size()); + Assert.assertNotNull(transform); + Assert.assertEquals("//ToBeSigned/Data", transform.getXPathExpression()); + Assert.assertEquals(1, transform.getNamespaceDeclarations().size()); } public void testParseXPathFilter2Transform() throws Exception { @@ -121,8 +122,8 @@ public class TransformParserTest extends SPSSTestCase { XPathFilter2Transform transform = (XPathFilter2Transform) transformParser.parseTransform(transformElem); - assertNotNull(transform); - assertEquals(3, transform.getFilters().size()); + Assert.assertNotNull(transform); + Assert.assertEquals(3, transform.getFilters().size()); } public void testParseXSLTTransform() throws Exception { @@ -131,7 +132,7 @@ public class TransformParserTest extends SPSSTestCase { XSLTTransform transform = (XSLTTransform) transformParser.parseTransform(transformElem); - assertNotNull(transform); + Assert.assertNotNull(transform); } } diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java index 3b1022e..2ffb676 100644 --- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java +++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java @@ -24,6 +24,7 @@ package test.at.gv.egovernment.moa.spss.api.xmlbind; +import org.junit.Assert; import org.w3c.dom.Element; import test.at.gv.egovernment.moa.spss.SPSSTestCase; @@ -62,22 +63,22 @@ public class VerifyCMSSignatureRequestParserTest extends SPSSTestCase { MetaInfo metaInfo; CMSContentExcplicit content; - assertNotNull(request); - assertEquals(1, request.getSignatories()[0]); - assertEquals( + Assert.assertNotNull(request); + Assert.assertEquals(1, request.getSignatories()[0]); + Assert.assertEquals( DateTimeUtils.parseDateTime("2003-04-04T09:30:47-05:00"), request.getDateTime()); - assertNotNull(request.getCMSSignature()); - assertNotNull(request.getDataObject()); - assertEquals("TrustProfile1", request.getTrustProfileId()); + Assert.assertNotNull(request.getCMSSignature()); + Assert.assertNotNull(request.getDataObject()); + Assert.assertEquals("TrustProfile1", request.getTrustProfileId()); metaInfo = request.getDataObject().getMetaInfo(); - assertNotNull(metaInfo); - assertEquals("text/plain", metaInfo.getMimeType()); - assertEquals("http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt", metaInfo.getDescription()); + Assert.assertNotNull(metaInfo); + Assert.assertEquals("text/plain", metaInfo.getMimeType()); + Assert.assertEquals("http://10.16.46.109/TestDatenGenerator/resources/testDaten.txt", metaInfo.getDescription()); content = (CMSContentExcplicit) request.getDataObject().getContent(); - assertNotNull(content.getBinaryContent()); + Assert.assertNotNull(content.getBinaryContent()); } diff --git a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java index ceb50fb..47c276b 100644 --- a/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java +++ b/moaSig/moa-sig-lib/src/test/java/test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java @@ -24,6 +24,7 @@ package test.at.gv.egovernment.moa.spss.api.xmlbind; +import org.junit.Assert; import org.w3c.dom.Element; import test.at.gv.egovernment.moa.spss.SPSSTestCase; @@ -67,36 +68,36 @@ public class VerifyXMLSignatureRequestParserTest extends SPSSTestCase { ReferenceInfo refInfo; VerifyTransformsInfoProfileExplicit transformsProfile; - assertNotNull(request); - assertEquals( + Assert.assertNotNull(request); + Assert.assertEquals( DateTimeUtils.parseDateTime("2003-04-01T12:53:57+01:00"), request.getDateTime()); - assertFalse(request.getReturnHashInputData()); - assertEquals("TrustProfile1", request.getTrustProfileId()); + Assert.assertFalse(request.getReturnHashInputData()); + Assert.assertEquals("TrustProfile1", request.getTrustProfileId()); verifySignatureInfo = request.getSignatureInfo(); - assertNotNull(verifySignatureInfo); - assertNotNull(verifySignatureInfo.getVerifySignatureEnvironment()); + Assert.assertNotNull(verifySignatureInfo); + Assert.assertNotNull(verifySignatureInfo.getVerifySignatureEnvironment()); verifyLocation = verifySignatureInfo.getVerifySignatureLocation(); - assertNotNull(verifyLocation); - assertEquals("//dsig:Signature", verifyLocation.getXPathExpression()); - assertEquals(3, verifyLocation.getNamespaceDeclarations().size()); + Assert.assertNotNull(verifyLocation); + Assert.assertEquals("//dsig:Signature", verifyLocation.getXPathExpression()); + Assert.assertEquals(3, verifyLocation.getNamespaceDeclarations().size()); checkParams = request.getSignatureManifestCheckParams(); - assertNotNull(checkParams); - assertEquals(true, checkParams.getReturnReferenceInputData()); - assertEquals(1, checkParams.getReferenceInfos().size()); + Assert.assertNotNull(checkParams); + Assert.assertEquals(true, checkParams.getReturnReferenceInputData()); + Assert.assertEquals(1, checkParams.getReferenceInfos().size()); refInfo = (ReferenceInfo) checkParams.getReferenceInfos().get(0); - assertEquals(1, refInfo.getVerifyTransformsInfoProfiles().size()); + Assert.assertEquals(1, refInfo.getVerifyTransformsInfoProfiles().size()); transformsProfile = (VerifyTransformsInfoProfileExplicit) refInfo .getVerifyTransformsInfoProfiles() .get(0); - assertEquals(1, transformsProfile.getTransforms().size()); - assertEquals(1, transformsProfile.getTransformParameters().size()); + Assert.assertEquals(1, transformsProfile.getTransforms().size()); + Assert.assertEquals(1, transformsProfile.getTransformParameters().size()); } |