1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00

Corrections to test names to eliminate duplicates and follow naming conventions.

FossilOrigin-Name: 50679889c75cd3205253b1682abfbddc5ff09175
This commit is contained in:
mistachkin
2012-10-07 05:34:39 +00:00
parent 08c1c3150b
commit 3038cfe90a
4 changed files with 38 additions and 38 deletions

View File

@ -1,5 +1,5 @@
C Changes\sfor\sWinRT\scompatibility.\s\sAlso,\sallow\sversion\sresource\scompilation\sand\sembedding\sto\sbe\sdisabled\sat\scompile-time. C Corrections\sto\stest\snames\sto\seliminate\sduplicates\sand\sfollow\snaming\sconventions.
D 2012-10-06T03:48:25.094 D 2012-10-07T05:34:39.472
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -702,7 +702,7 @@ F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9 F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
F test/shared8.test b27befbefbe7f4517f1d6b7ff8f64a41ec74165d F test/shared8.test b27befbefbe7f4517f1d6b7ff8f64a41ec74165d
F test/shared9.test 43cbbe6f59bd49abd7e40ac653a4aa8596feafcd F test/shared9.test 614a3ca431adc73c857632deb4eff75bcaee40ec
F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de
F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
F test/shell1.test 272384163432c0efd2c6817396beb0d119565d53 F test/shell1.test 272384163432c0efd2c6817396beb0d119565d53
@ -885,7 +885,7 @@ F test/trace2.test c1dc104a8d11a347c870cfea6235e3fc6f6cb06d
F test/trans.test 6e1b4c6a42dba31bd65f8fa5e61a2708e08ddde6 F test/trans.test 6e1b4c6a42dba31bd65f8fa5e61a2708e08ddde6
F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22 F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22
F test/trans3.test 373ac5183cc56be69f48ae44090e7f672939f732 F test/trans3.test 373ac5183cc56be69f48ae44090e7f672939f732
F test/trigger1.test 70acedb76532117bbcc873f8601cdc6905f1f455 F test/trigger1.test 30f343f91586765874a28ad539c06f5a5f049931
F test/trigger2.test 834187beafd1db383af0c659cfa49b0576832816 F test/trigger2.test 834187beafd1db383af0c659cfa49b0576832816
F test/trigger3.test d2c60d8be271c355d61727411e753181e877230a F test/trigger3.test d2c60d8be271c355d61727411e753181e877230a
F test/trigger4.test 74700b76ebf3947b2f7a92405141eb2cf2a5d359 F test/trigger4.test 74700b76ebf3947b2f7a92405141eb2cf2a5d359
@ -1019,7 +1019,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
P e0c889d66ccf4af12cc77ac38c1e6477da63ac72 P 4b0facc13b1026419f9b89dab3453ba43071455c
R 7aa3a9ae530d62ad432ec99f0941dd9b R 963a11ab0ec405d25d1ad37b4f26863a
U mistachkin U mistachkin
Z dfd5a7d9cdc76e6d57eba7e1ef9d075b Z 2db2f94384e1edd2a3e02fd4f28955ba

View File

@ -1 +1 @@
4b0facc13b1026419f9b89dab3453ba43071455c 50679889c75cd3205253b1682abfbddc5ff09175

View File

