jdk-sandbox: comparison jdk/test/javax/xml/crypto/dsig/GenerationTests.java

equal deleted inserted replaced

-:8c9bd4be4a86
+:3a271dc8b758
 * questions.
 */
 /**
 * @test
-* @bug 4635230 6283345 6303830 6824440 6867348 7094155 8038184 8038349
+* @bug 4635230 6283345 6303830 6824440 6867348 7094155 8038184 8038349 8046949
 * @summary Basic unit tests for generating XML Signatures with JSR 105
 * @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java
 *     X509KeySelector.java GenerationTests.java
 * @run main/othervm GenerationTests
 * @author Sean Mullan
 System.out.println();
 }
 static void test_create_signature_x509_crt_crl() throws Exception {
 System.out.println("* Generating signature-x509-crt-crl.xml");
-List<Object> xds = new ArrayList<Object>();
+List<Object> xds = new ArrayList<>();
 CertificateFactory cf = CertificateFactory.getInstance("X.509");
 xds.add(signingCert);
 FileInputStream fis = new FileInputStream(CRL);
 X509CRL crl = (X509CRL) cf.generateCRL(fis);
 fis.close();
 // create SignedInfo
 SignedInfo si = fac.newSignedInfo(withoutComments, rsaSha1, refs);
 // create objects
-List<XMLStructure> objs = new ArrayList<XMLStructure>();
+List<XMLObject> objs = new ArrayList<>();
 // Object 1
 List<Reference> manRefs = Collections.singletonList
 (fac.newReference("#object-2", sha1));
 objs.add(fac.newXMLObject(Collections.singletonList
 static void test_create_signature() throws Exception {
 System.out.println("* Generating signature.xml");
 // create references
-List<Reference> refs = new ArrayList<Reference>();
+List<Reference> refs = new ArrayList<>();
 // Reference 1
 refs.add(fac.newReference(STYLESHEET, sha1));
 // Reference 2
 // Reference 7
 refs.add(fac.newReference("#signature-properties-1", sha1, null,
 SignatureProperties.TYPE, null));
 // Reference 8
-List<Transform> transforms = new ArrayList<Transform>();
+List<Transform> transforms = new ArrayList<>();
 transforms.add(fac.newTransform
 (Transform.ENVELOPED, (TransformParameterSpec) null));
 refs.add(fac.newReference("", sha1, transforms, null, null));
 // Reference 9
 KeyInfo ki = kifac.newKeyInfo(Collections.singletonList(rm), null);
 Document doc = db.newDocument();
 // create objects
-List<XMLStructure> objs = new ArrayList<XMLStructure>();
+List<XMLObject> objs = new ArrayList<>();
 // Object 1
 objs.add(fac.newXMLObject(Collections.singletonList
 (new DOMStructure(doc.createTextNode("I am the text."))),
 "object-1", "text/plain", null));
 nc.appendChild(doc.createComment(" Commentandum "));
 objs.add(fac.newXMLObject(Collections.singletonList
 (new DOMStructure(nc)), "object-3", null, null));
 // Manifest
-List<Reference> manRefs = new ArrayList<Reference>();
+List<Reference> manRefs = new ArrayList<>();
 // Manifest Reference 1
 manRefs.add(fac.newReference(STYLESHEET,
 sha1, null, null, "manifest-reference-1"));
 // Manifest Reference 2
 manRefs.add(fac.newReference("#reference-1", sha1));
 // Manifest Reference 3
-List<Transform> manTrans = new ArrayList<Transform>();
+List<Transform> manTrans = new ArrayList<>();
 String xslt = ""
 + "<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform'\n"
 + "            xmlns='http://www.w3.org/TR/xhtml1/strict' \n"
 + "            exclude-result-prefixes='foo' \n"
 + "            version='1.0'>\n"
 (Collections.singletonList(sp), "signature-properties-1");
 objs.add(fac.newXMLObject(Collections.singletonList(sps), null,
 null, null));
 // Object 4
-List<Object> xds = new ArrayList<Object>();
+List<Object> xds = new ArrayList<>();
 xds.add("CN=User");
 xds.add(kifac.newX509IssuerSerial
 ("CN=User", new BigInteger("45ef2729", 16)));
 xds.add(signingCert);
 objs.add(fac.newXMLObject(Collections.singletonList
 }
 }
 static void test_create_exc_signature() throws Exception {
 System.out.println("* Generating exc_signature.xml");
-List<Reference> refs = new ArrayList<Reference>(4);
+List<Reference> refs = new ArrayList<>(4);
 // create reference 1
 refs.add(fac.newReference
 ("#xpointer(id('to-be-signed'))",
 fac.newDigestMethod(DigestMethod.SHA1, null),
 (fac.newTransform(CanonicalizationMethod.EXCLUSIVE,
 (TransformParameterSpec) null)),
 null, null));
 // create reference 2
-List<String> prefixList = new ArrayList<String>(2);
+List<String> prefixList = new ArrayList<>(2);
 prefixList.add("bar");
 prefixList.add("#default");
 ExcC14NParameterSpec params = new ExcC14NParameterSpec(prefixList);
 refs.add(fac.newReference
 ("#xpointer(id('to-be-signed'))",
 (CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS,
 (TransformParameterSpec) null)),
 null, null));
 // create reference 4
-prefixList = new ArrayList<String>(2);
+prefixList = new ArrayList<>(2);
 prefixList.add("bar");
 prefixList.add("#default");
 params = new ExcC14NParameterSpec(prefixList);
 refs.add(fac.newReference
 ("#xpointer(id('to-be-signed'))",
 (CanonicalizationMethod.EXCLUSIVE,
 (C14NMethodParameterSpec) null),
 fac.newSignatureMethod(SignatureMethod.DSA_SHA1, null), refs);
 // create KeyInfo
-List<XMLStructure> kits = new ArrayList<XMLStructure>(2);
+List<XMLStructure> kits = new ArrayList<>(2);
 kits.add(kifac.newKeyValue(validatingKey));
 KeyInfo ki = kifac.newKeyInfo(kits);
 // create Objects
 Document doc = db.newDocument();
 System.out.println();
 }
 static void test_create_sign_spec() throws Exception {
 System.out.println("* Generating sign-spec.xml");
-List<Reference> refs = new ArrayList<Reference>(2);
+List<Reference> refs = new ArrayList<>(2);
 // create reference 1
-List<XPathType> types = new ArrayList<XPathType>(3);
+List<XPathType> types = new ArrayList<>(3);
 types.add(new XPathType(" //ToBeSigned ", XPathType.Filter.INTERSECT));
 types.add(new XPathType(" //NotToBeSigned ",
 XPathType.Filter.SUBTRACT));
 types.add(new XPathType(" //ReallyToBeSigned ",
 XPathType.Filter.UNION));
 ("", fac.newDigestMethod(DigestMethod.SHA1, null),
 Collections.singletonList(fac.newTransform(Transform.XPATH2, xp1)),
 null, null));
 // create reference 2
-List<Transform> trans2 = new ArrayList<Transform>(2);
+List<Transform> trans2 = new ArrayList<>(2);
 trans2.add(fac.newTransform(Transform.ENVELOPED,
 (TransformParameterSpec) null));
 XPathFilter2ParameterSpec xp2 = new XPathFilter2ParameterSpec
 (Collections.singletonList
 (new XPathType(" / ", XPathType.Filter.UNION)));
 (CanonicalizationMethod.INCLUSIVE,
 (C14NMethodParameterSpec) null),
 fac.newSignatureMethod(SignatureMethod.DSA_SHA1, null), refs);
 // create KeyInfo
-List<XMLStructure> kits = new ArrayList<XMLStructure>(2);
+List<XMLStructure> kits = new ArrayList<>(2);
 kits.add(kifac.newKeyValue(validatingKey));
-List<Object> xds = new ArrayList<Object>(2);
+List<Object> xds = new ArrayList<>(2);
 xds.add("CN=User");
 xds.add(signingCert);
 kits.add(kifac.newX509Data(xds));
 KeyInfo ki = kifac.newKeyInfo(kits);

changeset 27747	3a271dc8b758
parent 24251	da7dc40edb67
child 28308	5fdc6e6c0b97