This commit is contained in:
Lana Steuck 2016-08-11 17:02:17 +00:00
commit 1a6df6e653
4 changed files with 15 additions and 20 deletions
jaxp
src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex
test
TEST.ROOT
javax/xml/jaxp
libs/jaxp/library
unittest/validation

@ -37,5 +37,3 @@ parser.quantifier.2=Invalid quantifier. Invalid quantity or a '}' is missing.
parser.quantifier.3=Invalid quantifier. A digit or '}' is expected.
parser.quantifier.4=Invalid quantifier. A min quantity must be <= a max quantity.
parser.quantifier.5=Invalid quantifier. A quantity value overflow.
null
null

@ -23,4 +23,7 @@ modules=java.xml
groups=TEST.groups
# Minimum jtreg version
requiredVersion=4.2 b02
requiredVersion=4.2 b03
# Use new module options
useNewOptions=true

@ -37,7 +37,7 @@ public class BasePolicy implements ITestListener {
try {
JAXPPolicyManager.teardownPolicyManager();
} catch (Exception e) {
throw new RuntimeException("Failed to teardonw the policy manager", e);
throw new RuntimeException("Failed to teardown the policy manager", e);
}
}

@ -32,11 +32,10 @@ import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
@ -69,6 +68,7 @@ public class Bug6773084Test {
private static final ExecutorService EXEC = Executors.newCachedThreadPool();
private static final CyclicBarrier BARRIER = new CyclicBarrier(NTHREADS);
private static final int TIMEOUT = 110;
public static final String IN_FOLDER = Bug6773084Test.class.getResource("Bug6773084In").getPath();
public static final String XSD_PATH = Bug6773084Test.class.getResource("Bug6773084.xsd").getPath();
@ -93,20 +93,23 @@ public class Bug6773084Test {
}
});
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
for (int i = 0; i < files.length; i++) {
EXEC.execute(new XMLValiddator(files[i], i));
EXEC.execute(new XMLValiddator(dbf.newDocumentBuilder().parse(files[i]), i));
}
runWithAllPerm(() -> EXEC.shutdown());
EXEC.awaitTermination(TIMEOUT, TimeUnit.SECONDS);
}
private static class XMLValiddator implements Runnable {
private File file;
private Document document;
private int index;
public XMLValiddator(File file, int index) {
this.file = file;
public XMLValiddator(Document document, int index) {
this.document = document;
this.index = index;
}
@ -117,23 +120,14 @@ public class Bug6773084Test {
BARRIER.await();
System.out.println("Validating....");
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
DocumentBuilder builder = factory.newDocumentBuilder();
Document document = builder.parse(file);
Validator validator = schema.newValidator();
validator.setErrorHandler(new ErrorHandlerImpl());
validator.validate(new DOMSource(document));
} catch (IOException e) {
e.printStackTrace();
} catch (SAXException e) {
e.printStackTrace();
Assert.fail("Test failed.");
} catch (ParserConfigurationException e) {
e.printStackTrace();
} catch (BrokenBarrierException e) {
e.printStackTrace();
} catch (InterruptedException e) {