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

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

Revision: 58918
          http://sourceforge.net/p/firebird/code/58918
Author:   makowski
Date:     2013-12-10 12:53:24 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
fix for Firebird 3 try to avoid false fail

Modified Paths:
--------------
    qa/fbt-repository/trunk/tests/bugs/core_0908.fbt
    qa/fbt-repository/trunk/tests/bugs/core_1183.fbt
    qa/fbt-repository/trunk/tests/bugs/core_1263.fbt
    qa/fbt-repository/trunk/tests/bugs/core_1894.fbt
    qa/fbt-repository/trunk/tests/bugs/core_1910.fbt
    qa/fbt-repository/trunk/tests/bugs/core_2153.fbt
    qa/fbt-repository/trunk/tests/bugs/core_2685.fbt
    qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_06.fbt
    qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_07.fbt
    qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_08.fbt
    qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_09.fbt

Modified: qa/fbt-repository/trunk/tests/bugs/core_0908.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_0908.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/bugs/core_0908.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -4,6 +4,7 @@
 'tracker_id': 'CORE-908',
 'title': 'Garbage in plan output of complex statement',
 'description': """This is unfortunate case. The fix for 2.1 went through several "adjustments" and we've get lost in changes. The result is that this was not properly fixed in 2.1 line (server doesn't crash, but don't returns the truncated plan as supposed either). Now when 2.1 line is at 2.1.3 we can hope for proper fix in 2.1.4. It should work as intended in 2.5 line.""",
