mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test numbering in fts3snippet.test. 

FossilOrigin-Name: 34f6854685f00158bc536dd53ac5bc20e19fe071
This commit is contained in:
dan 2010-01-15 17:33:49 +00:00
parent 3996a06236
commit 1d0f43f0ae
3 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Add\scoverage\stests\sfor\sfts3_snippet.c.\sAlso\sfixes\srelated\sto\sthe\ssame.
D 2010-01-15T17:25:53
C Fix\stest\snumbering\sin\sfts3snippet.test.
D 2010-01-15T17:33:50
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -405,7 +405,7 @@ F test/fts3malloc.test d02ee86b21edd2b43044e0d6dfdcd26cb6efddcb
F test/fts3near.test 2e318ee434d32babd27c167142e2b94ddbab4844
F test/fts3query.test 154fe4b015fd61af523ee083570a134f508f5be7
F test/fts3rnd.test 2f5761db9dd92f6fe09d08976ac658ef521846ed
F test/fts3snippet.test 3562e7e765bb3a8efeb425ad4fdcff5793219b7d
F test/fts3snippet.test d763197e7d6bc090638abcf68a780dd0d93635ab
F test/func.test af106ed834001738246d276659406823e35cde7b
F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
F test/fuzz.test a4174c3009a3e2c2e14b31b364ebf7ddb49de2c9
@ -785,7 +785,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P e5336edc55313afac11ea085257cb6e75a0287a7
R 3dd015be1ba4e72ecda3f74bc253611f
P 5e9d8ccae9731f380527463ef87ddcd216b4b721
R 6754ce2dfd9d134bc105f32a3aa30412
U dan
Z bf82d4cd440faa8bc0ad658561804fcb
Z bbb4d86ef223195e8166a6c82a95bc90

2
manifest.uuid
View File

@ -1 +1 @@
5e9d8ccae9731f380527463ef87ddcd216b4b721
34f6854685f00158bc536dd53ac5bc20e19fe071

84
test/fts3snippet.test
View File

