[Firebird-checkins] SF.net SVN: firebird:[61075] qa/fbt-repository/trunk/tests

[<mak...@us...>]

Revision: 61075
          http://sourceforge.net/p/firebird/code/61075
Author:   makowski
Date:     2015-03-24 12:38:08 +0000 (Tue, 24 Mar 2015)
Log Message:
-----------
make COLL-VERSION insensitive to last digit diff

Modified Paths:
--------------
    qa/fbt-repository/trunk/tests/bugs/core_4418.fbt
    qa/fbt-repository/trunk/tests/bugs/core_4452.fbt
    qa/fbt-repository/trunk/tests/functional/basic/db/db_03.fbt
    qa/fbt-repository/trunk/tests/functional/basic/isql/isql_03.fbt

Modified: qa/fbt-repository/trunk/tests/bugs/core_4418.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_4418.fbt	2015-03-24 01:30:20 UTC (rev 61074)
+++ qa/fbt-repository/trunk/tests/bugs/core_4418.fbt	2015-03-24 12:38:08 UTC (rev 61075)
@@ -99,8 +99,11 @@
 DM_IDS                          BIGINT Nullable
 DM_NUMS                         VARCHAR(20) CHARACTER SET UTF8 Nullable
                                  COLLATE NUMS_COLL
-NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.50;NUMERIC-SORT=1'
-  """
+NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx;NUMERIC-SORT=1'
+  """,
+  'substitutions': [
+    ('COLL-VERSION=58\.0\.6\.[0-9][0-9]','COLL-VERSION=58.0.6.xx')
+  ]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/bugs/core_4452.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_4452.fbt	2015-03-24 01:30:20 UTC (rev 61074)
+++ qa/fbt-repository/trunk/tests/bugs/core_4452.fbt	2015-03-24 12:38:08 UTC (rev 61075)
@@ -37,17 +37,20 @@
   """,
  'expected_stdout':
   """
-NAME_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.50'
-NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.50;NUMERIC-SORT=1'
+NAME_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx'
+NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx;NUMERIC-SORT=1'
 
-NAME_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.50'
-NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.50;NUMERIC-SORT=1'
+NAME_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx'
+NUMS_COLL, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx;NUMERIC-SORT=1'
   """,
  'expected_stderr':
   """
 There are no user-defined collations in this database
 There are no user-defined collations in this database
-  """
+  """,
+  'substitutions': [
+    ('COLL-VERSION=58\.0\.6\.[0-9][0-9]','COLL-VERSION=58.0.6.xx')
+  ]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/functional/basic/db/db_03.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/functional/basic/db/db_03.fbt	2015-03-24 01:30:20 UTC (rev 61074)
+++ qa/fbt-repository/trunk/tests/functional/basic/db/db_03.fbt	2015-03-24 12:38:08 UTC (rev 61075)
@@ -4858,7 +4858,7 @@
     RDB$FUNCTION_NAME               <null>
     RDB$BASE_COLLATION_NAME         <null>
     RDB$SPECIFIC_ATTRIBUTES         1d:f3
-    COLL-VERSION=58.0.6.50
+    COLL-VERSION=58.0.6.xx
     RDB$SECURITY_CLASS              SQL$219
     RDB$OWNER_NAME                  SYSDBA
     
@@ -4871,7 +4871,7 @@
     RDB$FUNCTION_NAME               <null>
     RDB$BASE_COLLATION_NAME         UNICODE
     RDB$SPECIFIC_ATTRIBUTES         1d:f4
-    COLL-VERSION=58.0.6.50
+    COLL-VERSION=58.0.6.xx
     RDB$SECURITY_CLASS              SQL$220
     RDB$OWNER_NAME                  SYSDBA
     
@@ -6545,7 +6545,7 @@
     RDB$FUNCTION_NAME               <null>
     RDB$BASE_COLLATION_NAME         <null>
     RDB$SPECIFIC_ATTRIBUTES         1d:f6
