test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 41,61 ****
  import javax.xml.validation.Schema;
  import javax.xml.validation.SchemaFactory;
  import javax.xml.validation.Validator;
  
  import org.testng.Assert;
! import org.testng.annotations.BeforeClass;
  import org.testng.annotations.Test;
  import org.w3c.dom.Document;
  import org.xml.sax.ErrorHandler;
  import org.xml.sax.SAXException;
  import org.xml.sax.SAXParseException;
  
  /*
   * @bug 6773084
   * @summary Test Schema object is thread safe.
   */
  public class Bug6773084Test {
      static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
      static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
  
      private static final int NTHREADS = 25;
--- 41,62 ----
  import javax.xml.validation.Schema;
  import javax.xml.validation.SchemaFactory;
  import javax.xml.validation.Validator;
  
  import org.testng.Assert;
! import org.testng.annotations.Listeners;
  import org.testng.annotations.Test;
  import org.w3c.dom.Document;
  import org.xml.sax.ErrorHandler;
  import org.xml.sax.SAXException;
  import org.xml.sax.SAXParseException;
  
  /*
   * @bug 6773084
   * @summary Test Schema object is thread safe.
   */
+ @Listeners({jaxp.library.FilePolicy.class})
  public class Bug6773084Test {
      static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
      static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
  
      private static final int NTHREADS = 25;
*** 66,80 ****
      public static final String IN_FOLDER = Bug6773084Test.class.getResource("Bug6773084In").getPath();
      public static final String XSD_PATH = Bug6773084Test.class.getResource("Bug6773084.xsd").getPath();
  
      private static Schema schema;
  
-     @BeforeClass
-     public void setup(){
-         policy.PolicyUtil.changePolicy(getClass().getResource("6773084.policy").getFile());
-     }
- 
      @Test
      public void test() throws Exception {
          SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
          Source schemaFile = new StreamSource(XSD_PATH);
          try {
--- 67,76 ----