@ -165,7 +165,7 @@ foreach {DO_MALLOC_TEST enc} {
0 0 12 3 0 2 12 3
}
do_test $T.9.1 {
do_test $T.2.1 {
set v1 [lrange $numbers 0 99]
execsql {
DROP TABLE IF EXISTS ft;
@ -176,15 +176,15 @@ foreach {DO_MALLOC_TEST enc} {
} {}
set off [string first "twohundred " $numbers]
do_offsets_test $T.9.1 {twohundred} [list 1 0 $off 10]
do_offsets_test $T.2.1 {twohundred} [list 1 0 $off 10]
set off [string first "onehundred " $numbers]
do_offsets_test $T.9.2 {onehundred} \
do_offsets_test $T.2.2 {onehundred} \
[list 0 0 $off 10 1 0 $off 10] [list 0 0 $off 10]
# Test a corruption case:
execsql { UPDATE ft_content SET c1b = 'hello world' WHERE c1b = $numbers }
do_error_test $T.9.3 {
do_error_test $T.2.3 {
SELECT offsets(ft) FROM ft WHERE ft MATCH 'onehundred'
} {database disk image is malformed}
@ -198,25 +198,25 @@ foreach {DO_MALLOC_TEST enc} {
SELECT snippet(ft,'{','}','...',$iCol,$nTok) FROM ft WHERE ft MATCH $expr
} $res
}
do_test $T.2.1 {
do_test $T.3.1 {
execsql {
DROP TABLE IF EXISTS ft;
CREATE VIRTUAL TABLE ft USING fts3;
INSERT INTO ft VALUES('one two three four five six seven eight nine ten');
}
} {}
do_snippet_test $T.2.2 one 0 5 "{one} two three four five..."
do_snippet_test $T.2.3 two 0 5 "one {two} three four five..."
do_snippet_test $T.2.4 three 0 5 "one two {three} four five..."
do_snippet_test $T.2.5 four 0 5 "...two three {four} five six..."
do_snippet_test $T.2.6 five 0 5 "...three four {five} six seven..."
do_snippet_test $T.2.7 six 0 5 "...four five {six} seven eight..."
do_snippet_test $T.2.8 seven 0 5 "...five six {seven} eight nine..."
do_snippet_test $T.2.9 eight 0 5 "...six seven {eight} nine ten"
do_snippet_test $T.2.10 nine 0 5 "...six seven eight {nine} ten"
do_snippet_test $T.2.11 ten 0 5 "...six seven eight nine {ten}"
do_snippet_test $T.3.2 one 0 5 "{one} two three four five..."
do_snippet_test $T.3.3 two 0 5 "one {two} three four five..."
do_snippet_test $T.3.4 three 0 5 "one two {three} four five..."
do_snippet_test $T.3.5 four 0 5 "...two three {four} five six..."
do_snippet_test $T.3.6 five 0 5 "...three four {five} six seven..."
do_snippet_test $T.3.7 six 0 5 "...four five {six} seven eight..."
do_snippet_test $T.3.8 seven 0 5 "...five six {seven} eight nine..."
do_snippet_test $T.3.9 eight 0 5 "...six seven {eight} nine ten"
do_snippet_test $T.3.10 nine 0 5 "...six seven eight {nine} ten"
do_snippet_test $T.3.11 ten 0 5 "...six seven eight nine {ten}"
do_test $T.3.1 {
do_test $T.4.1 {
execsql {
INSERT INTO ft VALUES(
'one two three four five '
@ -231,49 +231,49 @@ foreach {DO_MALLOC_TEST enc} {
}
} {}
do_snippet_test $T.3.2 {one nine} 0 5 {
do_snippet_test $T.4.2 {one nine} 0 5 {
{one} two three...eight {nine} ten
} {
{one} two three...eight {nine} ten...
}
do_snippet_test $T.3.3 {one nine} 0 -5 {
do_snippet_test $T.4.3 {one nine} 0 -5 {
{one} two three four five...six seven eight {nine} ten
} {
{one} two three four five...seven eight {nine} ten eleven...
}
do_snippet_test $T.3.3 {one nineteen} 0 -5 {
do_snippet_test $T.4.3 {one nineteen} 0 -5 {
...eighteen {nineteen} twenty {one} two...
}
do_snippet_test $T.3.4 {two nineteen} 0 -5 {
do_snippet_test $T.4.4 {two nineteen} 0 -5 {
...eighteen {nineteen} twenty one {two}...
}
do_snippet_test $T.3.5 {three nineteen} 0 -5 {
do_snippet_test $T.4.5 {three nineteen} 0 -5 {
...{nineteen} twenty one two {three}...
}
do_snippet_test $T.3.6 {four nineteen} 0 -5 {
do_snippet_test $T.4.6 {four nineteen} 0 -5 {
...two three {four} five six...seventeen eighteen {nineteen} twenty one...
}
do_snippet_test $T.3.7 {four NEAR nineteen} 0 -5 {
do_snippet_test $T.4.7 {four NEAR nineteen} 0 -5 {
...seventeen eighteen {nineteen} twenty one...two three {four} five six...
}
do_snippet_test $T.3.8 {four nineteen} 0 5 {
do_snippet_test $T.4.8 {four nineteen} 0 5 {
...three {four} five...eighteen {nineteen} twenty...
}
do_snippet_test $T.3.9 {four NEAR nineteen} 0 5 {
do_snippet_test $T.4.9 {four NEAR nineteen} 0 5 {
...eighteen {nineteen} twenty...three {four} five...
}
do_snippet_test $T.3.10 {four NEAR nineteen} 0 -5 {
do_snippet_test $T.4.10 {four NEAR nineteen} 0 -5 {
...seventeen eighteen {nineteen} twenty one...two three {four} five six...
}
do_snippet_test $T.3.11 {four NOT (nineteen twentyone)} 0 5 {
do_snippet_test $T.4.11 {four NOT (nineteen twentyone)} 0 5 {
...two three {four} five six...
} {
...two three {four} five six...
}
do_snippet_test $T.3.12 {four OR nineteen NEAR twentyone} 0 5 {
do_snippet_test $T.4.12 {four OR nineteen NEAR twentyone} 0 5 {
...two three {four} five six...
} {
...two three {four} five six...
@ -360,7 +360,7 @@ foreach {DO_MALLOC_TEST enc} {
SELECT mit(matchinfo(ft)) FROM ft WHERE ft MATCH $expr
} $res
}
do_test $T.4.1 {
do_test $T.8.1 {
set ten {one two three four five six seven eight nine ten}
execsql {
DROP TABLE IF EXISTS ft;
@ -370,16 +370,16 @@ foreach {DO_MALLOC_TEST enc} {
}
} {}
do_matchinfo_test $T.4.2 "one" {1 1 1 3 2} {1 1 2 3 2}
do_matchinfo_test $T.4.3 "one NEAR/3 ten" {2 1 1 1 1 1 1 1}
do_matchinfo_test $T.4.4 "five NEAR/4 ten" \
do_matchinfo_test $T.8.2 "one" {1 1 1 3 2} {1 1 2 3 2}
do_matchinfo_test $T.8.3 "one NEAR/3 ten" {2 1 1 1 1 1 1 1}
do_matchinfo_test $T.8.4 "five NEAR/4 ten" \
{2 1 1 3 2 1 3 2} {2 1 2 3 2 2 3 2}
do_matchinfo_test $T.4.5 "six NEAR/3 ten NEAR/3 two" \
do_matchinfo_test $T.8.5 "six NEAR/3 ten NEAR/3 two" \
{3 1 1 1 1 1 1 1 1 1 1}
do_matchinfo_test $T.4.6 "five NEAR/4 ten NEAR/3 two" \
do_matchinfo_test $T.8.6 "five NEAR/4 ten NEAR/3 two" \
{3 1 2 2 1 1 1 1 1 1 1}
do_test $T.8.1 {
do_test $T.9.1 {
execsql {
DROP TABLE IF EXISTS ft;
CREATE VIRTUAL TABLE ft USING fts3(x, y);
@ -391,36 +391,36 @@ foreach {DO_MALLOC_TEST enc} {
execsql { INSERT INTO ft(docid, x, y) VALUES($docid, $v1, $v2) }
}
} {}
do_matchinfo_test $T.8.2 {two*} \
do_matchinfo_test $T.9.2 {two*} \
{ 1 2 1 105 3 101 606 3} \
{ 1 2 3 105 3 202 606 3} \
{ 1 2 101 105 3 303 606 3}
do_matchinfo_test $T.8.4 {"one* two*"} \
do_matchinfo_test $T.9.4 {"one* two*"} \
{ 1 2 1 5 3 2 12 3} \
{ 1 2 2 5 3 4 12 3} \
{ 1 2 2 5 3 6 12 3}
do_matchinfo_test $T.8.5 {twohundredfifty} \
do_matchinfo_test $T.9.5 {twohundredfifty} \
{ 1 2 0 1 1 1 6 3} \
{ 1 2 0 1 1 2 6 3} \
{ 1 2 1 1 1 3 6 3}
do_matchinfo_test $T.8.6 {"threehundred one"} \
do_matchinfo_test $T.9.6 {"threehundred one"} \
{ 1 2 0 0 0 1 3 2} \
{ 1 2 0 0 0 2 3 2}
do_matchinfo_test $T.8.7 {one OR fivehundred} \
do_matchinfo_test $T.9.7 {one OR fivehundred} \
{ 2 2 1 3 3 1 6 3 0 0 0 0 0 0 } \
{ 2 2 1 3 3 2 6 3 0 0 0 0 0 0 } \
{ 2 2 1 3 3 3 6 3 0 0 0 0 0 0 }
do_matchinfo_test $T.8.8 {two OR "threehundred one"} \
do_matchinfo_test $T.9.8 {two OR "threehundred one"} \
{ 2 2 1 3 3 1 6 3 0 0 0 0 3 2 } \
{ 2 2 1 3 3 2 6 3 0 0 0 1 3 2 } \
{ 2 2 1 3 3 3 6 3 0 0 0 2 3 2 }
do_select_test $T.8.9 {
do_select_test $T.9.9 {
SELECT mit(matchinfo(ft)), mit(matchinfo(ft))
FROM ft WHERE ft MATCH 'two OR "threehundred one"'
} [normalize {