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 fu...@apache.org on 2006/03/01 20:51:54 UTC
svn commit: r382138 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/urlLocale.out tests/i18n/DefaultLocale.java tests/i18n/urlLocale.sql
Author: fuzzylogic
Date: Wed Mar 1 11:51:53 2006
New Revision: 382138
URL: http://svn.apache.org/viewcvs?rev=382138&view=rev
Log:
DERBY-834: test i18n/urlLocale.sql fails in non-en_US locales. Remove hardcoded references to en_US and verify that the
locale of the database is internally consistent.
Committed for Myrna Van Lunteren <m....@gmail.com>
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out?rev=382138&r1=382137&r2=382138&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/urlLocale.out Wed Mar 1 11:51:53 2006
@@ -7,10 +7,7 @@
ij> create procedure checkRDefaultLoc() parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkRDefaultLocale';
0 rows inserted/updated/deleted
ij> -- this current database was created with the default locale
-call checkDatabaseLoc('en_US');
-0 rows inserted/updated/deleted
-ij> call checkRDefaultLoc();
-en_US
+call checkRDefaultLoc();
0 rows inserted/updated/deleted
ij> disconnect;
ij> -- create a Swiss database
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java?rev=382138&r1=382137&r2=382138&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java Wed Mar 1 11:51:53 2006
@@ -50,12 +50,14 @@
// used in urlLocale test
public static void checkRDefaultLocale() throws SQLException
{
- System.out.println(savedLocale);
- if (!savedLocale.equals("en_US"))
+ String dbLocale = org.apache.derby.iapi.db.Factory.getDatabaseOfConnection().getLocale().toString();
+ //System.out.println(savedLocale);
+ //System.out.println(dbLocale);
+ if (!savedLocale.equals(dbLocale))
throw new SQLException("wrong_locale");
}
- // used in messageLocale test
+ // used in urlLocale test and messageLocale test
public static void checkDatabaseLocale(String Locale) throws SQLException
{
String dbLocale = org.apache.derby.iapi.db.Factory.getDatabaseOfConnection().getLocale().toString();
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql?rev=382138&r1=382137&r2=382138&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/urlLocale.sql Wed Mar 1 11:51:53 2006
@@ -6,7 +6,6 @@
create procedure checkDatabaseLoc(in locale char(12)) parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkDatabaseLocale';
create procedure checkRDefaultLoc() parameter style java language java external name 'org.apache.derbyTesting.functionTests.tests.i18n.DefaultLocale.checkRDefaultLocale';
-- this current database was created with the default locale
-call checkDatabaseLoc('en_US');
call checkRDefaultLoc();
disconnect;