db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r640982 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
Date Tue, 25 Mar 2008 21:06:04 GMT
Author: kmarsden
Date: Tue Mar 25 14:06:03 2008
New Revision: 640982

URL: http://svn.apache.org/viewvc?rev=640982&view=rev
Log:
DERBY-3454 Change Collation test to run DatabaseMetaDataTest, BatchUpdateTest,GroupByExpressionTest,
and UpdateableResultSetTest for only one locale

Contributed by Suran Jayathilaka (suranjay at gmail dot com)

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java?rev=640982&r1=640981&r2=640982&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
Tue Mar 25 14:06:03 2008
@@ -1289,14 +1289,23 @@
    */
   private static Test collatedSuite(String locale, String baseFixture)
   {
-      TestSuite suite = new TestSuite("CollationTest:territory="+locale);
+      TestSuite suite = new TestSuite("CollationTest:territory=" + locale);
       suite.addTest(new CollationTest(baseFixture));
       
       // DMD.getTables() should not fail after the fix to DERBY-2896
-      suite.addTest(DatabaseMetaDataTest.suite());
-      suite.addTest(BatchUpdateTest.embeddedSuite());
-      suite.addTest(GroupByExpressionTest.suite());
-      suite.addTest(UpdatableResultSetTest.suite());
+      /*
+       * The following check condition was added because it would be 
+       * sufficient forthese testsuites to run with a single locale 
+       * and would save some time running tests.
+       * Related To: JIRA DERBY-3554
+       */
+      
+      if ("en".equals(locale)) {
+    	  suite.addTest(DatabaseMetaDataTest.suite());
+          suite.addTest(BatchUpdateTest.embeddedSuite());
+          suite.addTest(GroupByExpressionTest.suite());
+          suite.addTest(UpdatableResultSetTest.suite());    	  
+      }
       return Decorator.territoryCollatedDatabase(suite, locale);
   }
 



Mime
View raw message