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 2013/04/11 00:46:27 UTC
svn commit: r1466722 - in
/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang:
CollationTest.java RolesTest.java SysDiagVTIMappingTest.java _Suite.java
Author: kmarsden
Date: Wed Apr 10 22:46:27 2013
New Revision: 1466722
URL: http://svn.apache.org/r1466722
Log:
Remove some testing that tests system tables which change.
Modified:
db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java
db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SysDiagVTIMappingTest.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/CollationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java?rev=1466722&r1=1466721&r2=1466722&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java Wed Apr 10 22:46:27 2013
@@ -1345,10 +1345,12 @@ private void commonTestingForTerritoryBa
checkLangBasedQuery(s, "SELECT count(*) FROM CUSTOMER WHERE CASE WHEN " +
" 1=1 THEN NAMECHAR ELSE NAME END = NAMECHAR",
new String[][] {{"7"} });
- //The query below will work for the same reason.
+ //The query below will work for the same reason.
+ /* Omit system table query for compat testing
checkLangBasedQuery(s, "SELECT count(*) FROM SYS.SYSTABLES WHERE CASE " +
" WHEN 1=1 THEN TABLENAME ELSE TABLEID END = TABLENAME",
new String[][] {{"25"} });
+ */
//Do some testing using CONCATENATION
//following will fail because result string of concatenation has
Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java?rev=1466722&r1=1466721&r2=1466722&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java Wed Apr 10 22:46:27 2013
@@ -1159,6 +1159,8 @@ public class RolesTest extends BaseJDBCT
int rcMereMortal)
throws SQLException
{
+ // For compat tests do not check system table row count
+ return;
ResultSet rs = _stm.executeQuery(
"SELECT COUNT(*) FROM " + table);
rs.next();
Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SysDiagVTIMappingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SysDiagVTIMappingTest.java?rev=1466722&r1=1466721&r2=1466722&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SysDiagVTIMappingTest.java (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SysDiagVTIMappingTest.java Wed Apr 10 22:46:27 2013
@@ -380,8 +380,9 @@ public final class SysDiagVTIMappingTest
/**
* Test the 0-arg constructor of the SPACE_TABLE vti. See DERBY-5554.
+ //Disable test for compat testing for system table checks
*/
- public void testSpaceTable_0argConstructor() throws Exception
+ public void xtestSpaceTable_0argConstructor() throws Exception
{
Statement st = createStatement();
ResultSet rs = st.executeQuery
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=1466722&r1=1466721&r2=1466722&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 Wed Apr 10 22:46:27 2013
@@ -84,7 +84,9 @@ public class _Suite extends BaseTestCase
suite.addTest(PredicateTest.suite());
suite.addTest(PrepareExecuteDDL.suite());
suite.addTest(ReferentialActionsTest.suite());
- suite.addTest(RolesTest.suite());
+ // Skip RolesTest for compat testing. Too many system
+ // table checks
+ //suite.addTest(RolesTest.suite());
suite.addTest(RolesConferredPrivilegesTest.suite());
suite.addTest(SQLSessionContextTest.suite());
suite.addTest(RoutineSecurityTest.suite());
@@ -111,7 +113,8 @@ public class _Suite extends BaseTestCase
suite.addTest(UnaryArithmeticParameterTest.suite());
suite.addTest(HoldCursorTest.suite());
suite.addTest(ShutdownDatabaseTest.suite());
- suite.addTest(StalePlansTest.suite());
+ // omit SystemCatalogTest for compat testing
+ //suite.addTest(StalePlansTest.suite());
suite.addTest(SystemCatalogTest.suite());
suite.addTest(ForBitDataTest.suite());
suite.addTest(DistinctTest.suite());