stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8009217: REGRESSION: test com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java fails to compile since 7u21b03

Browse Source 
Reviewed-by: xuelei
This commit is contained in:
Sean Mullan 2013-04-29 11:47:17 -04:00
parent ae06d053cb
commit 86ae90ad59
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,7 +24,7 @@
/** /**
* @test * @test
* @author Sean Mullan * @author Sean Mullan
* @bug 6461674 * @bug 6461674 8009217
* @compile -XDignore.symbol.file ClassLoaderTest.java MyTransform.java * @compile -XDignore.symbol.file ClassLoaderTest.java MyTransform.java
* @run main ClassLoaderTest * @run main ClassLoaderTest
* @summary Ensure Transform.register works with transform implementations * @summary Ensure Transform.register works with transform implementations
@ -43,13 +43,12 @@ public class ClassLoaderTest {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
Transform.init();
File file = new File(BASE); File file = new File(BASE);
URL[] urls = new URL[1]; URL[] urls = new URL[1];
urls[0] = file.toURI().toURL(); urls[0] = file.toURI().toURL();
URLClassLoader ucl = new URLClassLoader(urls); URLClassLoader ucl = new URLClassLoader(urls);
Class c = ucl.loadClass("MyTransform"); Class<?> c = ucl.loadClass("MyTransform");
Constructor cons = c.getConstructor(); Constructor<?> cons = c.getConstructor(new Class[] {});
Object o = cons.newInstance(); Object o = cons.newInstance();
// Apache code swallows the ClassNotFoundExc, so we need to // Apache code swallows the ClassNotFoundExc, so we need to
// check if the Transform has already been registered by registering // check if the Transform has already been registered by registering

23
jdk/test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -21,13 +21,8 @@
* questions. * questions.
*/ */
import java.io.IOException; import com.sun.org.apache.xml.internal.security.transforms.Transform;
import javax.xml.parsers.ParserConfigurationException; import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import org.xml.sax.SAXException;
import com.sun.org.apache.xml.internal.security.c14n.*;
import com.sun.org.apache.xml.internal.security.exceptions.*;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
import com.sun.org.apache.xml.internal.security.transforms.*;
public class MyTransform extends TransformSpi { public class MyTransform extends TransformSpi {
@ -37,21 +32,13 @@ public class MyTransform extends TransformSpi {
public MyTransform() { public MyTransform() {
try { try {
System.out.println("Registering Transform"); System.out.println("Registering Transform");
Transform.init();
Transform.register(URI, "MyTransform"); Transform.register(URI, "MyTransform");
} catch (AlgorithmAlreadyRegisteredException e) { } catch (Exception e) {
// should not occur, so ignore e.printStackTrace();
} }
} }
protected String engineGetURI() { protected String engineGetURI() {
return URI; return URI;
} }
protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
throws IOException, CanonicalizationException,
InvalidCanonicalizerException, TransformationException,
ParserConfigurationException, SAXException {
throw new TransformationException("Unsupported Operation");
}
} }