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 my...@apache.org on 2007/07/14 03:45:40 UTC
svn commit: r556205 - in /db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests: derbynet/NSinSameJVM_sed.properties derbynet/testProperties_sed.properties jdbcapi/metadata_sed.properties jdbcapi/odbc_metadata_sed.properties

Author: myrnavl
Date: Fri Jul 13 18:45:39 2007
New Revision: 556205

URL: http://svn.apache.org/viewvc?view=rev&rev=556205
Log:
DERBY-2918: accepting string 'exported' as valid value for version in 4 tests.
  backported revision 556199 from trunk

Modified:
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM_sed.properties
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM_sed.properties?view=diff&rev=556205&r1=556204&r2=556205
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM_sed.properties (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVM_sed.properties Fri Jul 13 18:45:39 2007
@@ -21,4 +21,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=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO) 
+substitute=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO) ,- [(]exported[)];-(EXPECTED SUBVERSION INFO) 

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties?view=diff&rev=556205&r1=556204&r2=556205
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties_sed.properties Fri Jul 13 18:45:39 2007
@@ -21,4 +21,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=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO) 
+substitute=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO) ,- [(]exported[)];-(EXPECTED SUBVERSION INFO) 

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties?view=diff&rev=556205&r1=556204&r2=556205
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties Fri Jul 13 18:45:39 2007
@@ -21,4 +21,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=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO),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=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO),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,- [(]exported[)];-(EXPECTED SUBVERSION INFO)

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties?view=diff&rev=556205&r1=556204&r2=556205
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties Fri Jul 13 18:45:39 2007
@@ -21,4 +21,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=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO),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=- [(][0-9]+:?[0-9]*M?[)];-(EXPECTED SUBVERSION INFO),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,- [(]exported[)];-(EXPECTED SUBVERSION INFO)