+'min_versions': None,
 'versions': [
 {
  'firebird_version': '2.1',
@@ -263,6 +264,133 @@
            1
 
 """
+},
+{
+ 'firebird_version': '3.0',
+ 'platform': 'All',
+ 'init_script': """set term ^;
+
+create procedure big_plan
+  returns (x integer)
+as
+begin
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+  select 1 from rdb$database into :x;
+/*  select 1 from rdb$relations into :x; */
+  suspend;
+end ^
+set term ;^
+""",
+ 'test_type': 'ISQL',
+ 'test_script': """set plan on;
+select * from big_plan ;
+""",
+ 'expected_stdout': """PLAN (BIG_PLAN NATURAL)
+X
+============
+1
+"""
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/bugs/core_1183.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_1183.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/bugs/core_1183.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -4,6 +4,7 @@
 'tracker_id': 'CORE-1183',
 'title': 'View cannot be created if its WHERE clause contains IN <subquery> with a procedure reference',
 'description': '',
+'min_versions': None,
 'versions': [
 {
  'firebird_version': '2.0.2',
@@ -24,7 +25,7 @@
  'test_type': 'ISQL',
  'test_script': """create view v
 as
-  select * from rdb$database
+  select RDB$DESCRIPTION, RDB$RELATION_ID, RDB$SECURITY_CLASS, RDB$CHARACTER_SET_NAME from rdb$database
   where 1 in ( select col from p );
 
 commit;

Modified: qa/fbt-repository/trunk/tests/bugs/core_1263.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_1263.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/bugs/core_1263.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -50,6 +50,29 @@
 error in switch specifications
 GSEC>""",
  'substitutions': [('GSEC> Invalid switch specified*','GSEC> invalid switch specified'),('GSEC> invalid switch specified*','GSEC> invalid switch specified'),('error in switch specifications*',''),('in interactive mode*','')]
+},
+{
+ 'firebird_version': '3.0',
+ 'platform': 'All',
+ 'test_type': 'Python',
+ 'test_script': '''commands = """add BADPARAM -pa PWD
+add BADPARAM -pas PWD
+add BADPARAM -password PWD
+add BADPARAM -user USR
+add BADPARAM -database DB
+add BADPARAM -trusted
+quit
+"""
+runProgram('gsec',['-user',user_name,'-pas',user_password],commands)''',
+ 'expected_stderr': """GSEC> invalid switch specified in interactive mode
+GSEC> invalid switch specified in interactive mode
+GSEC> invalid switch specified in interactive mode
+GSEC> invalid switch specified in interactive mode
+GSEC> invalid switch specified in interactive mode
+GSEC> invalid switch specified
+error in switch specifications
+GSEC>""",
+ 'substitutions': [('GSEC> Invalid switch specified*','GSEC> invalid switch specified'),('GSEC> invalid switch specified*','GSEC> invalid switch specified'),('error in switch specifications*',''),('in interactive mode*','')]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/bugs/core_1894.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_1894.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/bugs/core_1894.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -61,6 +61,58 @@
 -there are 1 dependencies
 
 """
+},
+{
+ 'firebird_version': '3.0',
+ 'platform': 'All',
+ 'page_size': '4096',
+ 'init_script': """create table t (
+    n integer,
+    n1 computed by (n),
+    n2 computed by (n1)
+);
+
+create table t2 (
+    n integer,
+    c1 computed by (1),
+    c2 computed by (c1)
+);
+
+""",
+ 'test_type': 'ISQL',
+ 'test_script': """alter table t alter n1 computed by (n2);
+
+set autoddl off;
+alter table t2 drop c1;
+alter table t2 add c1 computed by (c2);
+commit;
+
+select * from t;
+select * from t2;
+""",
+ 'expected_stderr': """Statement failed, SQLSTATE = 42000
+unsuccessful metadata update
+-Cannot have circular dependencies with computed fields
+Statement failed, SQLSTATE = 42000
+unsuccessful metadata update
+-cannot delete
+-COLUMN T2.C1
+-there are 1 dependencies
+Statement failed, SQLSTATE = 42000
+unsuccessful metadata update
+-cannot delete
+-COLUMN T2.C1
+-there are 1 dependencies
+Statement failed, SQLSTATE = 42000
+unsuccessful metadata update
+-cannot delete
+-COLUMN T2.C1
+-there are 1 dependencies
+Statement failed, SQLSTATE = 42000
+unsuccessful metadata update
+-cannot delete
+-COLUMN T2.C1
+-there are 1 dependencies"""
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/bugs/core_1910.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_1910.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/bugs/core_1910.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -28,7 +28,8 @@
 -Column unknown
 -A
 -At line 7, column 15
-"""
+""",
+ 'substitutions': [('column.*','')]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/bugs/core_2153.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_2153.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/bugs/core_2153.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -13,13 +13,13 @@
  'test_type': 'ISQL',
  'test_script': """set count on ;
 
-select * from rdb$database
+select RDB$DESCRIPTION, RDB$RELATION_ID, RDB$SECURITY_CLASS, RDB$CHARACTER_SET_NAME from rdb$database
 where rdb$character_set_name similar to '%(av|ie){2,}%' ;
 
-select * from rdb$database
+select RDB$DESCRIPTION, RDB$RELATION_ID, RDB$SECURITY_CLASS, RDB$CHARACTER_SET_NAME from rdb$database
 where rdb$character_set_name similar to '%((av)|(ie)){2,}%' ;
 
-select * from rdb$database
+select RDB$DESCRIPTION, RDB$RELATION_ID, RDB$SECURITY_CLASS, RDB$CHARACTER_SET_NAME from rdb$database
 where rdb$character_set_name similar to '%(av)|{2,}%' ;
 """,
  'expected_stdout': """Records affected: 0

Modified: qa/fbt-repository/trunk/tests/bugs/core_2685.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_2685.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/bugs/core_2685.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -111,6 +111,103 @@
 CHECK_8
 
 """
+},
+{
+ 'firebird_version': '3.0',
+ 'platform': 'All',
+ 'database_character_set': 'UTF8',
+ 'connection_character_set': 'UTF8',
+ 'page_size': '4096',
+ 'init_script': """CREATE TABLE TEST_TABLE (
+    ID INTEGER,
+    CAPTION VARCHAR(10)
+);
+
+CREATE OR ALTER VIEW VW_TEST_VIEW(
+    ID,
+    CAPTION)
+AS
+select ID
+       ,CAPTION
+from test_table
+where ID > 0;
+
+COMMIT;""",
+ 'test_type': 'ISQL',
+ 'test_script': """select rdb$dependent_name test1 from rdb$dependencies where RDB$DEPENDED_ON_NAME = 'VW_TEST_VIEW';
+
+CREATE OR ALTER VIEW VW_TEST_VIEW(
+    ID,
+    CAPTION)
+AS
+select ID
+       ,CAPTION
+from test_table
+where ID > 0
+WITH CHECK OPTION;
+
+COMMIT;
+
+select rdb$dependent_name test2 from rdb$dependencies where RDB$DEPENDED_ON_NAME = 'VW_TEST_VIEW';
+
+CREATE OR ALTER VIEW VW_TEST_VIEW(
+    ID,
+    CAPTION)
+AS
+select ID
+       ,CAPTION
+from test_table
+where ID > 0
+WITH CHECK OPTION;
+CREATE OR ALTER VIEW VW_TEST_VIEW(
+    ID,
+    CAPTION)
+AS
+select ID
+       ,CAPTION
+from test_table
+where ID > 0
+WITH CHECK OPTION;
+CREATE OR ALTER VIEW VW_TEST_VIEW(
+    ID,
+    CAPTION)
+AS
+select ID
+       ,CAPTION
+from test_table
+where ID > 0
+WITH CHECK OPTION;
+
+COMMIT;
+select rdb$dependent_name test3 from rdb$dependencies where RDB$DEPENDED_ON_NAME = 'VW_TEST_VIEW';
+CREATE OR ALTER VIEW VW_TEST_VIEW(
+    ID,
+    CAPTION)
+AS
+select ID
+       ,CAPTION
+from test_table
+where ID > 0
+--WITH CHECK OPTION
+;
+CREATE OR ALTER VIEW VW_TEST_VIEW(
+    ID
+    --,CAPTION
+    )
+AS
+select ID
+       --,CAPTION
+from test_table
+where ID > 0;
+COMMIT;
+select rdb$dependent_name test4 from rdb$dependencies where RDB$DEPENDED_ON_NAME = 'VW_TEST_VIEW';
+""",
+ 'expected_stdout': """TEST2
+===============================
+CHECK_1
+TEST3
+===============================
+CHECK_4"""
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_06.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_06.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_06.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -82,7 +82,8 @@
 -T10.ID
 -At line 5, column 53
 
-"""
+""",
+ 'substitutions': [('column.*','')]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_07.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_07.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_07.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -82,7 +82,8 @@
 -T10.ID
 -At line 5, column 58
 
-"""
+""",
+ 'substitutions': [('column.*','')]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_08.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_08.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_08.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -4,6 +4,7 @@
 'tracker_id': '',
 'title': 'Derived table 8 outer reference',
 'description': 'Outer reference inside derived table to other relations in from clause is not allowed.',
+'min_versions': None,
 'versions': [
 {
  'firebird_version': '2.0',
@@ -81,7 +82,8 @@
 -T10.ID
 -At line 5, column 58
 
-"""
+""",
+ 'substitutions': [('column.*','')]
 }
 ]
 }

Modified: qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_09.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_09.fbt	2013-12-10 09:00:48 UTC (rev 58917)
+++ qa/fbt-repository/trunk/tests/functional/arno/derived_tables/derived_tables_09.fbt	2013-12-10 12:53:24 UTC (rev 58918)
@@ -4,6 +4,7 @@
 'tracker_id': '',
 'title': 'Derived table 9 outer reference',
 'description': 'Outer reference inside derived table to other relations in from clause is not allowed.',
+'min_versions': None,
 'versions': [
 {
  'firebird_version': '2.0',
@@ -81,7 +82,8 @@
 -T10.ID
 -At line 5, column 58
 
-"""
+""",
+ 'substitutions': [('column.*','')]
 }
 ]
 }

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