-    COLL-VERSION=58.0.6.50
+    COLL-VERSION=58.0.6.xx
     RDB$SECURITY_CLASS              SQL$359
     RDB$OWNER_NAME                  SYSDBA
     
@@ -6573,7 +6573,10 @@
     RDB$SECURITY_CLASS              SQL$361
     RDB$OWNER_NAME                  SYSDBA
   """,
- 'substitutions': [('RDB\$SPECIFIC_ATTRIBUTES.*','')]
+ 'substitutions': [
+    ('RDB\$SPECIFIC_ATTRIBUTES.*',''),
+    ('COLL-VERSION=58\.0\.6\.[0-9][0-9]','COLL-VERSION=58.0.6.xx')
+    ]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/functional/basic/isql/isql_03.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/functional/basic/isql/isql_03.fbt	2015-03-24 01:30:20 UTC (rev 61074)
+++ qa/fbt-repository/trunk/tests/functional/basic/isql/isql_03.fbt	2015-03-24 12:38:08 UTC (rev 61075)
@@ -412,7 +412,7 @@
 BIG_5, CHARACTER SET BIG_5, PAD SPACE, SYSTEM
 BS_BA, CHARACTER SET WIN1250, PAD SPACE, SYSTEM
 CP943C, CHARACTER SET CP943C, PAD SPACE, SYSTEM
-CP943C_UNICODE, CHARACTER SET CP943C, PAD SPACE, 'COLL-VERSION=58.0.6.50', SYSTEM
+CP943C_UNICODE, CHARACTER SET CP943C, PAD SPACE, 'COLL-VERSION=58.0.6.xx', SYSTEM
 CS_CZ, CHARACTER SET ISO8859_2, PAD SPACE, SYSTEM
 CYRL, CHARACTER SET CYRL, PAD SPACE, SYSTEM
 DA_DA, CHARACTER SET ISO8859_1, PAD SPACE, SYSTEM
@@ -536,9 +536,9 @@
 TIS620, CHARACTER SET TIS620, PAD SPACE, SYSTEM
 TIS620_UNICODE, CHARACTER SET TIS620, PAD SPACE, SYSTEM
 UCS_BASIC, CHARACTER SET UTF8, PAD SPACE, SYSTEM
-UNICODE, CHARACTER SET UTF8, PAD SPACE, 'COLL-VERSION=58.0.6.50', SYSTEM
-UNICODE_CI, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.50', SYSTEM
-UNICODE_CI_AI, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, ACCENT INSENSITIVE, 'COLL-VERSION=58.0.6.50', SYSTEM
+UNICODE, CHARACTER SET UTF8, PAD SPACE, 'COLL-VERSION=58.0.6.xx', SYSTEM
+UNICODE_CI, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, 'COLL-VERSION=58.0.6.xx', SYSTEM
+UNICODE_CI_AI, CHARACTER SET UTF8, FROM EXTERNAL ('UNICODE'), PAD SPACE, CASE INSENSITIVE, ACCENT INSENSITIVE, 'COLL-VERSION=58.0.6.xx', SYSTEM
 UNICODE_FSS, CHARACTER SET UNICODE_FSS, PAD SPACE, SYSTEM
 UTF8, CHARACTER SET UTF8, PAD SPACE, SYSTEM
 WIN1250, CHARACTER SET WIN1250, PAD SPACE, SYSTEM
@@ -557,7 +557,10 @@
 WIN_CZ, CHARACTER SET WIN1250, PAD SPACE, CASE INSENSITIVE, SYSTEM
 WIN_CZ_CI_AI, CHARACTER SET WIN1250, PAD SPACE, CASE INSENSITIVE, ACCENT INSENSITIVE, SYSTEM
 WIN_PTBR, CHARACTER SET WIN1252, PAD SPACE, CASE INSENSITIVE, ACCENT INSENSITIVE, SYSTEM  
-  """
+  """,
+ 'substitutions': [
+    ('COLL-VERSION=58\.0\.6\.[0-9][0-9]','COLL-VERSION=58.0.6.xx')
+    ]
 }
 ]
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.