db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1468261 - in /db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang: PrimaryKeyTest.java SystemCatalogTest.java ViewsTest.java _Suite.java
Date Mon, 15 Apr 2013 22:49:12 GMT
Author: kmarsden
Date: Mon Apr 15 22:49:12 2013
New Revision: 1468261

URL: http://svn.apache.org/r1468261
Log:
Remove more system catalog checking   for compat testing.
Also update columns for DatabaseMetaData for compat testing



Modified:
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SystemCatalogTest.java
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ViewsTest.java
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java?rev=1468261&r1=1468260&r2=1468261&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java
(original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java
Mon Apr 15 22:49:12 2013
@@ -202,12 +202,14 @@ public class PrimaryKeyTest extends Base
 		assertUpdateCount(s , 0 , "drop table pos1");
 
 	}
+	
+	// Omit from compat testing for explicit system table check
 	/**
 	 * verify the consistency of the indexes on the system catalogs
 	 *
 	 *  @exception SQLException 
 	 */ 
-	public void testCatalog() throws SQLException {
+	public void xtestCatalog() throws SQLException {
 		Statement s = createStatement();
 		assertUpdateCount(s , 0 , "create table pos1(c1 int primary key)");
 		ResultSet rs = s.executeQuery("select tablename, SYSCS_UTIL.SYSCS_CHECK_TABLE('SYS', tablename)
from sys.systables where CAST(tabletype AS CHAR(1)) = 'S'  and CAST(tablename AS VARCHAR(128))
!= 'SYSDUMMY1'");

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SystemCatalogTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SystemCatalogTest.java?rev=1468261&r1=1468260&r2=1468261&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SystemCatalogTest.java
(original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SystemCatalogTest.java
Mon Apr 15 22:49:12 2013
@@ -176,12 +176,13 @@ public class SystemCatalogTest extends B
 		s.close();
 	}
 	
+	// Disable for compat testing. columns may change
 	/**
 	 * Check that all the tables for their expected columns.
 	 *
 	 * @throws SQLException
 	 */
-	public void testSystemCatalogColumns() throws SQLException {
+	public void xtestSystemCatalogColumns() throws SQLException {
 		String [][] expected = {
 				{"SYSALIASES", "ALIAS", "2", "VARCHAR(128) NOT NULL"},
 				{"SYSALIASES", "ALIASID", "1", "CHAR(36) NOT NULL"},

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ViewsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ViewsTest.java?rev=1468261&r1=1468260&r2=1468261&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ViewsTest.java
(original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ViewsTest.java
Mon Apr 15 22:49:12 2013
@@ -562,7 +562,8 @@ public final class ViewsTest extends Bas
             {"SYSPERMS", "1"}    
         };
         
-        JDBC.assertFullResultSet(rs, expRS, true);
+        //Remove systables check for compat testing.
+        //JDBC.assertFullResultSet(rs, expRS, true);
         
         // test inserts from a view
         
@@ -673,7 +674,8 @@ public final class ViewsTest extends Bas
             {"SYSPERMS", "1"}
         };
         
-        JDBC.assertFullResultSet(rs, expRS, true);
+        //Remove systables check for compat testing.
+        //JDBC.assertFullResultSet(rs, expRS, true);
         
         // bug 2745
         
@@ -828,8 +830,8 @@ public final class ViewsTest extends Bas
         DatabaseMetaData dmd = getConnection().getMetaData();
         ResultSet columns = dmd.getColumns(null, null, "V", null);
         String[][] expectedDBMetaRows = new String[][] {{"","APP","V","DATA","12","VARCHAR","20",null,null,null,"1","",null,null,null
-            ,"40","1","YES",null,null,null,null,"NO","NO"},
-            {"","APP","V","NUM","4","INTEGER","10",null,"0","10","1","",null,null,null,null,"2","YES",null,null,null,null,"NO","NO"}};
 
+            ,"40","1","YES",null,null,null,null,"NO","NO",null},
+            {"","APP","V","NUM","4","INTEGER","10",null,"0","10","1","",null,null,null,null,"2","YES",null,null,null,null,"NO","NO",null}};
 
         JDBC.assertFullResultSet(columns,expectedDBMetaRows);
         // Make sure ResultSetMetaData is right when selecting from view.
         // This wasn't a problem with DERBY-4230, but checking for good measure.
@@ -874,19 +876,19 @@ public final class ViewsTest extends Bas
 
         String[][] expectedDBMetaRows = new String[][]
             {{"","APP","V1","J","4","INTEGER","10",null,"0","10","1","",
-              null,null,null,null,"1","YES",null,null,null,null,"NO","NO"},
+              null,null,null,null,"1","YES",null,null,null,null,"NO","NO",null},
              {"","APP","V1","I","4","INTEGER","10",null,"0","10","1","",
-              null,null,null,null,"2","YES",null,null,null,null,"NO","NO"}};
+              null,null,null,null,"2","YES",null,null,null,null,"NO","NO",null}};
 
         JDBC.assertFullResultSet(columns,expectedDBMetaRows);
 
         expectedDBMetaRows = new String[][]
             {{"","APP","V2","X","4","INTEGER","10",null,"0","10","1","",
-              null,null,null,null,"1","YES",null,null,null,null,"NO","NO"},
+              null,null,null,null,"1","YES",null,null,null,null,"NO","NO",null},
              {"","APP","V2","Y","4","INTEGER","10",null,"0","10","1","",
-              null,null,null,null,"2","YES",null,null,null,null,"NO","NO"},
+              null,null,null,null,"2","YES",null,null,null,null,"NO","NO",null},
              {"","APP","V2","Z","4","INTEGER","10",null,"0","10","1","",
-              null,null,null,null,"3","YES",null,null,null,null,"NO","NO"}};
+              null,null,null,null,"3","YES",null,null,null,null,"NO","NO",null}};
 
         columns = dmd.getColumns(null, null, "V2", null);
         JDBC.assertFullResultSet(columns,expectedDBMetaRows);

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?rev=1468261&r1=1468260&r2=1468261&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
(original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Mon Apr 15 22:49:12 2013
@@ -114,8 +114,8 @@ public class _Suite extends BaseTestCase
         suite.addTest(HoldCursorTest.suite());
         suite.addTest(ShutdownDatabaseTest.suite());
         // omit SystemCatalogTest for compat testing
-        //suite.addTest(StalePlansTest.suite());
-        suite.addTest(SystemCatalogTest.suite());
+        suite.addTest(StalePlansTest.suite());
+        //suite.addTest(SystemCatalogTest.suite());
         suite.addTest(ForBitDataTest.suite());
         suite.addTest(DistinctTest.suite());
         suite.addTest(GroupByTest.suite());
@@ -130,7 +130,7 @@ public class _Suite extends BaseTestCase
         suite.addTest(GrantRevokeDDLTest.suite());
         suite.addTest(ReleaseCompileLocksTest.suite());
         suite.addTest(LazyDefaultSchemaCreationTest.suite());
-        suite.addTest(ErrorCodeTest.suite());
+        //suite.addTest(ErrorCodeTest.suite());
         suite.addTest(TimestampArithTest.suite());
         suite.addTest(SpillHashTest.suite());
         suite.addTest(CaseExpressionTest.suite());



Mime
View raw message