[PATCH] Some more very minor test updates for JCC

Army 26 Apr 2005 23:32:31 -0000

I left a crucial space character out of one of my previous JCC patches (svn revision 161021), so while that patch did help, it didn't help as much as I would have liked.

So here's another very small patch to remedy the problem--it just updates the "sed" properties for some of the metadata tests so that those tests won't treat JCC version diffs as failures.

svn stat:

M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\dbMetaDataJdbc30_sed.properties M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\metadataJdbc20_sed.properties M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\odbc_metadata_sed.properties

M java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\metadata_sed.properties

Thanks,
Army Brown

Index: 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties
===================================================================
--- 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties
    (revision 164901)
+++ 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dbMetaDataJdbc30_sed.properties
    (working copy)
@@ -6,4 +6,4 @@
 # Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
 #   
substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
 # No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version 
[0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?[0-9]?.[A-Za-z]*.$;version (EXPECTED 
VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version 
(EXPECTED VERSION)
+substitute=version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?[0-9]?.[A-Za-z 
]*.$;version (EXPECTED VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? 
Test Build.$;version (EXPECTED VERSION)
Index: 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20_sed.properties
===================================================================
--- 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20_sed.properties
      (revision 164901)
+++ 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataJdbc20_sed.properties
      (working copy)
@@ -6,4 +6,4 @@
 # Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
 #   
substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
 # No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version 
[0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?[0-9]?.[A-Za-z]*.$;version (EXPECTED 
VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version 
(EXPECTED VERSION)
+substitute=version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]?[0-9]?.[A-Za-z 
]*.$;version (EXPECTED VERSION),version [0-9].[0-9]..[0-9].[0-9].[0-9][0-9]? 
Test Build.$;version (EXPECTED VERSION)
Index: 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties
===================================================================
--- 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties
       (revision 164901)
+++ 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties
       (working copy)
@@ -6,4 +6,4 @@
 # Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
 #   
substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
 # No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version 
[0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z]*.$;version (EXPECTED 
VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version 
(EXPECTED VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED 
VERSION
+substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z 
]*.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? 
Test Build.$;version (EXPECTED 
VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED VERSION
Index: 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
===================================================================
--- 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
    (revision 164901)
+++ 
java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
    (working copy)
@@ -6,4 +6,4 @@
 # Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
 #   
substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
 # No commas or semicolons can be allowed in the patterns/subsitutes.
-substitute=version 
[0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z]*.$;version (EXPECTED 
VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? Test Build.$;version 
(EXPECTED VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED 
VERSION
+substitute=version [0-9][.][0-9]..[0-9][.][0-9][.][0-9][0-9]?[0-9]?.[A-Za-z 
]*.$;version (EXPECTED VERSION),version [0-9][.][0-9]..[0-9].[0-9].[0-9][0-9]? 
Test Build.$;version (EXPECTED 
VERSION),getDriverVersion....[2-3].*$;getDriverVersion(): EXPECTED VERSION

[PATCH] Some more very minor test updates for JCC

Reply via email to