mrglavas    2003/11/12 20:35:04

  Modified:    java/tests/xinclude Test.java
               java/tests/xinclude/tests tests.xsd
  Log:
  Adding a schema which defines xml:base for tests.xsd, and enabling
  test output comparison. Thanks to Dean Chalker for helping to locate
  the problem. The old import URI was inaccessible..
  
  Revision  Changes    Path
  1.3       +8 -8      xml-xerces/java/tests/xinclude/Test.java
  
  Index: Test.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/tests/xinclude/Test.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Test.java 17 Oct 2003 21:53:17 -0000      1.2
  +++ Test.java 13 Nov 2003 04:35:04 -0000      1.3
  @@ -307,30 +307,30 @@
               return true;
           }
   
  -        // try {
  +        try {
               if (passed == expectedPass) {
  -                /** if (compareOutput(new FileReader(expectedOutputFile),
  -                    new StringReader(fResults))) { **/
  +                if (compareOutput(new FileReader(expectedOutputFile),
  +                    new StringReader(fResults))) {
                       fLogStream.println("Result: PASS");
                       return true;
  -                /** }
  +                }
                   else {
                       fLogStream.println("Result: FAIL");
                       return false;
  -                } **/
  +                }
               }
               else {
                   fLogStream.println(fResults);
                   fLogStream.println("Result: FAIL");
                   return false;
               }
  -        // }
  -        /** catch (IOException e) {
  +        }
  +        catch (IOException e) {
               fLogStream.println(
                   "Unexpected IO problem attempting to verify results: " + e);
               fLogStream.println("Result: FAIL");
               return false;
  -        } **/
  +        }
       }
   
       /* (non-Javadoc)
  
  
  
  1.2       +1 -1      xml-xerces/java/tests/xinclude/tests/tests.xsd
  
  Index: tests.xsd
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/tests/xinclude/tests/tests.xsd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tests.xsd 28 Jul 2003 20:47:33 -0000      1.1
  +++ tests.xsd 13 Nov 2003 04:35:04 -0000      1.2
  @@ -5,7 +5,7 @@
        xmlns:xit="http://www.schemaTest.org/xinclude-test";>
   
   <import namespace="http://www.w3.org/XML/1998/namespace";
  -        schemaLocation="file:///C:/eclipse/workspace/xinclude/files/xml.xsd"/>
  +        schemaLocation="./xmlbase.xsd"/>
   
   <!-- used for test01.xml -->
   <complexType name="childType" mixed="true">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to