db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1145057 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n: LocalizedAttributeScriptTest.java LocalizedDisplayScriptTest.java _Suite.java
Date Mon, 11 Jul 2011 07:58:01 GMT
Author: kahatlen
Date: Mon Jul 11 07:58:00 2011
New Revision: 1145057

URL: http://svn.apache.org/viewvc?rev=1145057&view=rev
Log:
DERBY-5314: Enable i18n tests in non-English locales

Run i18n tests regardless of locale. Also remove calls to
LocalizedResource.resetLocalizedResourceCache() in the tests
since that's done by ScriptTestCase after DERBY-5217.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java?rev=1145057&r1=1145056&r2=1145057&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java
Mon Jul 11 07:58:00 2011
@@ -24,7 +24,6 @@ import java.io.File;
 import java.security.AccessController;
 import java.util.Properties;
 
-import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
@@ -171,15 +170,6 @@ public final class LocalizedAttributeScr
                 //assertTrue(dir.getPath(), dir.delete());
             }
         });
-        LocalizedResource.resetLocalizedResourceCache();
         super.tearDown();
     }    
-    
-    /**
-     * Set up the test environment.
-     */
-    protected void setUp() {
-        super.setUp();
-        LocalizedResource.resetLocalizedResourceCache();
-    }
 }
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java?rev=1145057&r1=1145056&r2=1145057&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java
Mon Jul 11 07:58:00 2011
@@ -23,7 +23,6 @@ package org.apache.derbyTesting.function
 import java.util.Properties;
 import java.util.TimeZone;
 
-import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
@@ -125,12 +124,10 @@ public final class LocalizedDisplayScrip
         // and so cause errors. Thus, run this with timezone PST.
         defaultTimeZone = TimeZone.getDefault(); 
         TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles")); 
-        LocalizedResource.resetLocalizedResourceCache();
     }
     
     public void tearDown() throws Exception {
         TimeZone.setDefault(defaultTimeZone); 
-        LocalizedResource.resetLocalizedResourceCache();
         super.tearDown();
     }    
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java?rev=1145057&r1=1145056&r2=1145057&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java
Mon Jul 11 07:58:00 2011
@@ -50,12 +50,7 @@ public class _Suite extends BaseTestCase
 	public static Test suite() {
 
 		TestSuite suite = new TestSuite("i18n");
-        
-        // First ensure that we are running in english locale; the output
-        // master has been created in that locale, and thus, running in any
-        // other locale will fail.
-        if (!getSystemProperty("user.language").equalsIgnoreCase("en"))
-            return suite;
+
         // Also, both these tests won't run with JSR169.
         if (JDBC.vmSupportsJSR169())
             return suite;



Mime
View raw message