Fossil SCM

Adapt glob tests to changes from [dc86831179].

florian 2024-09-10 06:26 trunk

Commit d663a324515d19f7302ff3c424afca534ff65ee1b61afa29bb044b08d774c63d

Parent 268bb7394713e22…

1 file changed +20 -20

M test/glob.test

+20 -20

		--- test/glob.test
		+++ test/glob.test
		@@ -30,40 +30,40 @@
30	30	}
31	31
32	32	glob-parse 100 test test [string map [list \r\n \n] \
33	33	{SQL expression: (x GLOB 'test')
34	34	pattern[0] = [test]
35		-1 test}]
	35	+1 1 test}]
36	36
37	37	glob-parse 101 "one two" one [string map [list \r\n \n] \
38	38	{SQL expression: (x GLOB 'one' OR x GLOB 'two')
39	39	pattern[0] = [one]
40	40	pattern[1] = [two]
41		-1 one}]
	41	+1 1 one}]
42	42
43	43	glob-parse 102 t* test [string map [list \r\n \n] \
44	44	{SQL expression: (x GLOB 't*')
45	45	pattern[0] = [t*]
46		-1 test}]
	46	+1 1 test}]
47	47
48	48	glob-parse 103 "o* two" one [string map [list \r\n \n] \
49	49	{SQL expression: (x GLOB 'o*' OR x GLOB 'two')
50	50	pattern[0] = [o*]
51	51	pattern[1] = [two]
52		-1 one}]
	52	+1 1 one}]
53	53
54	54	glob-parse 104 {"o* two" "three four"} "one two" [string map [list \r\n \n] \
55	55	{SQL expression: (x GLOB 'o* two' OR x GLOB 'three four')
56	56	pattern[0] = [o* two]
57	57	pattern[1] = [three four]
58		-1 one two}]
	58	+1 1 one two}]
59	59
60	60	glob-parse 105 {"o* two" "three four"} "two one" [string map [list \r\n \n] \
61	61	{SQL expression: (x GLOB 'o* two' OR x GLOB 'three four')
62	62	pattern[0] = [o* two]
63	63	pattern[1] = [three four]
64		-0 two one}]
	64	+0 0 two one}]
