From: <pc...@us...> - 2013-07-25 11:07:09
|
Revision: 58412 http://sourceforge.net/p/firebird/code/58412 Author: pcisar Date: 2013-07-25 11:07:06 +0000 (Thu, 25 Jul 2013) Log Message: ----------- Tests adapted to FB 3.0.0.30556 Modified Paths: -------------- qa/fbt-repository/trunk/tests/bugs/core_0959.fbt qa/fbt-repository/trunk/tests/bugs/core_1286.fbt qa/fbt-repository/trunk/tests/bugs/core_2831.fbt qa/fbt-repository/trunk/tests/functional/basic/db/db_07.fbt Modified: qa/fbt-repository/trunk/tests/bugs/core_0959.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_0959.fbt 2013-07-24 12:39:39 UTC (rev 58411) +++ qa/fbt-repository/trunk/tests/bugs/core_0959.fbt 2013-07-25 11:07:06 UTC (rev 58412) @@ -3,7 +3,7 @@ 'qmid': 'bugs.core_959-21', 'tracker_id': 'CORE-959', 'title': 'GSTAT does not work using the localhost connection string', -'description': "", +'description': '', 'min_versions': None, 'versions': [ { @@ -175,6 +175,41 @@ Analyzing database pages ... """, 'substitutions': [('^Database ".*',''),('Page size.*',''),('ODS version.*',''),('Oldest.*',''),('Next.*',''),('Bumped.*',''),('Creation date.*',''),('Attributes.*',''),('File .*',''),('Implementation.*',''),('Generation.*','')] +}, +{ + 'firebird_version': '3.0', + 'platform': 'All', + 'test_type': 'Python', + 'test_script': "runProgram('gstat',['-a','-user',user_name,'-pa',user_password,dsn])", + 'expected_stdout': """Database header page information: + Flags 0 + Generation 3 + System Change Number 0 + Page size 4096 + ODS version 12.0 + Oldest transaction 1 + Oldest active 0 + Oldest snapshot 0 + Next transaction 1 + Sequence number 0 + Next attachment ID 3 + Implementation HW=Intel/i386 little-endian OS=Windows CC=MSVC + Shadow count 0 + Page buffers 0 + Next header page 0 + Database dialect 3 + Creation date Jul 25, 2013 12:46:06 + Attributes force write + + Variable header data: + *END* + + +Database file sequence: + +Analyzing database pages ... +""", + 'substitutions': [('^Database ".*',''),('Page size.*',''),('ODS version.*',''),('Oldest.*',''),('Next.*',''),('Bumped.*',''),('Creation date.*',''),('Attributes.*',''),('File .*',''),('Implementation.*',''),('Generation.*','')] } ] } Modified: qa/fbt-repository/trunk/tests/bugs/core_1286.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_1286.fbt 2013-07-24 12:39:39 UTC (rev 58411) +++ qa/fbt-repository/trunk/tests/bugs/core_1286.fbt 2013-07-25 11:07:06 UTC (rev 58412) @@ -4,6 +4,7 @@ 'tracker_id': 'CORE-1286', 'title': 'Bug with COMPUTED BY fields', 'description': '', +'min_versions': None, 'versions': [ { 'firebird_version': '2.0.2', @@ -28,7 +29,7 @@ runProgram('isql',[dsn,'-user',user_name,'-pas',user_password],script) ''', - 'expected_stdout': """Database: localhost:c:\db\qa\bug.fdb, User: SYSDBA + 'expected_stdout': """Database: localhost:c:\db\qaug.fdb, User: SYSDBA SQL> COL1 ============ @@ -45,6 +46,46 @@ SQL> SQL>""", 'substitutions': [('Database.*',''),('SQL>.*','')] +}, +{ + 'firebird_version': '3.0', + 'platform': 'All', + 'database_character_set': 'UTF8', + 'connection_character_set': 'UTF8', + 'init_script': """create table T (COL1 INTEGER); +commit; +insert into T values (1); +insert into T values (2); +insert into T values (3); +commit; +""", + 'test_type': 'Python', + 'test_script': '''script = """select * from T; + +alter table T add STR1 computed by ('BLA-BLA-BLA'); +commit; + +select * from T; +""" + +runProgram('isql',[dsn,'-user',user_name,'-pas',user_password],script) +''', + 'expected_stdout': """ + COL1 +============ + 1 + 2 + 3 + + + COL1 STR1 +============ =========== + 1 BLA-BLA-BLA + 2 BLA-BLA-BLA + 3 BLA-BLA-BLA + +""", + 'substitutions': [('Database.*',''),('SQL>.*','')] } ] } Modified: qa/fbt-repository/trunk/tests/bugs/core_2831.fbt =================================================================== --- qa/fbt-repository/trunk/tests/bugs/core_2831.fbt 2013-07-24 12:39:39 UTC (rev 58411) +++ qa/fbt-repository/trunk/tests/bugs/core_2831.fbt 2013-07-25 11:07:06 UTC (rev 58412) @@ -22,6 +22,23 @@ """, 'substitutions': [("CREATE DATABASE '.*' PAGE_SIZE 4096 DEFAULT CHARACTER SET NONE","CREATE DATABASE '' PAGE_SIZE 4096 DEFAULT CHARACTER SET NONE")] +}, +{ + 'firebird_version': '3.0', + 'platform': 'All', + 'page_size': '4096', + 'test_type': 'Python', + 'test_script': """# +runProgram('isql',['-x',dsn,'-user',user_name,'-pass',user_password]) +""", + 'expected_stdout': """ +SET SQL DIALECT 3; + +/* CREATE DATABASE 'XXX' PAGE_SIZE 4096 DEFAULT CHARACTER SET NONE; */ + + +""", + 'substitutions': [("CREATE DATABASE '.*' PAGE_SIZE 4096 DEFAULT CHARACTER SET NONE","CREATE DATABASE '' PAGE_SIZE 4096 DEFAULT CHARACTER SET NONE")] } ] } Modified: qa/fbt-repository/trunk/tests/functional/basic/db/db_07.fbt =================================================================== --- qa/fbt-repository/trunk/tests/functional/basic/db/db_07.fbt 2013-07-24 12:39:39 UTC (rev 58411) +++ qa/fbt-repository/trunk/tests/functional/basic/db/db_07.fbt 2013-07-25 11:07:06 UTC (rev 58412) @@ -742,7 +742,7 @@ SEC$USER_NAME <null> <null> <null> <null> <null> <null> <null> 31 0 14 3 <null> <null> <null> 1 <null> <null> <null> <null> <null> <null> <null> 0 31 0 3 <null> SQL$129 SYSDBA SEC$UID <null> <null> <null> <null> <null> <null> <null> 4 0 8 <null> <null> <null> <null> 1 <null> <null> <null> <null> <null> <null> <null> 0 <null> <null> <null> <null> SQL$130 SYSDBA SEC$GID <null> <null> <null> <null> <null> <null> <null> 4 0 8 <null> <null> <null> <null> 1 <null> <null> <null> <null> <null> <null> <null> 0 <null> <null> <null> <null> SQL$131 SYSDBA -SEC$NAME_PART <null> <null> <null> <null> <null> <null> <null> 31 0 14 3 <null> <null> <null> 1 <null> <null> <null> <null> <null> <null> <null> 0 31 0 3 <null> SQL$132 SYSDBA +SEC$NAME_PART <null> <null> <null> <null> <null> <null> <null> 32 0 14 3 <null> <null> <null> 1 <null> <null> <null> <null> <null> <null> <null> 0 32 0 3 <null> SQL$132 SYSDBA RDB$CLIENT_VERSION <null> <null> <null> <null> <null> <null> <null> 255 0 37 2 <null> <null> <null> 1 <null> <null> <null> <null> <null> <null> <null> 0 <null> 0 2 <null> SQL$133 SYSDBA RDB$REMOTE_VERSION <null> <null> <null> <null> <null> <null> <null> 255 0 37 2 <null> <null> <null> 1 <null> <null> <null> <null> <null> <null> <null> 0 <null> 0 2 <null> SQL$134 SYSDBA RDB$HOST_NAME <null> <null> <null> <null> <null> <null> <null> 255 0 37 3 <null> <null> <null> 1 <null> <null> <null> <null> <null> <null> <null> 0 255 0 3 <null> SQL$135 SYSDBA This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |