Skip to content

Commit 934e485

Browse files
m-kuhnm-kuhn
committedOct 2, 2013
Fix CSV test to support python NULL value
·
ltr-3_40archive/master_2
1 parent 52746c8 commit 934e485

File tree

2 files changed

+76
-74
lines changed

2 files changed

+76
-74
lines changed
 

‎tests/src/python/test_qgsdelimitedtextprovider_wanted.py

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def test_002_load_csv_file():
99
'description': u'Basic unquoted record',
1010
'data': u'Some data',
1111
'info': u'Some info',
12-
'field_5': u'None',
12+
'field_5': u'NULL',
1313
'#fid': 2L,
1414
'#geometry': 'None',
1515
},
@@ -18,7 +18,7 @@ def test_002_load_csv_file():
1818
'description': u'Quoted field',
1919
'data': u'Quoted data',
2020
'info': u'Unquoted',
21-
'field_5': u'None',
21+
'field_5': u'NULL',
2222
'#fid': 3L,
2323
'#geometry': 'None',
2424
},
@@ -27,7 +27,7 @@ def test_002_load_csv_file():
2727
'description': u'Escaped quotes',
2828
'data': u'Quoted "citation" data',
2929
'info': u'Unquoted',
30-
'field_5': u'None',
30+
'field_5': u'NULL',
3131
'#fid': 4L,
3232
'#geometry': 'None',
3333
},
@@ -36,7 +36,7 @@ def test_002_load_csv_file():
3636
'description': u'Quoted newlines',
3737
'data': u'Line 1\nLine 2\n\nLine 4',
3838
'info': u'No data',
39-
'field_5': u'None',
39+
'field_5': u'NULL',
4040
'#fid': 5L,
4141
'#geometry': 'None',
4242
},
@@ -52,9 +52,9 @@ def test_002_load_csv_file():
5252
10L: {
5353
'id': u'6',
5454
'description': u'Missing fields',
55-
'data': u'None',
56-
'info': u'None',
57-
'field_5': u'None',
55+
'data': u'NULL',
56+
'info': u'NULL',
57+
'field_5': u'NULL',
5858
'#fid': 10L,
5959
'#geometry': 'None',
6060
},
@@ -74,13 +74,13 @@ def test_003_field_naming():
7474
'description': u'Generation of field names',
7575
'data': u'Some data',
7676
'field_4': u'Some info',
77-
'data_2': u'None',
78-
'field_6': u'None',
79-
'field_7': u'None',
80-
'field_3_1': u'None',
81-
'data_1': u'None',
82-
'field_10': u'None',
83-
'field_11': u'None',
77+
'data_2': u'NULL',
78+
'field_6': u'NULL',
79+
'field_7': u'NULL',
80+
'field_3_1': u'NULL',
81+
'data_1': u'NULL',
82+
'field_10': u'NULL',
83+
'field_11': u'NULL',
8484
'field_12': u'last data',
8585
'#fid': 2L,
8686
'#geometry': 'None',
@@ -101,9 +101,9 @@ def test_004_max_fields():
101101
'description': u'Generation of field names',
102102
'data': u'Some data',
103103
'field_4': u'Some info',
104-
'data_1': u'None',
105-
'field_6': u'None',
106-
'field_7': u'None',
104+
'data_1': u'NULL',
105+
'field_6': u'NULL',
106+
'field_7': u'NULL',
107107
'#fid': 2L,
108108
'#geometry': 'None',
109109
},
@@ -123,8 +123,8 @@ def test_005_load_whitespace():
123123
'description': u'Simple_whitespace_file',
124124
'data': u'data1',
125125
'info': u'info1',
126-
'field_5': u'None',
127-
'field_6': u'None',
126+
'field_5': u'NULL',
127+
'field_6': u'NULL',
128128
'#fid': 2L,
129129
'#geometry': 'None',
130130
},
@@ -133,8 +133,8 @@ def test_005_load_whitespace():
133133
'description': u'Whitespace_at_start_of_line',
134134
'data': u'data2',
135135
'info': u'info2',
136-
'field_5': u'None',
137-
'field_6': u'None',
136+
'field_5': u'NULL',
137+
'field_6': u'NULL',
138138
'#fid': 3L,
139139
'#geometry': 'None',
140140
},
@@ -143,8 +143,8 @@ def test_005_load_whitespace():
143143
'description': u'Tab_whitespace',
144144
'data': u'data3',
145145
'info': u'info3',
146-
'field_5': u'None',
147-
'field_6': u'None',
146+
'field_5': u'NULL',
147+
'field_6': u'NULL',
148148
'#fid': 4L,
149149
'#geometry': 'None',
150150
},
@@ -153,8 +153,8 @@ def test_005_load_whitespace():
153153
'description': u'Multiple_whitespace_characters',
154154
'data': u'data4',
155155
'info': u'info4',
156-
'field_5': u'None',
157-
'field_6': u'None',
156+
'field_5': u'NULL',
157+
'field_6': u'NULL',
158158
'#fid': 5L,
159159
'#geometry': 'None',
160160
},
@@ -171,10 +171,10 @@ def test_005_load_whitespace():
171171
7L: {
172172
'id': u'6',
173173
'description': u'Missing_fields',
174-
'data': u'None',
175-
'info': u'None',
176-
'field_5': u'None',
177-
'field_6': u'None',
174+
'data': u'NULL',
175+
'info': u'NULL',
176+
'field_5': u'NULL',
177+
'field_6': u'NULL',
178178
'#fid': 7L,
179179
'#geometry': 'None',
180180
},
@@ -194,8 +194,8 @@ def test_006_quote_escape():
194194
'description': u'Using pipe delimiter',
195195
'data': u'data 1',
196196
'info': u'info 1',
197-
'field_5': u'None',
198-
'field_6': u'None',
197+
'field_5': u'NULL',
198+
'field_6': u'NULL',
199199
'#fid': 2L,
200200
'#geometry': 'None',
201201
},
@@ -204,8 +204,8 @@ def test_006_quote_escape():
204204
'description': u'Using backslash escape on pipe',
205205
'data': u'data 2 | piped',
206206
'info': u'info2',
207-
'field_5': u'None',
208-
'field_6': u'None',
207+
'field_5': u'NULL',
208+
'field_6': u'NULL',
209209
'#fid': 3L,
210210
'#geometry': 'None',
211211
},
@@ -214,18 +214,18 @@ def test_006_quote_escape():
214214
'description': u'Backslash escaped newline',
215215
'data': u'data3 \nline2 \nline3',
216216
'info': u'info3',
217-
'field_5': u'None',
218-
'field_6': u'None',
217+
'field_5': u'NULL',
218+
'field_6': u'NULL',
219219
'#fid': 4L,
220220
'#geometry': 'None',
221221
},
222222
7L: {
223223
'id': u'4',
224224
'description': u'Empty field',
225-
'data': u'None',
225+
'data': u'NULL',
226226
'info': u'info4',
227-
'field_5': u'None',
228-
'field_6': u'None',
227+
'field_5': u'NULL',
228+
'field_6': u'NULL',
229229
'#fid': 7L,
230230
'#geometry': 'None',
231231
},
@@ -234,8 +234,8 @@ def test_006_quote_escape():
234234
'description': u'Quoted field',
235235
'data': u'More | piped data',
236236
'info': u'info5',
237-
'field_5': u'None',
238-
'field_6': u'None',
237+
'field_5': u'NULL',
238+
'field_6': u'NULL',
239239
'#fid': 8L,
240240
'#geometry': 'None',
241241
},
@@ -244,18 +244,18 @@ def test_006_quote_escape():
244244
'description': u'Escaped quote',
245245
'data': u'Field "citation" ',
246246
'info': u'info6',
247-
'field_5': u'None',
248-
'field_6': u'None',
247+
'field_5': u'NULL',
248+
'field_6': u'NULL',
249249
'#fid': 9L,
250250
'#geometry': 'None',
251251
},
252252
10L: {
253253
'id': u'7',
254254
'description': u'Missing fields',
255-
'data': u'None',
256-
'info': u'None',
257-
'field_5': u'None',
258-
'field_6': u'None',
255+
'data': u'NULL',
256+
'info': u'NULL',
257+
'field_5': u'NULL',
258+
'field_6': u'NULL',
259259
'#fid': 10L,
260260
'#geometry': 'None',
261261
},
@@ -843,10 +843,10 @@ def test_018_regular_expression_2():
843843
'GEXP': u'GEXP',
844844
'description': u'RE',
845845
'RE_1': u'RE',
846-
'GEXP_1': u'None',
846+
'GEXP_1': u'NULL',
847847
'data': u'data2',
848848
'RE_2': u'RE',
849-
'GEXP_2': u'None',
849+
'GEXP_2': u'NULL',
850850
'info': u'info2',
851851
'#fid': 3L,
852852
'#geometry': 'None',
@@ -1080,7 +1080,7 @@ def test_026_filter_fid():
10801080
'description': u'Quoted field',
10811081
'data': u'Quoted data',
10821082
'info': u'Unquoted',
1083-
'field_5': u'None',
1083+
'field_5': u'NULL',
10841084
'#fid': 3L,
10851085
'#geometry': 'None',
10861086
},
@@ -1098,7 +1098,7 @@ def test_026_filter_fid():
10981098
'description': u'Quoted field',
10991099
'data': u'Quoted data',
11001100
'info': u'Unquoted',
1101-
'field_5': u'None',
1101+
'field_5': u'NULL',
11021102
'#fid': 3L,
11031103
'#geometry': 'None',
11041104
},
@@ -1163,7 +1163,7 @@ def test_027_filter_attributes():
11631163
'id': u'None',
11641164
'description': u'Missing fields',
11651165
'data': u'None',
1166-
'info': u'None',
1166+
'info': u'NULL',
11671167
'field_5': u'None',
11681168
'#fid': 10L,
11691169
'#geometry': 'None',
@@ -1229,7 +1229,7 @@ def test_028_substring_test():
12291229
'description': u'Basic unquoted record',
12301230
'data': u'Some data',
12311231
'info': u'Some info',
1232-
'field_5': u'None',
1232+
'field_5': u'NULL',
12331233
'#fid': 2L,
12341234
'#geometry': 'None',
12351235
},
@@ -1238,7 +1238,7 @@ def test_028_substring_test():
12381238
'description': u'Escaped quotes',
12391239
'data': u'Quoted "citation" data',
12401240
'info': u'Unquoted',
1241-
'field_5': u'None',
1241+
'field_5': u'NULL',
12421242
'#fid': 4L,
12431243
'#geometry': 'None',
12441244
},
@@ -1898,7 +1898,7 @@ def test_033_reset_subset_string():
18981898
'description': u'Basic unquoted record',
18991899
'data': u'Some data',
19001900
'info': u'Some info',
1901-
'field_5': u'None',
1901+
'field_5': u'NULL',
19021902
'#fid': 2L,
19031903
'#geometry': 'None',
19041904
},
@@ -1907,7 +1907,7 @@ def test_033_reset_subset_string():
19071907
'description': u'Quoted field',
19081908
'data': u'Quoted data',
19091909
'info': u'Unquoted',
1910-
'field_5': u'None',
1910+
'field_5': u'NULL',
19111911
'#fid': 3L,
19121912
'#geometry': 'None',
19131913
},
@@ -1916,7 +1916,7 @@ def test_033_reset_subset_string():
19161916
'description': u'Escaped quotes',
19171917
'data': u'Quoted "citation" data',
19181918
'info': u'Unquoted',
1919-
'field_5': u'None',
1919+
'field_5': u'NULL',
19201920
'#fid': 4L,
19211921
'#geometry': 'None',
19221922
},
@@ -1925,7 +1925,7 @@ def test_033_reset_subset_string():
19251925
'description': u'Quoted newlines',
19261926
'data': u'Line 1\nLine 2\n\nLine 4',
19271927
'info': u'No data',
1928-
'field_5': u'None',
1928+
'field_5': u'NULL',
19291929
'#fid': 5L,
19301930
'#geometry': 'None',
19311931
},
@@ -1941,9 +1941,9 @@ def test_033_reset_subset_string():
19411941
10L: {
19421942
'id': u'6',
19431943
'description': u'Missing fields',
1944-
'data': u'None',
1945-
'info': u'None',
1946-
'field_5': u'None',
1944+
'data': u'NULL',
1945+
'info': u'NULL',
1946+
'field_5': u'NULL',
19471947
'#fid': 10L,
19481948
'#geometry': 'None',
19491949
},
@@ -1952,7 +1952,7 @@ def test_033_reset_subset_string():
19521952
'description': u'Basic unquoted record',
19531953
'data': u'Some data',
19541954
'info': u'Some info',
1955-
'field_5': u'None',
1955+
'field_5': u'NULL',
19561956
'#fid': 2L,
19571957
'#geometry': 'None',
19581958
},
@@ -1961,7 +1961,7 @@ def test_033_reset_subset_string():
19611961
'description': u'Escaped quotes',
19621962
'data': u'Quoted "citation" data',
19631963
'info': u'Unquoted',
1964-
'field_5': u'None',
1964+
'field_5': u'NULL',
19651965
'#fid': 4L,
19661966
'#geometry': 'None',
19671967
},
@@ -1977,9 +1977,9 @@ def test_033_reset_subset_string():
19771977
4010L: {
19781978
'id': u'6',
19791979
'description': u'Missing fields',
1980-
'data': u'None',
1981-
'info': u'None',
1982-
'field_5': u'None',
1980+
'data': u'NULL',
1981+
'info': u'NULL',
1982+
'field_5': u'NULL',
19831983
'#fid': 10L,
19841984
'#geometry': 'None',
19851985
},
@@ -1988,7 +1988,7 @@ def test_033_reset_subset_string():
19881988
'description': u'Escaped quotes',
19891989
'data': u'Quoted "citation" data',
19901990
'info': u'Unquoted',
1991-
'field_5': u'None',
1991+
'field_5': u'NULL',
19921992
'#fid': 4L,
19931993
'#geometry': 'None',
19941994
},
@@ -1997,7 +1997,7 @@ def test_033_reset_subset_string():
19971997
'description': u'Basic unquoted record',
19981998
'data': u'Some data',
19991999
'info': u'Some info',
2000-
'field_5': u'None',
2000+
'field_5': u'NULL',
20012001
'#fid': 2L,
20022002
'#geometry': 'None',
20032003
},
@@ -2006,7 +2006,7 @@ def test_033_reset_subset_string():
20062006
'description': u'Escaped quotes',
20072007
'data': u'Quoted "citation" data',
20082008
'info': u'Unquoted',
2009-
'field_5': u'None',
2009+
'field_5': u'NULL',
20102010
'#fid': 4L,
20112011
'#geometry': 'None',
20122012
},
@@ -2024,7 +2024,7 @@ def test_033_reset_subset_string():
20242024
'description': u'Quoted field',
20252025
'data': u'Quoted data',
20262026
'info': u'Unquoted',
2027-
'field_5': u'None',
2027+
'field_5': u'NULL',
20282028
'#fid': 3L,
20292029
'#geometry': 'None',
20302030
},
@@ -2033,16 +2033,16 @@ def test_033_reset_subset_string():
20332033
'description': u'Quoted newlines',
20342034
'data': u'Line 1\nLine 2\n\nLine 4',
20352035
'info': u'No data',
2036-
'field_5': u'None',
2036+
'field_5': u'NULL',
20372037
'#fid': 5L,
20382038
'#geometry': 'None',
20392039
},
20402040
10010L: {
20412041
'id': u'6',
20422042
'description': u'Missing fields',
2043-
'data': u'None',
2044-
'info': u'None',
2045-
'field_5': u'None',
2043+
'data': u'NULL',
2044+
'info': u'NULL',
2045+
'field_5': u'NULL',
20462046
'#fid': 10L,
20472047
'#geometry': 'None',
20482048
},
@@ -2097,7 +2097,7 @@ def test_035_csvt_file2():
20972097
'f2': u'1.2',
20982098
'f3': u'1',
20992099
'f4': u'text',
2100-
'f5': u'None',
2100+
'f5': u'NULL',
21012101
'#fid': 2L,
21022102
'#geometry': 'None',
21032103
},

‎tests/testdata/zip/points3.geojson.gz.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
compressed_size=660
2+
uncompressed_size=3328

0 commit comments

Comments
 (0)
Please sign in to comment.