You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2007/06/12 23:57:42 UTC
svn commit: r546644 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests:
jdbcapi/AIjdbcTest.java jdbcapi/_Suite.java lang/AIjdbc.java
lang/LangHarnessJavaTest.java
Author: kmarsden
Date: Tue Jun 12 14:57:39 2007
New Revision: 546644
URL: http://svn.apache.org/viewvc?view=rev&rev=546644
Log:
DERBY-2726 convert lang/AIjdbc.java to JUnit
Contributed by Ugo Matrangolo
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AIjdbcTest.java (with props)
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/AIjdbc.java
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AIjdbcTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AIjdbcTest.java?view=auto&rev=546644
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AIjdbcTest.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AIjdbcTest.java Tue Jun 12 14:57:39 2007
@@ -0,0 +1,120 @@
+/**
+ * Derby - Class org.apache.derbyTesting.functionTests.tests.lang.AIjdbcTest
+ *
+ * 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.jdbcapi;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import junit.framework.Test;
+
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
+
+/**
+ * Test execution of JDBC method, isAutoincrement.
+ */
+public class AIjdbcTest extends BaseJDBCTestCase {
+
+ /**
+ * Basic constructor.
+ */
+ public AIjdbcTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Returns the implemented tests.
+ *
+ * @return An instance of <code>Test</code> with the implemented tests to
+ * run.
+ */
+ public static Test suite() {
+ return new CleanDatabaseTestSetup(TestConfiguration.defaultSuite(AIjdbcTest.class, false)) {
+ protected void decorateSQL(Statement stmt) throws SQLException {
+ stmt.execute("create table tab1 (x int, y int generated always as identity,z char(2))");
+ stmt.execute("create view tab1_view (a,b) as select y,y+1 from tab1");
+ }
+ };
+ }
+
+ /**
+ * Sets the auto commit to false.
+ */
+ protected void initializeConnection(Connection conn) throws SQLException {
+ conn.setAutoCommit(false);
+ }
+
+ /**
+ * Select from base table.
+ *
+ * @throws SQLException
+ */
+ public void testSelect() throws SQLException {
+ Statement s = createStatement();
+ ResultSet rs;
+ ResultSetMetaData rsmd;
+
+ rs = s.executeQuery("select x,z from tab1");
+ rsmd = rs.getMetaData();
+
+ assertFalse("Column count doesn't match.", rsmd.getColumnCount() != 2);
+ assertFalse("Column 1 is NOT ai.", rsmd.isAutoIncrement(1));
+ assertFalse("Column 2 is NOT ai.", rsmd.isAutoIncrement(2));
+
+ rs.close();
+
+ rs = s.executeQuery("select y, x,z from tab1");
+ rsmd = rs.getMetaData();
+
+ assertFalse("Column count doesn't match.", rsmd.getColumnCount() != 3);
+ assertFalse("Column 1 IS ai.", !rsmd.isAutoIncrement(1));
+ assertFalse("Column 2 is NOT ai.", rsmd.isAutoIncrement(2));
+ assertFalse("Column 3 is NOT ai.", rsmd.isAutoIncrement(3));
+
+ rs.close();
+ s.close();
+ }
+
+ /**
+ * Select from view.
+ *
+ * @throws SQLException
+ */
+ public void testSelectView() throws SQLException {
+ Statement s = createStatement();
+ ResultSet rs;
+ ResultSetMetaData rsmd;
+
+ rs = s.executeQuery("select * from tab1_view");
+ rsmd = rs.getMetaData();
+
+ assertFalse("Column count doesn't match.", rsmd.getColumnCount() != 2);
+ assertFalse("Column 1 IS ai.", !rsmd.isAutoIncrement(1));
+ assertFalse("Column 1 is NOT ai.", rsmd.isAutoIncrement(2));
+
+ rs.close();
+ s.close();
+ }
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AIjdbcTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?view=diff&rev=546644&r1=546643&r2=546644
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java Tue Jun 12 14:57:39 2007
@@ -77,6 +77,7 @@
suite.addTest(DriverTest.suite());
suite.addTest(ClobTest.suite());
suite.addTest(BlobUpdateableStreamTest.suite());
+ suite.addTest(AIjdbcTest.suite());
// Old harness .java tests that run using the HarnessJavaTest
// adapter and continue to use a single master file.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java?view=diff&rev=546644&r1=546643&r2=546644
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java Tue Jun 12 14:57:39 2007
@@ -43,7 +43,7 @@
*/
private static final String[] LANG_TESTS_BOTH =
{
- "AIjdbc",
+ //"AIjdbc",
};
/**