65	65
66	66	glob-parse 106 "\"o*\ntwo\" \"three\nfour\"" "one\ntwo" \
67	67	[string map [list \r\n \n] \
68	68	{SQL expression: (x GLOB 'o*
69	69	two' OR x GLOB 'three
		@@ -70,11 +70,11 @@
70	70	four')
71	71	pattern[0] = [o*
72	72	two]
73	73	pattern[1] = [three
74	74	four]
75		-1 one
	75	+1 1 one
76	76	two}]
77	77
78	78	glob-parse 107 "\"o*\ntwo\" \"three\nfour\"" "two\none" \
79	79	[string map [list \r\n \n] \
80	80	{SQL expression: (x GLOB 'o*
		@@ -82,11 +82,11 @@
82	82	four')
83	83	pattern[0] = [o*
84	84	two]
85	85	pattern[1] = [three
86	86	four]
87		-0 two
	87	+0 0 two
88	88	one}]
89	89
90	90	glob-parse 108 "\"o*\rtwo\" \"three\rfour\"" "one\rtwo" \
91	91	[string map [list \r\n \n] \
92	92	{SQL expression: (x GLOB 'o*
		@@ -94,11 +94,11 @@
94	94	four')
95	95	pattern[0] = [o*
96	96	two]
97	97	pattern[1] = [three
98	98	four]
99		-1 one
	99	+1 1 one
100	100	two}]
101	101
102	102	glob-parse 109 "\"o*\rtwo\" \"three\rfour\"" "two\rone" \
103	103	[string map [list \r\n \n] \
104	104	{SQL expression: (x GLOB 'o*
		@@ -106,11 +106,11 @@
106	106	four')
107	107	pattern[0] = [o*
108	108	two]
109	109	pattern[1] = [three
110	110	four]
111		-0 two
	111	+0 0 two
112	112	one}]
113	113
114	114	glob-parse 110 "'o*\ntwo' 'three\nfour'" "one\ntwo" \
115	115	[string map [list \r\n \n] \
116	116	{SQL expression: (x GLOB 'o*
		@@ -118,11 +118,11 @@
118	118	four')
119	119	pattern[0] = [o*
120	120	two]
121	121	pattern[1] = [three
122	122	four]
123		-1 one
	123	+1 1 one
124	124	two}]
125	125
126	126	glob-parse 111 "'o*\ntwo' 'three\nfour'" "two\none" \
127	127	[string map [list \r\n \n] \
128	128	{SQL expression: (x GLOB 'o*
		@@ -130,61 +130,61 @@
130	130	four')
131	131	pattern[0] = [o*
132	132	two]
133	133	pattern[1] = [three
134	134	four]
135		-0 two
	135	+0 0 two
136	136	one}]
137	137
138	138	glob-parse 112 "\"'o*' 'two'\" \"'three' 'four'\"" "'one' 'two'" \
139	139	[string map [list \r\n \n] \
140	140	{SQL expression: (x GLOB '''o*'' ''two''' OR x GLOB '''three'' ''four''')
141	141	pattern[0] = ['o*' 'two']
142	142	pattern[1] = ['three' 'four']
143		-1 'one' 'two'}]
	143	+1 1 'one' 'two'}]
144	144
145	145	glob-parse 113 "\"'o*' 'two'\" \"'three' 'four'\"" "two one" \
146	146	[string map [list \r\n \n] \
147	147	{SQL expression: (x GLOB '''o*'' ''two''' OR x GLOB '''three'' ''four''')
148	148	pattern[0] = ['o*' 'two']
149	149	pattern[1] = ['three' 'four']
150		-0 two one}]
	150	+0 0 two one}]
151	151
152	152	glob-parse 114 o*,two one [string map [list \r\n \n] \
153	153	{SQL expression: (x GLOB 'o*' OR x GLOB 'two')
154	154	pattern[0] = [o*]
155	155	pattern[1] = [two]
156		-1 one}]
	156	+1 1 one}]
157	157
158	158	glob-parse 115 "o*,two three,four" "one two" [string map [list \r\n \n] \
159	159	{SQL expression: (x GLOB 'o*' OR x GLOB 'two' OR x GLOB 'three' OR x GLOB 'four')
160	160	pattern[0] = [o*]
161	161	pattern[1] = [two]
162	162	pattern[2] = [three]
163	163	pattern[3] = [four]
164		-1 one two}]
	164	+1 1 one two}]
165	165
166	166	glob-parse 116 'o*,two' one [string map [list \r\n \n] \
167	167	{SQL expression: (x GLOB 'o*,two')
168	168	pattern[0] = [o*,two]
169		-0 one}]
	169	+0 0 one}]
170	170
171	171	glob-parse 117 'o*,two' one,two [string map [list \r\n \n] \
172	172	{SQL expression: (x GLOB 'o*,two')
173	173	pattern[0] = [o*,two]
174		-1 one,two}]
	174	+1 1 one,two}]
175	175
176	176	glob-parse 118 "'o*,two three,four'" "one two three,four" \
177	177	[string map [list \r\n \n] \
178	178	{SQL expression: (x GLOB 'o*,two three,four')
179	179	pattern[0] = [o*,two three,four]
180		-0 one two three,four}]
	180	+0 0 one two three,four}]
181	181
182	182	glob-parse 119 "'o*,two three,four'" "one,two three,four" \
183	183	[string map [list \r\n \n] \
184	184	{SQL expression: (x GLOB 'o*,two three,four')
185	185	pattern[0] = [o*,two three,four]
186		-1 one,two three,four}]
	186	+1 1 one,two three,four}]
187	187
188	188	###############################################################################
189	189
190	190	test_cleanup
191	191

	--- test/glob.test
	+++ test/glob.test
	@@ -30,40 +30,40 @@
