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 km...@apache.org on 2013/06/12 21:30:51 UTC
svn commit: r1492393 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/ suites/ tests/i18n/ tests/tools/
Author: kmarsden
Date: Wed Jun 12 19:30:50 2013
New Revision: 1492393
URL: http://svn.apache.org/r1492393
Log:
DERBY-4035 i18n tests fail with Lexical error on z/os
Complete conversion of i18nTest suite.
I18NImportExport change to ScriptTestCase
iepnegativetests_ES changed to extend tools/ImportExportProcedureTest which has
conversion for iepnegativetests
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java (with props)
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests_ES.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/i18nTest.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/iepnegativetests_ES.sql
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/iepnegativetests_ES_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/iepnegativetests_ES_sed.properties
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties?rev=1492393&r1=1492392&r2=1492393&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbyall.properties Wed Jun 12 19:30:50 2013
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-suites=derbylang storeall xa derbytools jdbc20 derbynetclientmats encryptionAll simpledemo unit i18nTest
+suites=derbylang storeall xa derbytools jdbc20 derbynetclientmats encryptionAll simpledemo unit
derby.debug.true=enableBtreeConsistencyCheck
derby.stream.error.logSeverityLevel=0
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java?rev=1492393&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java Wed Jun 12 19:30:50 2013
@@ -0,0 +1,52 @@
+/*
+ *
+ * Derby - Class org.apache.derbyTesting.functionTests.tests.i18.I18NImportExport
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * i18n governing permissions and limitations under the License.
+ */
+
+package org.apache.derbyTesting.functionTests.tests.i18n;
+
+import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class I18NImportExport extends ScriptTestCase {
+
+
+ /*
+ * A single JUnit test that runs a single SQL script.
+ */
+ private I18NImportExport(String i18NImportExport){
+ super(i18NImportExport);
+ }
+
+ public static Test suite() {
+
+ TestSuite suite = new TestSuite("I18NImportExport");
+ suite.addTest(
+ new CleanDatabaseTestSetup(
+ new I18NImportExport("I18NImportExport")));
+
+ return getIJConfig(new SupportFilesSetup(suite, new String[] {
+ "functionTests/tests/i18n/data/Tab1_fr.ctrl",
+ "functionTests/tests/i18n/data/Tab1_il.ctrl",
+ "functionTests/tests/i18n/data/Tab1_jp.ctrl" } ));
+ }
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java?rev=1492393&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java Wed Jun 12 19:30:50 2013
@@ -0,0 +1,61 @@
+/*
+
+ Derby - Class org.apache.derbyTesting.functionTests.tests.i18n.ImportExportProcedureESTest
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+ */
+package org.apache.derbyTesting.functionTests.tests.i18n;
+
+import java.util.Properties;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.derbyTesting.functionTests.tests.tools.ImportExportProcedureTest;
+import org.apache.derbyTesting.junit.Decorator;
+import org.apache.derbyTesting.junit.SupportFilesSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
+
+public class ImportExportProcedureESTest extends ImportExportProcedureTest {
+
+ /**
+ * Public constructor required for running test as standalone JUnit.
+ */
+ public ImportExportProcedureESTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * Run tests from iepnegative.sql with es_MX locale.
+ * These have already been converted in tools/ImportExportProcedureTest
+ * So we will just run that whole test in es_MX
+ */
+ public static Test suite() {
+ Test test = TestConfiguration.embeddedSuite(ImportExportProcedureTest.class);
+ Properties attributes = new Properties();
+ attributes.put("territory","es_MX");
+ test = Decorator.attributesDatabase(attributes, test);
+ return new SupportFilesSetup(test, new String[] {
+ "functionTests/testData/ImportExport/db2ttypes.del",
+ "functionTests/testData/ImportExport/mixednl.del",
+ "functionTests/testData/ImportExport/position_info.del"
+ });
+ }
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/ImportExportProcedureESTest.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1492393&r1=1492392&r2=1492393&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 Wed Jun 12 19:30:50 2013
@@ -59,7 +59,8 @@ public class _Suite extends BaseTestCase
suite.addTest(JapanCodeConversionTest.suite());
suite.addTest(CaseI_tr_TRTest.suite());
suite.addTest(UrlLocaleTest.suite());
-
+ suite.addTest(I18NImportExport.suite());
+ suite.addTest(ImportExportProcedureESTest.suite());
return suite;
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java?rev=1492393&r1=1492392&r2=1492393&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java Wed Jun 12 19:30:50 2013
@@ -42,7 +42,7 @@ import junit.framework.TestSuite;
* Converted from ieptests.sql
*
*/
-public final class ImportExportProcedureTest extends BaseJDBCTestCase {
+public class ImportExportProcedureTest extends BaseJDBCTestCase {
/**
* Public constructor required for running test as standalone JUnit.