From d0c3112a73a1dd2a488ad9ad2efbda0c2bd4a8c7 Mon Sep 17 00:00:00 2001 From: Li Jiang Date: Thu, 4 Aug 2016 13:58:06 +0800 Subject: [PATCH 1/3] 8163145: Remove two null line in the end of message.properties Reviewed-by: joehw, rriggs --- .../apache/xerces/internal/impl/xpath/regex/message.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties index 01f475b6ed8..48e15b05488 100644 --- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties +++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties @@ -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 From f29e118ce07644a084a5683b20636243d39895a5 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Wed, 10 Aug 2016 15:49:23 -0700 Subject: [PATCH 2/3] 8136930: Simplify use of module-system options by custom launchers Reviewed-by: alanb, ksrini, henryjen, sundar --- jaxp/test/TEST.ROOT | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jaxp/test/TEST.ROOT b/jaxp/test/TEST.ROOT index 190bdf5ccae..11ad18dbae6 100644 --- a/jaxp/test/TEST.ROOT +++ b/jaxp/test/TEST.ROOT @@ -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 From b762d2005c11d8302ccce752933d01e4cff05063 Mon Sep 17 00:00:00 2001 From: Frank Yuan Date: Thu, 11 Aug 2016 10:20:44 +0800 Subject: [PATCH 3/3] 8163468: javax/xml/jaxp/unittest/validation/Bug6773084Test.java fails intermittently Reviewed-by: joehw, dfuchs, amlu --- .../jaxp/libs/jaxp/library/BasePolicy.java | 2 +- .../unittest/validation/Bug6773084Test.java | 26 +++++++------------ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java index 5289148ad74..8305f54af74 100644 --- a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java +++ b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java @@ -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); } } diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java index 4ac7b5b977b..b50fa08e529 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java @@ -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) {