db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r280680 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness/ master/ master/DerbyNet/ master/DerbyNetClient/ suites/ tests/lang/
Date Tue, 13 Sep 2005 21:45:13 GMT
Author: fuzzylogic
Date: Tue Sep 13 14:45:08 2005
New Revision: 280680

URL: http://svn.apache.org/viewcvs?rev=280680&view=rev
Log:
DERBY-563: Add XML test suite to allow testing of the XML datatype and related
operators.

Committed for Army Brown <qozinx@sbcglobal.net>

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlSuite.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTests.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNet.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNetClient.properties
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/xml_general.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xml_general.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xml_general.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java?rev=280680&r1=280679&r2=280680&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
Tue Sep 13 14:45:08 2005
@@ -158,6 +158,8 @@
         // Filter for "DB2ConnectionCorrelator" text that can be printed as
         // part of some JCC error messages.
         searchStrings.addElement("  DB2ConnectionCorrelator: [0-9A-Z.]*");
+		// Filter for SAX exception name diffs between jvms.
+        searchStrings.addElement("org.xml.sax.SAX.*$");
 
         Vector subStrings = new Vector();
         subStrings.addElement("Transaction:(XXX)|");
@@ -193,6 +195,8 @@
         subStrings.addElement("Directory DBLOCATION/wombat already exists");
         // ignore the 'DB2ConnectionCorrelator' thing altogether.
         subStrings.addElement("");
+		// Filter for SAX exception name diffs between jvms.
+        subStrings.addElement("xxxFILTERED-SAX-EXCEPTIONxxx'.");
         doWork(srcFile, dstFile, null, deleteLines, searchStrings, subStrings, isSed, isI18N);
         
     } // end exec

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/xml_general.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/xml_general.out?rev=280680&r1=280679&r2=280680&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/xml_general.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/xml_general.out
Tue Sep 13 14:45:08 2005
@@ -152,7 +152,7 @@
 ij> select i from t1 where xmlparse(document '<hein/>' preserve whitespace);
 ERROR 42X19: The WHERE or HAVING clause or CHECK CONSTRAINT definition is a 'XML' expression.
 It must be a BOOLEAN expression.
 ij> insert into t1 values (1, xmlparse(document '<oops>' preserve whitespace));
-ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'XML document structures must start and end within the same entity.:
org.xml.sax.SAXParseException'.
+ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'XML document structures must start and end within the same entity.:
xxxFILTERED-SAX-EXCEPTIONxxx'.
 ij> -- These should work.
 insert into t1 values (5, xmlparse(document '<hmm/>' preserve whitespace));
 1 row inserted/updated/deleted
@@ -265,7 +265,7 @@
 select xmlserialize(xmlparse(document vc preserve whitespace) as char(10)) from t4;
 1         
 -----
-ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'Content is not allowed in prolog.: org.xml.sax.SAXParseException'.
+ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'Content is not allowed in prolog.: xxxFILTERED-SAX-EXCEPTIONxxx'.
 ij> select xmlserialize(x as char) from t1;
 1   
 -----
@@ -305,7 +305,7 @@
 select xmlserialize(xmlparse(document '<hmm>' preserve whitespace) as clob) from t2;
 1                                                                                       
                                       
 -----
-ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'XML document structures must start and end within the same entity.:
org.xml.sax.SAXParseException'.
+ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'XML document structures must start and end within the same entity.:
xxxFILTERED-SAX-EXCEPTIONxxx'.
 ij> select xmlserialize(xmlparse(document x preserve whitespace) as char(100)) from t1;
 ERROR 42X25: The 'XMLParse' function is not allowed on the 'XML' type.
 ij> -- These should succeed.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xml_general.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xml_general.out?rev=280680&r1=280679&r2=280680&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xml_general.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xml_general.out
Tue Sep 13 14:45:08 2005
@@ -152,7 +152,7 @@
 ij> select i from t1 where xmlparse(document '<hein/>' preserve whitespace);
 ERROR 42X19: The WHERE or HAVING clause or CHECK CONSTRAINT definition is a 'XML' expression.
 It must be a BOOLEAN expression.
 ij> insert into t1 values (1, xmlparse(document '<oops>' preserve whitespace));
-ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'XML document structures must start and end within the same entity.:
org.xml.sax.SAXParseException'.
+ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'XML document structures must start and end within the same entity.:
xxxFILTERED-SAX-EXCEPTIONxxx'.
 ij> -- These should work.
 insert into t1 values (5, xmlparse(document '<hmm/>' preserve whitespace));
 1 row inserted/updated/deleted
