You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2015/12/11 11:28:25 UTC
svn commit: r1719330 - in
/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc:
HsqlSetupTableUtil.java JDBCDiskCacheRemovalUnitTest.java
JDBCDiskCacheShrinkUnitTest.java
Author: tv
Date: Fri Dec 11 10:28:24 2015
New Revision: 1719330
URL: http://svn.apache.org/viewvc?rev=1719330&view=rev
Log:
Fix tests
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java?rev=1719330&r1=1719329&r2=1719330&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java Fri Dec 11 10:28:24 2015
@@ -74,21 +74,29 @@ public class HsqlSetupTableUtil
sStatement.close();
}
- String setupData[] = { "create index iKEY on JCS_STORE2 (CACHE_KEY, REGION)" };
-
if ( newT )
{
- for ( int i = 0; i < setupData.length; i++ )
+ String setupData[] = { "create index iKEY on JCS_STORE2 (CACHE_KEY, REGION)" };
+ Statement iStatement = cConn.createStatement();
+
+ try
{
- try
- {
- sStatement.execute( setupData[i] );
- }
- catch ( SQLException e )
+ for ( int i = 0; i < setupData.length; i++ )
{
- System.out.println( "Exception: " + e );
+ try
+ {
+ iStatement.execute( setupData[i] );
+ }
+ catch ( SQLException e )
+ {
+ System.out.println( "Exception: " + e );
+ }
}
}
+ finally
+ {
+ iStatement.close();
+ }
}
}
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java?rev=1719330&r1=1719329&r2=1719330&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java Fri Dec 11 10:28:24 2015
@@ -155,21 +155,29 @@ public class JDBCDiskCacheRemovalUnitTes
sStatement.close();
}
- String setupData[] = { "create index iKEY on " + databaseName + " (CACHE_KEY, REGION)" };
-
if ( newT )
{
- for ( int i = 0; i < setupData.length; i++ )
+ String setupData[] = { "create index iKEY on " + databaseName + " (CACHE_KEY, REGION)" };
+ Statement iStatement = cConn.createStatement();
+
+ try
{
- try
- {
- sStatement.execute( setupData[i] );
- }
- catch ( SQLException e )
+ for ( int i = 0; i < setupData.length; i++ )
{
- System.out.println( "Exception: " + e );
+ try
+ {
+ iStatement.execute( setupData[i] );
+ }
+ catch ( SQLException e )
+ {
+ System.out.println( "Exception: " + e );
+ }
}
}
+ finally
+ {
+ iStatement.close();
+ }
} // end ifnew
}
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java?rev=1719330&r1=1719329&r2=1719330&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java Fri Dec 11 10:28:24 2015
@@ -268,21 +268,30 @@ public class JDBCDiskCacheShrinkUnitTest
sStatement.close();
}
- String setupData[] = { "create index iKEY on JCS_STORE_SHRINK (CACHE_KEY, REGION)" };
if ( newT )
{
- for ( int i = 0; i < setupData.length; i++ )
+ String setupData[] = { "create index iKEY on JCS_STORE_SHRINK (CACHE_KEY, REGION)" };
+ Statement iStatement = cConn.createStatement();
+
+ try
{
- try
- {
- sStatement.execute( setupData[i] );
- }
- catch ( SQLException e )
+ for ( int i = 0; i < setupData.length; i++ )
{
- System.out.println( "Exception: " + e );
+ try
+ {
+ iStatement.execute( setupData[i] );
+ }
+ catch ( SQLException e )
+ {
+ System.out.println( "Exception: " + e );
+ }
}
}
+ finally
+ {
+ iStatement.close();
+ }
} // end ifnew
}
}