db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpendle...@apache.org
Subject svn commit: r468503 [1/3] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting: functionTests/tests/lang/XMLMissingClassesTest.java functionTests/tests/lang/XMLTypeAndOpsTest.java functionTests/tests/lang/_Suite.java junit/JDBC.java
Date Fri, 27 Oct 2006 19:17:29 GMT
Author: bpendleton
Date: Fri Oct 27 12:17:28 2006
New Revision: 468503

URL: http://svn.apache.org/viewvc?view=rev&rev=468503
Log:
DERBY-1758: Enable xmlSuite to run as part of derbyall for qualified JVMs

This patch was contributed by A B (qozinx@gmail.com)

This patch adds two JUnit tests to lang/_Suite.java. The first test,
XMLTypeAndOpsTest.java, is meant to be a JUnit equivalent to the current
lang/xml_general.sql test. The second test, XMLMissingClassesTest,
tests the behavior of the SQL/XML operators when the required JAXP
or Xalan classes are not in the classpath.

The XML classes can be provided in any of a number of ways:
1) bundled into the JVM
2) installed as endorsed libraries
3) specified in the classpath
Hand-testing was performed to ensure that the new JUnit tests perform
correctly in these various configurations.

If the tests are run in an environment which does not support the XML
features, the tests quietly do nothing.

The patch, d1758_newJUnitTests_v2.patch, also adds a new utility method
and some associated state to JDBC.java for checking two things:
1) that the classpath has JAXP and Xalan classes, and
2) if the classpath has Xalan, check that the version of Xalan meets
the minimum requirement for use of Derby SQL/XML operators.
These methods/flags are then used to determine when to run the new
XML JUnit tests.

NOTE: After this patch has been reviewed/updated and finally committed
I will post a separate patch to remove the old lang/xml_general.sql test
and the corresponding master files. I will then continue addressing the
rest of the tasks for this issue (esp. xmlBinding.java) in incremental fashion.


Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
  (with props)
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java
  (with props)
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java?view=auto&rev=468503
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
Fri Oct 27 12:17:28 2006
@@ -0,0 +1,150 @@
+/*
+ *
+ * Derby - Class org.apache.derbyTesting.functionTests.tests.lang.XMLMissingClassesTest
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, 
+ * software distributed under the License is distributed on an 
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+ * either express or implied. See the License for the specific 
+ * language governing permissions and limitations under the License.
+ */
+package org.apache.derbyTesting.functionTests.tests.lang;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.TestConfiguration;
+
+import java.sql.Statement;
+
+/**
+ * This JUnit test is only run when the test classpath does not
+ * contain the external classes required for use of the Derby
+ * XML operators--namely, JAXP and Xalan.  In such a situation
+ * all we do is try to execute each of the four SQL/XML operators
+ * supported by Derby.  In all cases the operators should fail
+ * with an error indicating that the required classes could
+ * not be found.
+ */
+public final class XMLMissingClassesTest extends BaseJDBCTestCase {
+    
+    /**
+     * Statements to run if the required XML classes are missing--need
+     * to make sure the result is a compile-time error in all cases.
+     */
+    private static String [] SQLXML_STMTS = new String []
+    {
+        // One statement for each of the SQL/XML operators...
+        "insert into xt values " +
+            "(1, xmlparse(document '<hi/>' preserve whitespace))",
+        "select xmlserialize(x as char(80)) from xt",
+        "select xmlexists('//*' passing by ref x) from xt",
+        "select i from xt where " +
+            "xmlquery('//*' passing by ref x empty on empty) is not null"
+    };
+
+    /**
+     * Public constructor required for running test as standalone JUnit.
+     */
+    public XMLMissingClassesTest(String name)
+    {
+        super(name);
+    }
+
+    /**
+     * If the classpath does not have the XML classes that are
+     * required for using Derby's SQL/XML operators, then try
+     * try to execute each of the Derby XML operators and
+     * verify that the result is an error in all cases.
+     *
+     * If the classpath *does* have the XML classes required
+     * for use of Derby SQL/XML operators, then just return
+     * an empty suite (the operators are tested in a different
+     * JUnit test--namely XMLTypeAndOpTests.java).
+     *
+     * NOTE: We do not want to run this test if it has Xalan
+     * but the version of Xalan is not the minimum required.
+     * Attempts to do so can lead to unexpected errors (which
+     * is why we have a "minimum Xalan version" to begin with;
+     * see JDBC.checkXalanVersion()).
+     */
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite("XML Missing Classes Suite");
+        if (!JDBC.classpathHasXalanAndJAXP())
+        {
+            // Run this test in embedded and client modes.
+            suite.addTest(TestConfiguration.defaultSuite(
+                XMLMissingClassesTest.class));
+        }
+
+        return suite;
+    }
+
+    /**
+     * Assumption is that we only run this test if the classpath
+     * is missing required XML classes.  In that case do a simple
+     * check to make sure any attempts to use any of the SQL/XML
+     * operators will fail at compile time with the appropriate
+     * error.
+     */
+    public void testMissingClasses() throws Exception
+    {
+        Statement st = createStatement();
+
+        // It's okay to create a column of type XML, so long
+        // as no operators are involved.
+
+        st.execute("create table xt (i int, x xml)");
+        st.execute("create table xt1 (i int, x xml default null)");
+
+        // But if the create statement uses an operator, it should
+        // fail.
+
+        assertCompileError("XML00",
+            "create table fail1 (i int, x xml check "
+            + "(xmlexists('//should' passing by ref x)))");
+
+        assertCompileError("XML00",
+            "create table fail2 (i int, x xml default xmlparse("
+            + "document '<my>default col</my>' preserve whitespace))");
+
+        // As a sanity check, make sure that XML columns declared
+        // with invalid values still throw the correct errors--
+        // and especially, make sure no attempts are made to load
+        // XML classes.
+
+        assertCompileError("42894",
+            "create table fail3 (i int, x xml default 'oops')");
+
+        assertCompileError("42894",
+            "create table fail4 (i int, x xml default 8)");
+
+        assertCompileError("42818",
+            "create table fail5 (i int, x xml check (x != 0))");
+
+        // Now go through and test each of the operators.  They
+        // should all fail at compile time.
+
+        for (int i = 0; i < SQLXML_STMTS.length; i++)
+            assertCompileError("XML00", SQLXML_STMTS[i]);
+
+        // Cleanup.
+
+        st.execute("drop table xt");
+        st.execute("drop table xt1");
+        st.close();
+        st = null;
+    }
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message