@@ -265,7 +265,7 @@
 select xmlserialize(xmlparse(document vc preserve whitespace) as char(10)) from t4;
 1         
 -----
-ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'Content is not allowed in prolog.: org.xml.sax.SAXParseException'.
+ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'Content is not allowed in prolog.: xxxFILTERED-SAX-EXCEPTIONxxx'.
 ij> select xmlserialize(x as char) from t1;
 1   
 -----
@@ -305,7 +305,7 @@
 select xmlserialize(xmlparse(document '<hmm>' preserve whitespace) as clob) from t2;
 1                                                                                       
                                       
 -----
-ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'XML document structures must start and end within the same entity.:
org.xml.sax.SAXParseException'.
+ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details. SQLSTATE:
XJ001: Java exception: 'XML document structures must start and end within the same entity.:
xxxFILTERED-SAX-EXCEPTIONxxx'.
 ij> select xmlserialize(xmlparse(document x preserve whitespace) as char(100)) from t1;
 ERROR 42X25: The 'XMLParse' function is not allowed on the 'XML' type.
 ij> -- These should succeed.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xml_general.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xml_general.out?rev=280680&r1=280679&r2=280680&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xml_general.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xml_general.out
Tue Sep 13 14:45:08 2005
@@ -153,7 +153,7 @@
 ERROR 42X19: The WHERE or HAVING clause or CHECK CONSTRAINT definition is a 'XML' expression.
 It must be a BOOLEAN expression.
 ij> insert into t1 values (1, xmlparse(document '<oops>' preserve whitespace));
 ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details.
-ERROR XJ001: Java exception: 'XML document structures must start and end within the same
entity.: org.xml.sax.SAXParseException'.
+ERROR XJ001: Java exception: 'XML document structures must start and end within the same
entity.: xxxFILTERED-SAX-EXCEPTIONxxx'.
 ij> -- These should work.
 insert into t1 values (5, xmlparse(document '<hmm/>' preserve whitespace));
 1 row inserted/updated/deleted
@@ -268,7 +268,7 @@
 ----------
 <hmm/>    
 ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details.
-ERROR XJ001: Java exception: 'Content is not allowed in prolog.: org.xml.sax.SAXParseException'.
+ERROR XJ001: Java exception: 'Content is not allowed in prolog.: xxxFILTERED-SAX-EXCEPTIONxxx'.
 ij> select xmlserialize(x as char) from t1;
 1   
 ----
@@ -309,7 +309,7 @@
 1                                                                                       
                                       
 --------------------------------------------------------------------------------------------------------------------------------
 ERROR 2200L: XMLPARSE operand is not an XML document; see next exception for details.
-ERROR XJ001: Java exception: 'XML document structures must start and end within the same
entity.: org.xml.sax.SAXParseException'.
+ERROR XJ001: Java exception: 'XML document structures must start and end within the same
entity.: xxxFILTERED-SAX-EXCEPTIONxxx'.
 ij> select xmlserialize(xmlparse(document x preserve whitespace) as char(100)) from t1;
 ERROR 42X25: The 'XMLParse' function is not allowed on the 'XML' type.
 ij> -- These should succeed.

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlSuite.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlSuite.properties?rev=280680&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlSuite.properties
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlSuite.properties
Tue Sep 13 14:45:08 2005
@@ -0,0 +1 @@
+suites=xmlTests xmlTestsNet xmlTestsNetClient

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTests.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTests.runall?rev=280680&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTests.runall
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTests.runall
Tue Sep 13 14:45:08 2005
@@ -0,0 +1,2 @@
+lang/xml_general.sql
+lang/xmlBinding.java

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNet.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNet.properties?rev=280680&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNet.properties
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNet.properties
Tue Sep 13 14:45:08 2005
@@ -0,0 +1,2 @@
+framework=DerbyNet
+suites=xmlTests

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNetClient.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNetClient.properties?rev=280680&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNetClient.properties
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xmlTestsNetClient.properties
Tue Sep 13 14:45:08 2005
@@ -0,0 +1,2 @@
+framework=DerbyNetClient
+suites=xmlTests

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant?rev=280680&r1=280679&r2=280680&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant
Tue Sep 13 14:45:08 2005
@@ -241,3 +241,6 @@
 wisconsin_app.properties
 wisconsin_derby.properties
 wisconsin_sed.properties
+xml_general.sql
+xmlBinding_app.properties
+xmlTestFiles/*



Mime
View raw message