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 ka...@apache.org on 2013/04/24 09:26:33 UTC
svn commit: r1471270 - in /db/derby/code/branches/10.8: ./
java/client/org/apache/derby/client/net/NetCursor.java
java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java
Author: kahatlen
Date: Wed Apr 24 07:26:33 2013
New Revision: 1471270
URL: http://svn.apache.org/r1471270
Log:
DERBY-5964: Timestamp comparison failure in AutomaticIndexStatisticsTest.testStatisticsCorrectness
Merged revision 1404886 from trunk.
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java (props changed)
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1404886
Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
Merged /db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:r1404886
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java?rev=1471270&r1=1471269&r2=1471270&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java Wed Apr 24 07:26:33 2013
@@ -44,6 +44,7 @@ import org.apache.derbyTesting.junit.Ind
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.JDBCDataSource;
import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.TimeZoneTestSetup;
import org.apache.derbyTesting.junit.Utilities;
/**
@@ -75,7 +76,14 @@ public class AutomaticIndexStatisticsTes
public static Test suite() {
TestSuite suite = new TestSuite(AutomaticIndexStatisticsTest.class);
- return TestConfiguration.additionalDatabaseDecorator(suite, MASTERDB);
+ // DERBY-5964: The test needs to check the timestamp stored in
+ // SYSSTATISTICS, which is in the local timezone. Since those
+ // timestamps may be ambiguous around the transition to or from DST,
+ // run this test in a timezone that doesn't observe DST. The
+ // TimeZoneTestSetup can probably be removed once DERBY-5974 is fixed.
+ return new TimeZoneTestSetup(
+ TestConfiguration.additionalDatabaseDecorator(suite, MASTERDB),
+ "GMT");
}
/** Initialize the default statistics helper object. */