30	}
31
32	glob-parse 100 test test [string map [list \r\n \n] \
33	{SQL expression: (x GLOB 'test')
34	pattern[0] = [test]
35	1 test}]
36
37	glob-parse 101 "one two" one [string map [list \r\n \n] \
38	{SQL expression: (x GLOB 'one' OR x GLOB 'two')
39	pattern[0] = [one]
40	pattern[1] = [two]
41	1 one}]
42
43	glob-parse 102 t* test [string map [list \r\n \n] \
44	{SQL expression: (x GLOB 't*')
45	pattern[0] = [t*]
46	1 test}]
47
48	glob-parse 103 "o* two" one [string map [list \r\n \n] \
49	{SQL expression: (x GLOB 'o*' OR x GLOB 'two')
50	pattern[0] = [o*]
51	pattern[1] = [two]
52	1 one}]
53
54	glob-parse 104 {"o* two" "three four"} "one two" [string map [list \r\n \n] \
55	{SQL expression: (x GLOB 'o* two' OR x GLOB 'three four')
56	pattern[0] = [o* two]
57	pattern[1] = [three four]
58	1 one two}]
59
60	glob-parse 105 {"o* two" "three four"} "two one" [string map [list \r\n \n] \
61	{SQL expression: (x GLOB 'o* two' OR x GLOB 'three four')
62	pattern[0] = [o* two]
63	pattern[1] = [three four]
64	0 two one}]
65
66	glob-parse 106 "\"o*\ntwo\" \"three\nfour\"" "one\ntwo" \
67	[string map [list \r\n \n] \
68	{SQL expression: (x GLOB 'o*
69	two' OR x GLOB 'three
	@@ -70,11 +70,11 @@
70	four')
71	pattern[0] = [o*
72	two]
73	pattern[1] = [three
74	four]
75	1 one
76	two}]
77
78	glob-parse 107 "\"o*\ntwo\" \"three\nfour\"" "two\none" \
79	[string map [list \r\n \n] \
80	{SQL expression: (x GLOB 'o*
	@@ -82,11 +82,11 @@
82	four')
83	pattern[0] = [o*
84	two]
85	pattern[1] = [three
86	four]
87	0 two
88	one}]
89
90	glob-parse 108 "\"o*\rtwo\" \"three\rfour\"" "one\rtwo" \
91	[string map [list \r\n \n] \
92	{SQL expression: (x GLOB 'o*
	@@ -94,11 +94,11 @@
94	four')
95	pattern[0] = [o*
96	two]
97	pattern[1] = [three
98	four]
99	1 one
100	two}]
101
102	glob-parse 109 "\"o*\rtwo\" \"three\rfour\"" "two\rone" \
103	[string map [list \r\n \n] \
104	{SQL expression: (x GLOB 'o*
	@@ -106,11 +106,11 @@
106	four')
107	pattern[0] = [o*
108	two]
109	pattern[1] = [three
110	four]
111	0 two
112	one}]
113
114	glob-parse 110 "'o*\ntwo' 'three\nfour'" "one\ntwo" \
115	[string map [list \r\n \n] \
116	{SQL expression: (x GLOB 'o*
	@@ -118,11 +118,11 @@
118	four')
119	pattern[0] = [o*
120	two]
121	pattern[1] = [three
122	four]
123	1 one
124	two}]
125
126	glob-parse 111 "'o*\ntwo' 'three\nfour'" "two\none" \
127	[string map [list \r\n \n] \
128	{SQL expression: (x GLOB 'o*
	@@ -130,61 +130,61 @@
130	four')
131	pattern[0] = [o*
132	two]
133	pattern[1] = [three
134	four]
135	0 two
136	one}]
137
138	glob-parse 112 "\"'o*' 'two'\" \"'three' 'four'\"" "'one' 'two'" \
139	[string map [list \r\n \n] \
140	{SQL expression: (x GLOB '''o*'' ''two''' OR x GLOB '''three'' ''four''')
141	pattern[0] = ['o*' 'two']
142	pattern[1] = ['three' 'four']
143	1 'one' 'two'}]
144
145	glob-parse 113 "\"'o*' 'two'\" \"'three' 'four'\"" "two one" \
146	[string map [list \r\n \n] \
147	{SQL expression: (x GLOB '''o*'' ''two''' OR x GLOB '''three'' ''four''')
148	pattern[0] = ['o*' 'two']
149	pattern[1] = ['three' 'four']
150	0 two one}]
151
152	glob-parse 114 o*,two one [string map [list \r\n \n] \
153	{SQL expression: (x GLOB 'o*' OR x GLOB 'two')
154	pattern[0] = [o*]
155	pattern[1] = [two]
156	1 one}]
157
158	glob-parse 115 "o*,two three,four" "one two" [string map [list \r\n \n] \
159	{SQL expression: (x GLOB 'o*' OR x GLOB 'two' OR x GLOB 'three' OR x GLOB 'four')
160	pattern[0] = [o*]
161	pattern[1] = [two]
162	pattern[2] = [three]
163	pattern[3] = [four]
164	1 one two}]
165
166	glob-parse 116 'o*,two' one [string map [list \r\n \n] \
167	{SQL expression: (x GLOB 'o*,two')
168	pattern[0] = [o*,two]
169	0 one}]
170
171	glob-parse 117 'o*,two' one,two [string map [list \r\n \n] \
172	{SQL expression: (x GLOB 'o*,two')
173	pattern[0] = [o*,two]
174	1 one,two}]
175
176	glob-parse 118 "'o*,two three,four'" "one two three,four" \
177	[string map [list \r\n \n] \
178	{SQL expression: (x GLOB 'o*,two three,four')
179	pattern[0] = [o*,two three,four]
180	0 one two three,four}]
181
182	glob-parse 119 "'o*,two three,four'" "one,two three,four" \
183	[string map [list \r\n \n] \
184	{SQL expression: (x GLOB 'o*,two three,four')
185	pattern[0] = [o*,two three,four]
186	1 one,two three,four}]
187
188	###############################################################################
189
190	test_cleanup
191

	--- test/glob.test
	+++ test/glob.test
	@@ -30,40 +30,40 @@
30	}
31
32	glob-parse 100 test test [string map [list \r\n \n] \
33	{SQL expression: (x GLOB 'test')
34	pattern[0] = [test]
35	1 1 test}]
36
37	glob-parse 101 "one two" one [string map [list \r\n \n] \
38	{SQL expression: (x GLOB 'one' OR x GLOB 'two')
39	pattern[0] = [one]
40	pattern[1] = [two]
41	1 1 one}]
42
43	glob-parse 102 t* test [string map [list \r\n \n] \
44	{SQL expression: (x GLOB 't*')
45	pattern[0] = [t*]
46	1 1 test}]
47
48	glob-parse 103 "o* two" one [string map [list \r\n \n] \
49	{SQL expression: (x GLOB 'o*' OR x GLOB 'two')
50	pattern[0] = [o*]
51	pattern[1] = [two]
52	1 1 one}]
53
54	glob-parse 104 {"o* two" "three four"} "one two" [string map [list \r\n \n] \
55	{SQL expression: (x GLOB 'o* two' OR x GLOB 'three four')
56	pattern[0] = [o* two]
57	pattern[1] = [three four]
58	1 1 one two}]
59
60	glob-parse 105 {"o* two" "three four"} "two one" [string map [list \r\n \n] \
61	{SQL expression: (x GLOB 'o* two' OR x GLOB 'three four')
62	pattern[0] = [o* two]
63	pattern[1] = [three four]
64	0 0 two one}]
65
66	glob-parse 106 "\"o*\ntwo\" \"three\nfour\"" "one\ntwo" \
67	[string map [list \r\n \n] \
68	{SQL expression: (x GLOB 'o*
69	two' OR x GLOB 'three
	@@ -70,11 +70,11 @@
70	four')
71	pattern[0] = [o*
72	two]
73	pattern[1] = [three
74	four]
75	1 1 one
76	two}]
77
78	glob-parse 107 "\"o*\ntwo\" \"three\nfour\"" "two\none" \
79	[string map [list \r\n \n] \
80	{SQL expression: (x GLOB 'o*
	@@ -82,11 +82,11 @@
82	four')
83	pattern[0] = [o*
84	two]
85	pattern[1] = [three
86	four]
87	0 0 two
88	one}]
89
90	glob-parse 108 "\"o*\rtwo\" \"three\rfour\"" "one\rtwo" \
91	[string map [list \r\n \n] \
92	{SQL expression: (x GLOB 'o*
	@@ -94,11 +94,11 @@
94	four')
95	pattern[0] = [o*
96	two]
97	pattern[1] = [three
98	four]
99	1 1 one
100	two}]
101
102	glob-parse 109 "\"o*\rtwo\" \"three\rfour\"" "two\rone" \
103	[string map [list \r\n \n] \
104	{SQL expression: (x GLOB 'o*
	@@ -106,11 +106,11 @@
106	four')
107	pattern[0] = [o*
108	two]
109	pattern[1] = [three
110	four]
111	0 0 two
112	one}]
113
114	glob-parse 110 "'o*\ntwo' 'three\nfour'" "one\ntwo" \
115	[string map [list \r\n \n] \
116	{SQL expression: (x GLOB 'o*
	@@ -118,11 +118,11 @@
118	four')
119	pattern[0] = [o*
120	two]
121	pattern[1] = [three
122	four]
123	1 1 one
124	two}]
125
126	glob-parse 111 "'o*\ntwo' 'three\nfour'" "two\none" \
127	[string map [list \r\n \n] \
128	{SQL expression: (x GLOB 'o*
	@@ -130,61 +130,61 @@
130	four')
131	pattern[0] = [o*
132	two]
133	pattern[1] = [three
134	four]
135	0 0 two
136	one}]
137
138	glob-parse 112 "\"'o*' 'two'\" \"'three' 'four'\"" "'one' 'two'" \
139	[string map [list \r\n \n] \
140	{SQL expression: (x GLOB '''o*'' ''two''' OR x GLOB '''three'' ''four''')
141	pattern[0] = ['o*' 'two']
142	pattern[1] = ['three' 'four']
143	1 1 'one' 'two'}]
144
145	glob-parse 113 "\"'o*' 'two'\" \"'three' 'four'\"" "two one" \
146	[string map [list \r\n \n] \
147	{SQL expression: (x GLOB '''o*'' ''two''' OR x GLOB '''three'' ''four''')
148	pattern[0] = ['o*' 'two']
149	pattern[1] = ['three' 'four']
150	0 0 two one}]
151
152	glob-parse 114 o*,two one [string map [list \r\n \n] \
153	{SQL expression: (x GLOB 'o*' OR x GLOB 'two')
154	pattern[0] = [o*]
155	pattern[1] = [two]
156	1 1 one}]
157
158	glob-parse 115 "o*,two three,four" "one two" [string map [list \r\n \n] \
159	{SQL expression: (x GLOB 'o*' OR x GLOB 'two' OR x GLOB 'three' OR x GLOB 'four')
160	pattern[0] = [o*]
161	pattern[1] = [two]
162	pattern[2] = [three]
163	pattern[3] = [four]
164	1 1 one two}]
165
166	glob-parse 116 'o*,two' one [string map [list \r\n \n] \
167	{SQL expression: (x GLOB 'o*,two')
168	pattern[0] = [o*,two]
169	0 0 one}]
170
171	glob-parse 117 'o*,two' one,two [string map [list \r\n \n] \
172	{SQL expression: (x GLOB 'o*,two')
173	pattern[0] = [o*,two]
174	1 1 one,two}]
175
176	glob-parse 118 "'o*,two three,four'" "one two three,four" \
177	[string map [list \r\n \n] \
178	{SQL expression: (x GLOB 'o*,two three,four')
179	pattern[0] = [o*,two three,four]
180	0 0 one two three,four}]
181
182	glob-parse 119 "'o*,two three,four'" "one,two three,four" \
183	[string map [list \r\n \n] \
184	{SQL expression: (x GLOB 'o*,two three,four')
185	pattern[0] = [o*,two three,four]
186	1 1 one,two three,four}]
187
188	###############################################################################
189
190	test_cleanup
191

Fossil SCM

Keyboard Shortcuts