@ -170,7 +170,7 @@ do_test 3.1 {
} }
} {} } {}
do_test 3.3 { do_test 3.2 {
set ::tf [launch_testfixture] set ::tf [launch_testfixture]
testfixture $::tf { testfixture $::tf {
sqlite3 db test.db sqlite3 db test.db
@ -181,20 +181,20 @@ do_test 3.3 {
} }
} {1 2} } {1 2}
do_test 3.2 { do_test 3.3 {
db2 eval { SELECT * FROM t2 } db2 eval { SELECT * FROM t2 }
} {1 2} } {1 2}
do_test 3.3 { do_test 3.4 {
list [catch { db1 eval COMMIT } msg] $msg list [catch { db1 eval COMMIT } msg] $msg
} {1 {database is locked}} } {1 {database is locked}}
# At one point the following would fail, showing that the busy-handler # At one point the following would fail, showing that the busy-handler
# belonging to [db2] was invoked instead. # belonging to [db2] was invoked instead.
do_test 3.4 { do_test 3.5 {
set ::busyhandler_invoked_for set ::busyhandler_invoked_for
} {db1} } {db1}
do_test 3.5 { do_test 3.6 {
close $::tf close $::tf
db1 eval COMMIT db1 eval COMMIT
} {} } {}

View File

@ -11,20 +11,20 @@
# with the database COMMIT/ROLLBACK logic. # with the database COMMIT/ROLLBACK logic.
# #
# 1. CREATE and DROP TRIGGER tests # 1. CREATE and DROP TRIGGER tests
# trig-1.1: Error if table does not exist # trigger1-1.1: Error if table does not exist
# trig-1.2: Error if trigger already exists # trigger1-1.2: Error if trigger already exists
# trig-1.3: Created triggers are deleted if the transaction is rolled back # trigger1-1.3: Created triggers are deleted if the transaction is rolled back
# trig-1.4: DROP TRIGGER removes trigger # trigger1-1.4: DROP TRIGGER removes trigger
# trig-1.5: Dropped triggers are restored if the transaction is rolled back # trigger1-1.5: Dropped triggers are restored if the transaction is rolled back
# trig-1.6: Error if dropped trigger doesn't exist # trigger1-1.6: Error if dropped trigger doesn't exist
# trig-1.7: Dropping the table automatically drops all triggers # trigger1-1.7: Dropping the table automatically drops all triggers
# trig-1.8: A trigger created on a TEMP table is not inserted into sqlite_master # trigger1-1.8: A trigger created on a TEMP table is not inserted into sqlite_master
# trig-1.9: Ensure that we cannot create a trigger on sqlite_master # trigger1-1.9: Ensure that we cannot create a trigger on sqlite_master
# trig-1.10: # trigger1-1.10:
# trig-1.11: # trigger1-1.11:
# trig-1.12: Ensure that INSTEAD OF triggers cannot be created on tables # trigger1-1.12: Ensure that INSTEAD OF triggers cannot be created on tables
# trig-1.13: Ensure that AFTER triggers cannot be created on views # trigger1-1.13: Ensure that AFTER triggers cannot be created on views
# trig-1.14: Ensure that BEFORE triggers cannot be created on views # trigger1-1.14: Ensure that BEFORE triggers cannot be created on views
# #
set testdir [file dirname $argv0] set testdir [file dirname $argv0]
@ -265,32 +265,32 @@ ifcapable tempdb {
END; END;
} }
} {0 {}} } {0 {}}
do_test trigger-3.2 { do_test trigger1-3.2 {
catchsql { catchsql {
INSERT INTO t1 VALUES(1,2); INSERT INTO t1 VALUES(1,2);
SELECT * FROM t2; SELECT * FROM t2;
} }
} {1 {no such table: main.t2}} } {1 {no such table: main.t2}}
do_test trigger-3.3 { do_test trigger1-3.3 {
db close db close
set rc [catch {sqlite3 db test.db} err] set rc [catch {sqlite3 db test.db} err]
if {$rc} {lappend rc $err} if {$rc} {lappend rc $err}
set rc set rc
} {0} } {0}
do_test trigger-3.4 { do_test trigger1-3.4 {
catchsql { catchsql {
INSERT INTO t1 VALUES(1,2); INSERT INTO t1 VALUES(1,2);
SELECT * FROM t2; SELECT * FROM t2;
} }
} {1 {no such table: main.t2}} } {1 {no such table: main.t2}}
do_test trigger-3.5 { do_test trigger1-3.5 {
catchsql { catchsql {
CREATE TEMP TABLE t2(x,y); CREATE TEMP TABLE t2(x,y);
INSERT INTO t1 VALUES(1,2); INSERT INTO t1 VALUES(1,2);
SELECT * FROM t2; SELECT * FROM t2;
} }
} {1 {no such table: main.t2}} } {1 {no such table: main.t2}}
do_test trigger-3.6.1 { do_test trigger1-3.6.1 {
catchsql { catchsql {
DROP TRIGGER r1; DROP TRIGGER r1;
CREATE TEMP TRIGGER r1 AFTER INSERT ON t1 BEGIN CREATE TEMP TRIGGER r1 AFTER INSERT ON t1 BEGIN
@ -300,7 +300,7 @@ ifcapable tempdb {
SELECT * FROM t2; SELECT * FROM t2;
} }
} {0 {1 2 200 100}} } {0 {1 2 200 100}}
do_test trigger-3.6.2 { do_test trigger1-3.6.2 {
catchsql { catchsql {
DROP TRIGGER r1; DROP TRIGGER r1;
DELETE FROM t1; DELETE FROM t1;
@ -312,7 +312,7 @@ ifcapable tempdb {
SELECT * FROM t2; SELECT * FROM t2;
} }
} {0 {1 2}} } {0 {1 2}}
do_test trigger-3.7 { do_test trigger1-3.7 {
execsql { execsql {
DROP TABLE t2; DROP TABLE t2;
CREATE TABLE t2(x,y); CREATE TABLE t2(x,y);
@ -320,7 +320,7 @@ ifcapable tempdb {
} }
} {} } {}
# There are two versions of trigger-3.8 and trigger-3.9. One that uses # There are two versions of trigger1-3.8 and trigger1-3.9. One that uses
# compound SELECT statements, and another that does not. # compound SELECT statements, and another that does not.
ifcapable compound { ifcapable compound {
do_test trigger1-3.8 { do_test trigger1-3.8 {
@ -446,7 +446,7 @@ do_test trigger1-6.8 {
execsql {SELECT * FROM t2} execsql {SELECT * FROM t2}
} {3 4 7 8} } {3 4 7 8}
integrity_check trigger-7.1 integrity_check trigger1-7.1
# Check to make sure the name of a trigger can be quoted so that keywords # Check to make sure the name of a trigger can be quoted so that keywords
# can be used as trigger names. Ticket #468 # can be used as trigger names. Ticket #468
@ -491,7 +491,7 @@ do_test trigger1-8.6 {
ifcapable conflict { ifcapable conflict {
# Make sure REPLACE works inside of triggers. # Make sure REPLACE works inside of triggers.
# #
# There are two versions of trigger-9.1 and trigger-9.2. One that uses # There are two versions of trigger1-9.1 and trigger1-9.2. One that uses
# compound SELECT statements, and another that does not. # compound SELECT statements, and another that does not.
ifcapable compound { ifcapable compound {
do_test trigger1-9.1 { do_test trigger1-9.1 {
@ -612,7 +612,7 @@ ifcapable tempdb&&attach {
SELECT * FROM insert_log; SELECT * FROM insert_log;
} }
} {main 11 12 13 temp 14 15 16 aux 17 18 19} } {main 11 12 13 temp 14 15 16 aux 17 18 19}
do_test trigger1-10.8 { do_test trigger1-10.9 {
# Drop and re-create the insert_log table in a different database. Note # Drop and re-create the insert_log table in a different database. Note
# that we can change the column names because the trigger programs don't # that we can change the column names because the trigger programs don't
# use them explicitly. # use them explicitly.