You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2015/09/10 12:20:01 UTC
svn commit: r1702209 - in /santuario/xml-security-java/trunk/src/test/java:
javax/xml/crypto/test/dsig/ javax/xml/crypto/test/dsig/keyinfo/
org/apache/xml/security/test/dom/signature/
org/apache/xml/security/test/stax/
Author: coheigea
Date: Thu Sep 10 10:20:00 2015
New Revision: 1702209
URL: http://svn.apache.org/r1702209
Log:
Some test fixes for JDK9
Modified:
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509DataTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java Thu Sep 10 10:20:00 2015
@@ -62,6 +62,9 @@ public class ClassLoaderTest extends org
Method m2 = c2.getMethod("dsig", (Class[]) null);
m1.invoke(o1, (Object[]) null);
m2.invoke(o2, (Object[]) null);
+
+ uc1.close();
+ uc2.close();
}
@org.junit.Test
@@ -107,6 +110,8 @@ public class ClassLoaderTest extends org
if (log.isDebugEnabled()) {
log.debug("Elapsed: " + elapsed);
}
+
+ uc1.close();
}
@org.junit.Test
@@ -132,6 +137,9 @@ public class ClassLoaderTest extends org
Method m2 = c2.getMethod("dsig", (Class[]) null);
m1.invoke(o1, (Object[]) null);
m2.invoke(o2, (Object[]) null);
+
+ uc1.close();
+ uc2.close();
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java Thu Sep 10 10:20:00 2015
@@ -78,6 +78,9 @@ public class CreateInteropXFilter2Test e
validatingKey = signingCert.getPublicKey();
}
+ @SuppressWarnings({
+ "rawtypes", "unchecked"
+ })
@org.junit.Test
public void test_create_sign_spec() throws Exception {
List<Reference> refs = new ArrayList<Reference>(2);
@@ -114,7 +117,7 @@ public class CreateInteropXFilter2Test e
// create KeyInfo
List<XMLStructure> kits = new ArrayList<XMLStructure>(2);
kits.add(kifac.newKeyValue(validatingKey));
- List<Object> xds = new ArrayList<Object>(2);
+ List xds = new ArrayList(2);
xds.add("CN=Sean Mullan, DC=sun, DC=com");
xds.add(signingCert);
kits.add(kifac.newX509Data(xds));
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java Thu Sep 10 10:20:00 2015
@@ -43,11 +43,12 @@ public class ManifestTest extends org.ju
("DOM", new org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI());
}
+ @SuppressWarnings("rawtypes")
@org.junit.Test
public void testConstructor() throws Exception {
Manifest man = null;
String id = "manifest_id";
- List<Reference> refs = new Vector<Reference>();
+ List<Reference> refs = new ArrayList<Reference>();
// test XMLSignatureFactory.newManifest(List references)
// and XMLSignatureFactory.newManifest(List references,
// String id)
@@ -112,11 +113,10 @@ public class ManifestTest extends org.ju
}
// use raw List type to test for invalid Reference entries
- List invalidRefs = new Vector();
+ List invalidRefs = new ArrayList();
addEntryToRawList(invalidRefs, "references");
try {
- @SuppressWarnings("unchecked")
- Manifest man2 = fac.newManifest(invalidRefs);
+ fac.newManifest(invalidRefs);
fail("Should throw a CCE for references containing " +
"non-Reference objects");
} catch (ClassCastException cce) {
@@ -126,8 +126,7 @@ public class ManifestTest extends org.ju
}
try {
- @SuppressWarnings("unchecked")
- Manifest man2 = fac.newManifest(invalidRefs, id);
+ fac.newManifest(invalidRefs, id);
fail("Should throw a CCE for references containing " +
"non-Reference objects");
} catch (ClassCastException cce) {
@@ -139,7 +138,7 @@ public class ManifestTest extends org.ju
@org.junit.Test
public void testisFeatureSupported() throws Exception {
- List<Reference> refs = new Vector<Reference>();
+ List<Reference> refs = new ArrayList<Reference>();
refs.add(VALID_REF);
Manifest man = fac.newManifest(refs);
@@ -154,7 +153,7 @@ public class ManifestTest extends org.ju
@org.junit.Test
public void testgetReferences() throws Exception {
- List<Reference> refs = new Vector<Reference>();
+ List<Reference> refs = new ArrayList<Reference>();
refs.add(VALID_REF);
Manifest man = fac.newManifest(refs);
@SuppressWarnings("unchecked")
@@ -172,7 +171,9 @@ public class ManifestTest extends org.ju
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({
+ "unchecked", "rawtypes"
+ })
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java Thu Sep 10 10:20:00 2015
@@ -46,7 +46,6 @@ import javax.xml.crypto.dsig.spec.C14NMe
import javax.xml.crypto.test.KeySelectors;
import javax.xml.parsers.DocumentBuilder;
-import org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java Thu Sep 10 10:20:00 2015
@@ -64,6 +64,7 @@ public class ReferenceTest extends org.j
dmSHA1 = fac.newDigestMethod(DigestMethod.SHA1, null);
}
+ @SuppressWarnings("rawtypes")
@org.junit.Test
public void testConstructor() throws Exception {
Reference ref;
@@ -117,13 +118,13 @@ public class ReferenceTest extends org.j
assertEquals(uri, ref.getURI());
assertEquals(id, ref.getId());
assertEquals(type, ref.getType());
- assertEquals(ref.getTransforms(), Collections.EMPTY_LIST);
+ assertEquals(ref.getTransforms(), Collections.EMPTY_LIST);
} catch(Exception ex) {
fail("Unexpected Exception: " + ex);
}
- List<Transform> transforms = new Vector<Transform>();
+ List<Transform> transforms = new ArrayList<Transform>();
try {
// try empty transforms list
ref = fac.newReference(uri, dmSHA1, transforms,
@@ -133,12 +134,11 @@ public class ReferenceTest extends org.j
} catch(Exception ex) {
fail("Unexpected Exception: " + ex);
}
- List invalidTransforms = new Vector();
+ List invalidTransforms = new ArrayList();
addEntryToRawList(invalidTransforms, new Object());
try {
// try a transforms list with an invalid object
- @SuppressWarnings("unchecked")
- Reference ref2 = fac.newReference(uri, dmSHA1, invalidTransforms,
+ fac.newReference(uri, dmSHA1, invalidTransforms,
type, id);
} catch (ClassCastException cce) {
} catch (Exception ex) {
@@ -151,8 +151,7 @@ public class ReferenceTest extends org.j
addEntryToRawList(invalidTransforms, Transform.BASE64);
try {
// try a transforms list with a String object
- @SuppressWarnings("unchecked")
- Reference ref2 = fac.newReference(uri, dmSHA1, invalidTransforms,
+ fac.newReference(uri, dmSHA1, invalidTransforms,
type, id);
fail("Should throw a CCE for illegal transforms");
} catch (ClassCastException cce) {
@@ -286,7 +285,9 @@ public class ReferenceTest extends org.j
return Arrays.equals(md.digest(), ref.getDigestValue());
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({
+ "rawtypes", "unchecked"
+ })
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java Thu Sep 10 10:20:00 2015
@@ -43,6 +43,7 @@ public class SignaturePropertiesTest ext
"propTarget", "propId");
}
+ @SuppressWarnings("rawtypes")
@org.junit.Test
public void testConstructor() {
// test XMLSignatureFactory.newSignatureProperties(List, String)
@@ -56,7 +57,7 @@ public class SignaturePropertiesTest ext
fail("Should raise a NPE for null content instead of " + ex);
}
- List<SignatureProperty> list = new Vector<SignatureProperty>();
+ List<SignatureProperty> list = new ArrayList<SignatureProperty>();
try {
props = factory.newSignatureProperties(list, id);
fail("Should raise an IAE for empty content");
@@ -67,11 +68,10 @@ public class SignaturePropertiesTest ext
String strEntry = "wrong type";
// use raw List type to test for invalid SignatureProperty types
- List invalidList = new Vector();
+ List invalidList = new ArrayList();
addEntryToRawList(invalidList, strEntry);
try {
- @SuppressWarnings("unchecked")
- SignatureProperties props2 = factory.newSignatureProperties(invalidList, id);
+ factory.newSignatureProperties(invalidList, id);
fail("Should raise a CCE for content containing " +
"invalid, i.e. non-SignatureProperty, entries");
} catch (ClassCastException cce) {
@@ -98,7 +98,7 @@ public class SignaturePropertiesTest ext
@org.junit.Test
public void testisFeatureSupported() {
- List<SignatureProperty> list = new Vector<SignatureProperty>();
+ List<SignatureProperty> list = new ArrayList<SignatureProperty>();
list.add(prop);
SignatureProperties props = factory.newSignatureProperties(list, id);
try {
@@ -109,7 +109,9 @@ public class SignaturePropertiesTest ext
assertTrue(!props.isFeatureSupported("not supported"));
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({
+ "unchecked", "rawtypes"
+ })
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java Thu Sep 10 10:20:00 2015
@@ -41,6 +41,7 @@ public class SignaturePropertyTest exten
("DOM", new org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI());
}
+ @SuppressWarnings("rawtypes")
@org.junit.Test
public void testConstructor() {
// test XMLSignatureFactory.newSignatureProperty(List, String, String)
@@ -53,7 +54,7 @@ public class SignaturePropertyTest exten
} catch (Exception ex) {
fail("Should raise a NPE for null content instead of " + ex);
}
- List<XMLStructure> list = new Vector<XMLStructure>();
+ List<XMLStructure> list = new ArrayList<XMLStructure>();
try {
prop = factory.newSignatureProperty(list, target, id);
fail("Should raise an IAE for empty content");
@@ -63,11 +64,10 @@ public class SignaturePropertyTest exten
}
String strEntry = "wrong type";
// use raw List type to test for invalid XMLStructure entries
- List invalidList = new Vector();
+ List invalidList = new ArrayList();
addEntryToRawList(invalidList, strEntry);
try {
- @SuppressWarnings("unchecked")
- SignatureProperty prop2 = factory.newSignatureProperty(invalidList, target, id);
+ factory.newSignatureProperty(invalidList, target, id);
fail("Should raise a CCE for content containing " +
"invalid, i.e. non-XMLStructure, entries");
} catch (ClassCastException cce) {
@@ -101,7 +101,7 @@ public class SignaturePropertyTest exten
@org.junit.Test
public void testisFeatureSupported() {
- List<XMLStructure> list = new Vector<XMLStructure>();
+ List<XMLStructure> list = new ArrayList<XMLStructure>();
list.add(new TestUtils.MyOwnXMLStructure());
SignatureProperty prop = factory.newSignatureProperty
(list, target, id);
@@ -113,7 +113,9 @@ public class SignaturePropertyTest exten
assertTrue(!prop.isFeatureSupported("not supported"));
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({
+ "unchecked", "rawtypes"
+ })
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java Thu Sep 10 10:20:00 2015
@@ -49,12 +49,13 @@ public class SignedInfoTest extends org.
(CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS,
(C14NMethodParameterSpec) null);
sm = fac.newSignatureMethod(SignatureMethod.DSA_SHA1, null);
- references = new Vector<Reference>();
+ references = new ArrayList<Reference>();
references.add(fac.newReference
("http://www.sun.com/index.html",
fac.newDigestMethod(DigestMethod.SHA1, null)));
}
+ @SuppressWarnings("rawtypes")
@org.junit.Test
public void testConstructor() {
// test XMLSignatureFactory.newSignedInfo(
@@ -83,7 +84,7 @@ public class SignedInfoTest extends org.
}
}
- List<Reference> empty = new Vector<Reference>();
+ List<Reference> empty = new ArrayList<Reference>();
try {
si = fac.newSignedInfo(cm, sm, empty);
fail("Should throw an IAE for empty references");
@@ -94,11 +95,10 @@ public class SignedInfoTest extends org.
}
// use raw List type to test for invalid Reference entries
- List invalidRefs = new Vector();
+ List invalidRefs = new ArrayList();
addEntryToRawList(invalidRefs, "String");
try {
- @SuppressWarnings("unchecked")
- SignedInfo si2 = fac.newSignedInfo(cm, sm, invalidRefs);
+ fac.newSignedInfo(cm, sm, invalidRefs);
fail("Should throw an CCE for illegal references");
} catch(ClassCastException cce) {
} catch(Exception ex) {
@@ -131,7 +131,9 @@ public class SignedInfoTest extends org.
assertEquals(si.getId(), "id");
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({
+ "unchecked", "rawtypes"
+ })
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java Thu Sep 10 10:20:00 2015
@@ -307,7 +307,7 @@ public class TestUtils {
public Data getDereferencedData() {
return derefData;
- }
+ }
public InputStream getDigestInputStream() {
return dis;
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java Thu Sep 10 10:20:00 2015
@@ -43,6 +43,7 @@ public class XMLObjectTest extends org.j
("DOM", new org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI());
}
+ @SuppressWarnings("rawtypes")
@org.junit.Test
public void testConstructor() {
// test XMLSignatureFactory.newXMLObject(List, String, String, String)
@@ -51,17 +52,16 @@ public class XMLObjectTest extends org.j
obj = factory.newXMLObject(null, null, null, null);
assertNotNull(obj);
- List<XMLStructure> list = new Vector<XMLStructure>();
+ List<XMLStructure> list = new ArrayList<XMLStructure>();
obj = factory.newXMLObject(list, null, null, null);
assertNotNull(obj);
String strEntry = "wrong type";
// use raw List type to test for invalid XMLStructure entries
- List invalidList = new Vector();
+ List invalidList = new ArrayList();
addEntryToRawList(invalidList, strEntry);
try {
- @SuppressWarnings("unchecked")
- XMLObject obj2 = factory.newXMLObject(invalidList, null, null, null);
+ factory.newXMLObject(invalidList, null, null, null);
fail("Should raise a CCE for content containing " +
"invalid, i.e. non-XMLStructure, entries");
} catch (ClassCastException cce) {
@@ -89,7 +89,7 @@ public class XMLObjectTest extends org.j
@org.junit.Test
public void testisFeatureSupported() {
- List<XMLStructure> list = new Vector<XMLStructure>();
+ List<XMLStructure> list = new ArrayList<XMLStructure>();
list.add(new TestUtils.MyOwnXMLStructure());
XMLObject obj = factory.newXMLObject(list, id, mimeType, encoding);
try {
@@ -100,7 +100,9 @@ public class XMLObjectTest extends org.j
assertTrue(!obj.isFeatureSupported("not supported"));
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({
+ "unchecked", "rawtypes"
+ })
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java Thu Sep 10 10:20:00 2015
@@ -92,6 +92,7 @@ public class XMLSignatureTest extends or
ud = new LocalHttpCacheURIDereferencer();
}
+ @SuppressWarnings("rawtypes")
@org.junit.Test
public void testConstructor() throws Exception {
XMLSignature sig = null;
@@ -118,11 +119,9 @@ public class XMLSignatureTest extends or
}
try {
// use raw List type to test for invalid entries
- List invalidObjects = new Vector();
+ List invalidObjects = new ArrayList();
addEntryToRawList(invalidObjects, "wrongType");
- @SuppressWarnings("unchecked")
- XMLSignature sig2 = fac.newXMLSignature(defSi, defKi,
- invalidObjects, id, sigValueId);
+ fac.newXMLSignature(defSi, defKi, invalidObjects, id, sigValueId);
fail("Should throw a CCE for invalid objects");
} catch (ClassCastException cce) {
} catch (Exception ex) {
@@ -410,7 +409,9 @@ public class XMLSignatureTest extends or
return fac.newSignedInfo(cm, sm, refs);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({
+ "unchecked", "rawtypes"
+ })
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
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=1702209&r1=1702208&r2=1702209&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 Thu Sep 10 10:20:00 2015
@@ -21,10 +21,9 @@
*/
package javax.xml.crypto.test.dsig.keyinfo;
+import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import java.util.Vector;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.keyinfo.*;
@@ -51,6 +50,7 @@ public class PGPDataTest extends org.jun
("DOM", new org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI());
}
+ @SuppressWarnings("rawtypes")
@org.junit.Test
public void testgetExternalElements() {
PGPData[] pds = {
@@ -58,7 +58,7 @@ public class PGPDataTest extends org.jun
fac.newPGPData(values[0], values[1], null),
fac.newPGPData(values[1], null)
};
- for (int i=0; i<pds.length; i++) {
+ for (int i = 0; i<pds.length; i++) {
@SuppressWarnings("unchecked")
List<XMLStructure> li = pds[i].getExternalElements();
assertNotNull(li);
@@ -73,10 +73,9 @@ public class PGPDataTest extends org.jun
}
try {
// use raw List type to test for invalid entries
- List invalidData = new Vector();
+ List invalidData = new ArrayList();
addEntryToRawList(invalidData, new Object());
- @SuppressWarnings("unchecked")
- PGPData pd = fac.newPGPData(values[0], invalidData);
+ fac.newPGPData(values[0], invalidData);
fail("Added PGP element of wrong type");
} catch (ClassCastException ex) {
// expected
@@ -140,7 +139,9 @@ public class PGPDataTest extends org.jun
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({
+ "unchecked", "rawtypes"
+ })
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
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=1702209&r1=1702208&r2=1702209&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 Thu Sep 10 10:20:00 2015
@@ -43,10 +43,9 @@ public class X509DataTest extends org.ju
}
@org.junit.Test
- @SuppressWarnings("unchecked")
public void testgetTypes() {
X509Data x509 = fac.newX509Data(Collections.singletonList("cn=foo"));
- List<Object> li = x509.getContent();
+ List<?> li = x509.getContent();
assertNotNull(li);
if (!li.isEmpty()) {
Object[] content = li.toArray();
@@ -59,18 +58,6 @@ public class X509DataTest extends org.ju
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
- }
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/InvalidKeyTest.java Thu Sep 10 10:20:00 2015
@@ -29,7 +29,6 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* Test case contributed by Matthias Germann for testing that bug 43239 is
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java?rev=1702209&r1=1702208&r2=1702209&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java Thu Sep 10 10:20:00 2015
@@ -21,7 +21,6 @@ package org.apache.xml.security.test.sta
import org.apache.xml.security.stax.ext.stax.*;
import org.apache.xml.security.stax.impl.XMLSecurityEventReader;
import org.apache.xml.security.stax.impl.stax.*;
-import org.codehaus.stax2.ri.evt.CharactersEventImpl;
import org.junit.Assert;
import org.junit.Test;
@@ -30,9 +29,7 @@ import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.events.XMLEvent;
-import java.io.PrintWriter;
import java.io.StringWriter;
-import java.io.Writer;
import java.util.ArrayDeque;
import java.util.Deque;