]>
Commit | Line | Data |
---|---|---|
82d322b5 JR |
1 | From 702fdbac0e9174d9627813a267764c7448bc919f Mon Sep 17 00:00:00 2001 |
2 | From: Rico Tzschichholz <ricotz@ubuntu.com> | |
3 | Date: Wed, 30 Dec 2020 17:12:44 +0100 | |
4 | Subject: Sync custom g_assert_cmp* bindings with vala 0.52 and use them as | |
5 | needed | |
6 | ||
7 | --- | |
8 | test/direct/assertions.vapi | 32 +++++---- | |
9 | test/direct/datamodel-test.vala | 2 +- | |
10 | test/direct/datasource-test.vala | 20 +++--- | |
11 | test/direct/event-test.vala | 142 ++++++++++++++++++------------------- | |
12 | test/direct/marshalling-test.vala | 6 +- | |
13 | test/direct/mimetype-test.vala | 16 ++--- | |
14 | test/direct/symbol-test.vala | 10 +-- | |
15 | test/direct/table-lookup-test.vala | 14 ++-- | |
16 | test/direct/where-clause-test.vala | 30 ++++---- | |
17 | 9 files changed, 137 insertions(+), 135 deletions(-) | |
18 | ||
19 | diff --git a/test/direct/assertions.vapi b/test/direct/assertions.vapi | |
20 | index 5848434..f3aebb8 100644 | |
21 | --- a/test/direct/assertions.vapi | |
22 | +++ b/test/direct/assertions.vapi | |
23 | @@ -1,23 +1,25 @@ | |
24 | [CCode (cprefix = "G", lower_case_cprefix = "g_", cheader_filename = "glib.h")] | |
25 | namespace Assertions { | |
26 | - public enum OperatorType { | |
27 | +#if !VALA_0_52 | |
28 | + public enum CompareOperator { | |
29 | [CCode (cname = "==")] | |
30 | - EQUAL, | |
31 | + EQ, | |
32 | [CCode (cname = "!=")] | |
33 | - NOT_EQUAL, | |
34 | - [CCode (cname = "<")] | |
35 | - LESS_THAN, | |
36 | - [CCode (cname = ">")] | |
37 | - GREATER_THAN, | |
38 | - [CCode (cname = "<=")] | |
39 | - LESS_OR_EQUAL, | |
40 | + NE, | |
41 | [CCode (cname = ">=")] | |
42 | - GREATER_OR_EQUAL | |
43 | + GE, | |
44 | + [CCode (cname = "<=")] | |
45 | + LE, | |
46 | + [CCode (cname = ">")] | |
47 | + GT, | |
48 | + [CCode (cname = "<")] | |
49 | + LT | |
50 | } | |
51 | ||
52 | - public void assert_cmpstr (string? s1, OperatorType op, string? s2); | |
53 | - public void assert_cmpint (int n1, OperatorType op, int n2); | |
54 | - public void assert_cmpuint (uint n1, OperatorType op, uint n2); | |
55 | - public void assert_cmphex (uint n1, OperatorType op, uint n2); | |
56 | - public void assert_cmpfloat (float n1, OperatorType op, float n2); | |
57 | + public void assert_cmpstr (string? s1, CompareOperator op, string? s2); | |
58 | + public void assert_cmpint (int n1, CompareOperator op, int n2); | |
59 | + public void assert_cmpuint (uint n1, CompareOperator op, uint n2); | |
60 | + public void assert_cmphex (uint n1, CompareOperator op, uint n2); | |
61 | + public void assert_cmpfloat (double n1, CompareOperator op, double n2); | |
62 | +#endif | |
63 | } | |
64 | diff --git a/test/direct/datamodel-test.vala b/test/direct/datamodel-test.vala | |
65 | index 4fc0304..036e075 100644 | |
66 | --- a/test/direct/datamodel-test.vala | |
67 | +++ b/test/direct/datamodel-test.vala | |
68 | @@ -113,7 +113,7 @@ void foreach_test () | |
69 | int i = 0; | |
70 | foreach (Event e in result_set) | |
71 | { | |
72 | - assert_cmpint ((int) e.id, OperatorType.EQUAL, i); | |
73 | + assert_cmpint ((int) e.id, CompareOperator.EQ, i); | |
74 | i++; | |
75 | } | |
76 | ||
77 | diff --git a/test/direct/datasource-test.vala b/test/direct/datasource-test.vala | |
78 | index c9066f4..c15c92c 100644 | |
79 | --- a/test/direct/datasource-test.vala | |
80 | +++ b/test/direct/datasource-test.vala | |
81 | @@ -35,9 +35,9 @@ int main (string[] argv) | |
82 | void create_empty_test () | |
83 | { | |
84 | var src = new DataSource (); | |
85 | - assert_cmpstr (src.unique_id, OperatorType.EQUAL, null); | |
86 | - assert_cmpstr (src.name, OperatorType.EQUAL, null); | |
87 | - assert_cmpstr (src.description, OperatorType.EQUAL, null); | |
88 | + assert_cmpstr (src.unique_id, CompareOperator.EQ, null); | |
89 | + assert_cmpstr (src.name, CompareOperator.EQ, null); | |
90 | + assert_cmpstr (src.description, CompareOperator.EQ, null); | |
91 | assert (src.event_templates == null); | |
92 | assert (src.running == false); | |
93 | assert (src.timestamp == 0); | |
94 | @@ -48,9 +48,9 @@ void create_full_test () | |
95 | { | |
96 | var src = new DataSource.full ("my-id", "my-name", "my-desc", null); | |
97 | ||
98 | - assert_cmpstr (src.unique_id, OperatorType.EQUAL, "my-id"); | |
99 | - assert_cmpstr (src.name, OperatorType.EQUAL, "my-name"); | |
100 | - assert_cmpstr (src.description, OperatorType.EQUAL, "my-desc"); | |
101 | + assert_cmpstr (src.unique_id, CompareOperator.EQ, "my-id"); | |
102 | + assert_cmpstr (src.name, CompareOperator.EQ, "my-name"); | |
103 | + assert_cmpstr (src.description, CompareOperator.EQ, "my-desc"); | |
104 | assert (src.event_templates == null); | |
105 | assert (src.running == false); | |
106 | assert (src.timestamp == 0); | |
107 | @@ -81,16 +81,16 @@ void to_from_variant_test () | |
108 | orig.event_templates = event_templates; | |
109 | ||
110 | var src = new DataSource.from_variant (orig.to_variant ()); | |
111 | - assert_cmpstr (src.unique_id, OperatorType.EQUAL, "my-id"); | |
112 | - assert_cmpstr (src.name, OperatorType.EQUAL, "my-name"); | |
113 | - assert_cmpstr (src.description, OperatorType.EQUAL, "my-desc"); | |
114 | + assert_cmpstr (src.unique_id, CompareOperator.EQ, "my-id"); | |
115 | + assert_cmpstr (src.name, CompareOperator.EQ, "my-name"); | |
116 | + assert_cmpstr (src.description, CompareOperator.EQ, "my-desc"); | |
117 | assert (src.event_templates != null); | |
118 | assert (src.running == false); | |
119 | assert (src.timestamp == now); | |
120 | assert (src.enabled == true); | |
121 | ||
122 | event_templates = src.event_templates; | |
123 | - assert_cmpint (event_templates.length, OperatorType.EQUAL, 1); | |
124 | + assert_cmpint (event_templates.length, CompareOperator.EQ, 1); | |
125 | assert (event_templates.get (0) is Event); | |
126 | } | |
127 | ||
128 | diff --git a/test/direct/event-test.vala b/test/direct/event-test.vala | |
129 | index 7189057..b47ddb8 100644 | |
130 | --- a/test/direct/event-test.vala | |
131 | +++ b/test/direct/event-test.vala | |
132 | @@ -46,11 +46,11 @@ void create_empty_test () | |
133 | ||
134 | assert (ev.id == 0); | |
135 | assert (ev.timestamp == 0); | |
136 | - assert_cmpstr (ev.interpretation, OperatorType.EQUAL, null); | |
137 | - assert_cmpstr (ev.manifestation, OperatorType.EQUAL, null); | |
138 | - assert_cmpstr (ev.actor, OperatorType.EQUAL, null); | |
139 | - assert_cmpstr (ev.origin, OperatorType.EQUAL, null); | |
140 | - assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 0); | |
141 | + assert_cmpstr (ev.interpretation, CompareOperator.EQ, null); | |
142 | + assert_cmpstr (ev.manifestation, CompareOperator.EQ, null); | |
143 | + assert_cmpstr (ev.actor, CompareOperator.EQ, null); | |
144 | + assert_cmpstr (ev.origin, CompareOperator.EQ, null); | |
145 | + assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 0); | |
146 | assert (ev.payload == null); | |
147 | } | |
148 | ||
149 | @@ -65,22 +65,22 @@ void create_full_test () | |
150 | ||
151 | assert (ev.id == 0); | |
152 | assert (ev.timestamp == 0); | |
153 | - assert_cmpstr (ev.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); | |
154 | - assert_cmpstr (ev.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); | |
155 | - assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://firefox.desktop"); | |
156 | - assert_cmpstr (ev.origin, OperatorType.EQUAL, null); | |
157 | - assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 2); | |
158 | + assert_cmpstr (ev.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); | |
159 | + assert_cmpstr (ev.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); | |
160 | + assert_cmpstr (ev.actor, CompareOperator.EQ, "application://firefox.desktop"); | |
161 | + assert_cmpstr (ev.origin, CompareOperator.EQ, null); | |
162 | + assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 2); | |
163 | assert (ev.payload == null); | |
164 | ||
165 | var su = ev.subjects[1]; | |
166 | - assert_cmpstr (su.uri, OperatorType.EQUAL, null); | |
167 | - assert_cmpstr (su.interpretation, OperatorType.EQUAL, null); | |
168 | - assert_cmpstr (su.manifestation, OperatorType.EQUAL, null); | |
169 | - assert_cmpstr (su.mimetype, OperatorType.EQUAL, null); | |
170 | - assert_cmpstr (su.origin, OperatorType.EQUAL, null); | |
171 | - assert_cmpstr (su.text, OperatorType.EQUAL, null); | |
172 | - assert_cmpstr (su.storage, OperatorType.EQUAL, null); | |
173 | - assert_cmpstr (su.current_uri, OperatorType.EQUAL, null); | |
174 | + assert_cmpstr (su.uri, CompareOperator.EQ, null); | |
175 | + assert_cmpstr (su.interpretation, CompareOperator.EQ, null); | |
176 | + assert_cmpstr (su.manifestation, CompareOperator.EQ, null); | |
177 | + assert_cmpstr (su.mimetype, CompareOperator.EQ, null); | |
178 | + assert_cmpstr (su.origin, CompareOperator.EQ, null); | |
179 | + assert_cmpstr (su.text, CompareOperator.EQ, null); | |
180 | + assert_cmpstr (su.storage, CompareOperator.EQ, null); | |
181 | + assert_cmpstr (su.current_uri, CompareOperator.EQ, null); | |
182 | } | |
183 | ||
184 | void actor_from_app_info_test () | |
185 | @@ -90,7 +90,7 @@ void actor_from_app_info_test () | |
186 | ||
187 | var ev = new Event (); | |
188 | ev.set_actor_from_app_info (appinfo); | |
189 | - assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://test.desktop"); | |
190 | + assert_cmpstr (ev.actor, CompareOperator.EQ, "application://test.desktop"); | |
191 | } | |
192 | ||
193 | void from_variant_test () | |
194 | @@ -139,26 +139,26 @@ void from_variant_test () | |
195 | ||
196 | assert (ev.id == 27); | |
197 | assert (ev.timestamp == 68); | |
198 | - assert_cmpstr (ev.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); | |
199 | - assert_cmpstr (ev.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); | |
200 | - assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://foo.desktop"); | |
201 | - assert_cmpstr (ev.origin, OperatorType.EQUAL, null); | |
202 | - assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 1); | |
203 | + assert_cmpstr (ev.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); | |
204 | + assert_cmpstr (ev.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); | |
205 | + assert_cmpstr (ev.actor, CompareOperator.EQ, "application://foo.desktop"); | |
206 | + assert_cmpstr (ev.origin, CompareOperator.EQ, null); | |
207 | + assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 1); | |
208 | ||
209 | var su = ev.subjects[0]; | |
210 | - assert_cmpstr (su.uri, OperatorType.EQUAL, "file:///tmp/foo.txt"); | |
211 | - assert_cmpstr (su.interpretation, OperatorType.EQUAL, NFO.DOCUMENT); | |
212 | - assert_cmpstr (su.manifestation, OperatorType.EQUAL, NFO.FILE_DATA_OBJECT); | |
213 | - assert_cmpstr (su.mimetype, OperatorType.EQUAL, "text/plain"); | |
214 | - assert_cmpstr (su.origin, OperatorType.EQUAL, "file://tmp"); | |
215 | - assert_cmpstr (su.storage, OperatorType.EQUAL, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); | |
216 | + assert_cmpstr (su.uri, CompareOperator.EQ, "file:///tmp/foo.txt"); | |
217 | + assert_cmpstr (su.interpretation, CompareOperator.EQ, NFO.DOCUMENT); | |
218 | + assert_cmpstr (su.manifestation, CompareOperator.EQ, NFO.FILE_DATA_OBJECT); | |
219 | + assert_cmpstr (su.mimetype, CompareOperator.EQ, "text/plain"); | |
220 | + assert_cmpstr (su.origin, CompareOperator.EQ, "file://tmp"); | |
221 | + assert_cmpstr (su.storage, CompareOperator.EQ, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); | |
222 | ||
223 | var payload = ev.payload; | |
224 | assert (payload != null); | |
225 | - assert_cmpuint (payload.len, OperatorType.EQUAL, 3); | |
226 | - assert_cmpint (payload.data[0], OperatorType.EQUAL, 1); | |
227 | - assert_cmpint (payload.data[1], OperatorType.EQUAL, 2); | |
228 | - assert_cmpint (payload.data[2], OperatorType.EQUAL, 3); | |
229 | + assert_cmpuint (payload.len, CompareOperator.EQ, 3); | |
230 | + assert_cmpint (payload.data[0], CompareOperator.EQ, 1); | |
231 | + assert_cmpint (payload.data[1], CompareOperator.EQ, 2); | |
232 | + assert_cmpint (payload.data[2], CompareOperator.EQ, 3); | |
233 | } | |
234 | ||
235 | void from_variant_with_new_fields_test () | |
236 | @@ -210,29 +210,29 @@ void from_variant_with_new_fields_test () | |
237 | ||
238 | assert (ev.id == 27); | |
239 | assert (ev.timestamp == 68); | |
240 | - assert_cmpstr (ev.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); | |
241 | - assert_cmpstr (ev.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); | |
242 | - assert_cmpstr (ev.actor, OperatorType.EQUAL, "application://foo.desktop"); | |
243 | - assert_cmpstr (ev.origin, OperatorType.EQUAL, "origin"); | |
244 | - assert_cmpint (ev.num_subjects (), OperatorType.EQUAL, 1); | |
245 | + assert_cmpstr (ev.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); | |
246 | + assert_cmpstr (ev.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); | |
247 | + assert_cmpstr (ev.actor, CompareOperator.EQ, "application://foo.desktop"); | |
248 | + assert_cmpstr (ev.origin, CompareOperator.EQ, "origin"); | |
249 | + assert_cmpint (ev.num_subjects (), CompareOperator.EQ, 1); | |
250 | ||
251 | var su = ev.subjects[0]; | |
252 | - assert_cmpstr (su.uri, OperatorType.EQUAL, "file:///tmp/foo.txt"); | |
253 | - assert_cmpstr (su.interpretation, OperatorType.EQUAL, NFO.DOCUMENT); | |
254 | - assert_cmpstr (su.manifestation, OperatorType.EQUAL, NFO.FILE_DATA_OBJECT); | |
255 | - assert_cmpstr (su.mimetype, OperatorType.EQUAL, "text/plain"); | |
256 | - assert_cmpstr (su.origin, OperatorType.EQUAL, "file:///tmp"); | |
257 | - assert_cmpstr (su.text, OperatorType.EQUAL, "foo.text"); | |
258 | - assert_cmpstr (su.storage, OperatorType.EQUAL, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); | |
259 | - assert_cmpstr (su.current_uri, OperatorType.EQUAL, "file:///tmp/current.txt"); | |
260 | - assert_cmpstr (su.current_origin, OperatorType.EQUAL, "file:///tmp1"); | |
261 | + assert_cmpstr (su.uri, CompareOperator.EQ, "file:///tmp/foo.txt"); | |
262 | + assert_cmpstr (su.interpretation, CompareOperator.EQ, NFO.DOCUMENT); | |
263 | + assert_cmpstr (su.manifestation, CompareOperator.EQ, NFO.FILE_DATA_OBJECT); | |
264 | + assert_cmpstr (su.mimetype, CompareOperator.EQ, "text/plain"); | |
265 | + assert_cmpstr (su.origin, CompareOperator.EQ, "file:///tmp"); | |
266 | + assert_cmpstr (su.text, CompareOperator.EQ, "foo.text"); | |
267 | + assert_cmpstr (su.storage, CompareOperator.EQ, "36e5604e-7e1b-4ebd-bb6a-184c6ea99627"); | |
268 | + assert_cmpstr (su.current_uri, CompareOperator.EQ, "file:///tmp/current.txt"); | |
269 | + assert_cmpstr (su.current_origin, CompareOperator.EQ, "file:///tmp1"); | |
270 | ||
271 | var payload = ev.payload; | |
272 | assert (payload != null); | |
273 | - assert_cmpuint (payload.len, OperatorType.EQUAL, 3); | |
274 | - assert_cmpint (payload.data[0], OperatorType.EQUAL, 1); | |
275 | - assert_cmpint (payload.data[1], OperatorType.EQUAL, 2); | |
276 | - assert_cmpint (payload.data[2], OperatorType.EQUAL, 3); | |
277 | + assert_cmpuint (payload.len, CompareOperator.EQ, 3); | |
278 | + assert_cmpint (payload.data[0], CompareOperator.EQ, 1); | |
279 | + assert_cmpint (payload.data[1], CompareOperator.EQ, 2); | |
280 | + assert_cmpint (payload.data[2], CompareOperator.EQ, 3); | |
281 | ||
282 | } | |
283 | ||
284 | @@ -252,11 +252,11 @@ void empty_to_from_variant_test () | |
285 | ||
286 | assert (marshalled.id == 0); | |
287 | assert (marshalled.timestamp == orig.timestamp); | |
288 | - assert_cmpstr (marshalled.interpretation, OperatorType.EQUAL, null); | |
289 | - assert_cmpstr (marshalled.manifestation, OperatorType.EQUAL, null); | |
290 | - assert_cmpstr (marshalled.actor, OperatorType.EQUAL, null); | |
291 | - assert_cmpstr (marshalled.origin, OperatorType.EQUAL, null); | |
292 | - assert_cmpint (marshalled.num_subjects (), OperatorType.EQUAL, 0); | |
293 | + assert_cmpstr (marshalled.interpretation, CompareOperator.EQ, null); | |
294 | + assert_cmpstr (marshalled.manifestation, CompareOperator.EQ, null); | |
295 | + assert_cmpstr (marshalled.actor, CompareOperator.EQ, null); | |
296 | + assert_cmpstr (marshalled.origin, CompareOperator.EQ, null); | |
297 | + assert_cmpint (marshalled.num_subjects (), CompareOperator.EQ, 0); | |
298 | assert (marshalled.payload == null); | |
299 | } | |
300 | ||
301 | @@ -278,11 +278,11 @@ void with_one_subject_to_from_variant_test () | |
302 | var marshalled = new Event.from_variant (orig.to_variant ()); | |
303 | ||
304 | assert (marshalled.id == 0); | |
305 | - assert_cmpstr (marshalled.interpretation, OperatorType.EQUAL, ZG.ACCESS_EVENT); | |
306 | - assert_cmpstr (marshalled.manifestation, OperatorType.EQUAL, ZG.USER_ACTIVITY); | |
307 | - assert_cmpstr (marshalled.actor, OperatorType.EQUAL, "application://firefox.desktop"); | |
308 | - assert_cmpstr (marshalled.origin, OperatorType.EQUAL, "origin"); | |
309 | - assert_cmpint (marshalled.num_subjects (), OperatorType.EQUAL, 1); | |
310 | + assert_cmpstr (marshalled.interpretation, CompareOperator.EQ, ZG.ACCESS_EVENT); | |
311 | + assert_cmpstr (marshalled.manifestation, CompareOperator.EQ, ZG.USER_ACTIVITY); | |
312 | + assert_cmpstr (marshalled.actor, CompareOperator.EQ, "application://firefox.desktop"); | |
313 | + assert_cmpstr (marshalled.origin, CompareOperator.EQ, "origin"); | |
314 | + assert_cmpint (marshalled.num_subjects (), CompareOperator.EQ, 1); | |
315 | ||
316 | payload = marshalled.payload; | |
317 | assert (payload != null); | |
318 | @@ -290,14 +290,14 @@ void with_one_subject_to_from_variant_test () | |
319 | assert (payload.data[0] == 255); | |
320 | ||
321 | var su = marshalled.subjects[0]; | |
322 | - assert_cmpstr (su.uri, OperatorType.EQUAL, "http://example.com"); | |
323 | - assert_cmpstr (su.interpretation, OperatorType.EQUAL, NFO.WEBSITE); | |
324 | - assert_cmpstr (su.manifestation, OperatorType.EQUAL, NFO.REMOTE_DATA_OBJECT); | |
325 | - assert_cmpstr (su.mimetype, OperatorType.EQUAL, "text/html"); | |
326 | - assert_cmpstr (su.origin, OperatorType.EQUAL, "http://example.com"); | |
327 | - assert_cmpstr (su.text, OperatorType.EQUAL, "example.com"); | |
328 | - assert_cmpstr (su.storage, OperatorType.EQUAL, "net"); | |
329 | - assert_cmpstr (su.current_uri, OperatorType.EQUAL, "http://current-example.com"); | |
330 | + assert_cmpstr (su.uri, CompareOperator.EQ, "http://example.com"); | |
331 | + assert_cmpstr (su.interpretation, CompareOperator.EQ, NFO.WEBSITE); | |
332 | + assert_cmpstr (su.manifestation, CompareOperator.EQ, NFO.REMOTE_DATA_OBJECT); | |
333 | + assert_cmpstr (su.mimetype, CompareOperator.EQ, "text/html"); | |
334 | + assert_cmpstr (su.origin, CompareOperator.EQ, "http://example.com"); | |
335 | + assert_cmpstr (su.text, CompareOperator.EQ, "example.com"); | |
336 | + assert_cmpstr (su.storage, CompareOperator.EQ, "net"); | |
337 | + assert_cmpstr (su.current_uri, CompareOperator.EQ, "http://current-example.com"); | |
338 | } | |
339 | ||
340 | void three_events_to_from_variant_test () | |
341 | @@ -324,7 +324,7 @@ void zero_events_to_from_variant_test () | |
342 | var vevents = Events.to_variant (events); | |
343 | assert (vevents.n_children () == 0); | |
344 | events = Events.from_variant (vevents); | |
345 | - assert_cmpint (events.length, OperatorType.EQUAL, 0); | |
346 | + assert_cmpint (events.length, CompareOperator.EQ, 0); | |
347 | } | |
348 | ||
349 | // vim:expandtab:ts=4:sw=4 | |
350 | diff --git a/test/direct/marshalling-test.vala b/test/direct/marshalling-test.vala | |
351 | index befe39b..a611fe1 100644 | |
352 | --- a/test/direct/marshalling-test.vala | |
353 | +++ b/test/direct/marshalling-test.vala | |
354 | @@ -98,7 +98,7 @@ void events_test () | |
355 | Variant vevents = Events.to_variant (events); | |
356 | ||
357 | var demarshalled = Events.from_variant (vevents); | |
358 | - assert_cmpint (demarshalled.length, OperatorType.EQUAL, 1000); | |
359 | + assert_cmpint (demarshalled.length, CompareOperator.EQ, 1000); | |
360 | } | |
361 | ||
362 | void timerange_test () | |
363 | @@ -107,8 +107,8 @@ void timerange_test () | |
364 | { | |
365 | Variant v = new Variant("(xx)", i, i+42); | |
366 | TimeRange timerange = new TimeRange.from_variant (v); | |
367 | - assert_cmpint ((int) timerange.start, OperatorType.EQUAL, (int)i); | |
368 | - assert_cmpint ((int) timerange.end, OperatorType.EQUAL, (int)i+42); | |
369 | + assert_cmpint ((int) timerange.start, CompareOperator.EQ, (int)i); | |
370 | + assert_cmpint ((int) timerange.end, CompareOperator.EQ, (int)i+42); | |
371 | } | |
372 | } | |
373 | ||
374 | diff --git a/test/direct/mimetype-test.vala b/test/direct/mimetype-test.vala | |
375 | index f0b1bf0..327e4f7 100644 | |
376 | --- a/test/direct/mimetype-test.vala | |
377 | +++ b/test/direct/mimetype-test.vala | |
378 | @@ -42,18 +42,18 @@ int main (string[] args) | |
379 | ||
380 | public void mime_type_basic_test () | |
381 | { | |
382 | - assert_cmpstr (NFO.TEXT_DOCUMENT, OperatorType.EQUAL, | |
383 | + assert_cmpstr (NFO.TEXT_DOCUMENT, CompareOperator.EQ, | |
384 | interpretation_for_mimetype ("text/plain")); | |
385 | } | |
386 | ||
387 | public void mime_type_regex_test () | |
388 | { | |
389 | // We should have a fallack for application/x-applix-* | |
390 | - assert_cmpstr (NFO.DOCUMENT, OperatorType.EQUAL, | |
391 | + assert_cmpstr (NFO.DOCUMENT, CompareOperator.EQ, | |
392 | interpretation_for_mimetype ("application/x-applix-FOOBAR")); | |
393 | ||
394 | // Still application/x-applix-speadsheet should be a spreadsheet | |
395 | - assert_cmpstr (NFO.SPREADSHEET, OperatorType.EQUAL, | |
396 | + assert_cmpstr (NFO.SPREADSHEET, CompareOperator.EQ, | |
397 | interpretation_for_mimetype ("application/x-applix-spreadsheet")); | |
398 | } | |
399 | ||
400 | @@ -81,17 +81,17 @@ public void mime_type_registration_test () | |
401 | mime_type_regex_test (); | |
402 | mime_type_none_test (); | |
403 | ||
404 | - assert_cmpstr ("Bluebird", OperatorType.EQUAL, | |
405 | + assert_cmpstr ("Bluebird", CompareOperator.EQ, | |
406 | interpretation_for_mimetype ("awesome/bird")); | |
407 | - assert_cmpstr ("is nothing", OperatorType.EQUAL, | |
408 | + assert_cmpstr ("is nothing", CompareOperator.EQ, | |
409 | interpretation_for_mimetype ("everything/everywhere")); | |
410 | } | |
411 | ||
412 | public void uri_scheme_basic_test () | |
413 | { | |
414 | - assert_cmpstr (NFO.FILE_DATA_OBJECT, OperatorType.EQUAL, | |
415 | + assert_cmpstr (NFO.FILE_DATA_OBJECT, CompareOperator.EQ, | |
416 | manifestation_for_uri ("file:///tmp/foo.txt")); | |
417 | - assert_cmpstr (NFO.REMOTE_DATA_OBJECT, OperatorType.EQUAL, | |
418 | + assert_cmpstr (NFO.REMOTE_DATA_OBJECT, CompareOperator.EQ, | |
419 | manifestation_for_uri ("ftp://ftp.example.com")); | |
420 | } | |
421 | ||
422 | @@ -107,7 +107,7 @@ public void uri_scheme_registration_test () | |
423 | uri_scheme_basic_test (); | |
424 | uri_scheme_none_test (); | |
425 | ||
426 | - assert_cmpstr ("the answer", OperatorType.EQUAL, | |
427 | + assert_cmpstr ("the answer", CompareOperator.EQ, | |
428 | manifestation_for_uri ("42://what is it?")); | |
429 | } | |
430 | ||
431 | diff --git a/test/direct/symbol-test.vala b/test/direct/symbol-test.vala | |
432 | index e47024d..0261fe8 100644 | |
433 | --- a/test/direct/symbol-test.vala | |
434 | +++ b/test/direct/symbol-test.vala | |
435 | @@ -100,7 +100,7 @@ void is_uri_valid (string uri) | |
436 | void media_children_test () | |
437 | { | |
438 | var children = Symbol.get_children (NFO.MEDIA); | |
439 | - assert_cmpuint (children.length (), OperatorType.GREATER_THAN, 0); | |
440 | + assert_cmpuint (children.length (), CompareOperator.GT, 0); | |
441 | foreach (string uri in children) | |
442 | is_uri_valid (uri); | |
443 | } | |
444 | @@ -108,7 +108,7 @@ void media_children_test () | |
445 | void media_all_children_test () | |
446 | { | |
447 | var children = Symbol.get_all_children (NFO.MEDIA); | |
448 | - assert_cmpuint (children.length (), OperatorType.GREATER_THAN, 0); | |
449 | + assert_cmpuint (children.length (), CompareOperator.GT, 0); | |
450 | foreach (string uri in children) | |
451 | is_uri_valid (uri); | |
452 | } | |
453 | @@ -116,7 +116,7 @@ void media_all_children_test () | |
454 | void vector_image_parents_test () | |
455 | { | |
456 | var parents = Symbol.get_all_parents (NFO.VECTOR_IMAGE); | |
457 | - assert_cmpuint (parents.length (), OperatorType.GREATER_THAN, 0); | |
458 | + assert_cmpuint (parents.length (), CompareOperator.GT, 0); | |
459 | foreach (string uri in parents) | |
460 | is_uri_valid (uri); | |
461 | } | |
462 | @@ -126,8 +126,8 @@ void media_complex_test () | |
463 | var children = Symbol.get_children (NFO.MEDIA); | |
464 | var all_ch = Symbol.get_all_children (NFO.MEDIA); | |
465 | ||
466 | - assert_cmpuint (children.length (), OperatorType.GREATER_THAN, 0); | |
467 | - assert_cmpuint (all_ch.length (), OperatorType.GREATER_THAN, children.length ()); | |
468 | + assert_cmpuint (children.length (), CompareOperator.GT, 0); | |
469 | + assert_cmpuint (all_ch.length (), CompareOperator.GT, children.length ()); | |
470 | ||
471 | foreach (string uri in children) | |
472 | { | |
473 | diff --git a/test/direct/table-lookup-test.vala b/test/direct/table-lookup-test.vala | |
474 | index 0ce51ef..a5e25e1 100644 | |
475 | --- a/test/direct/table-lookup-test.vala | |
476 | +++ b/test/direct/table-lookup-test.vala | |
477 | @@ -58,15 +58,15 @@ public void basic_test () | |
478 | TableLookup table_lookup = new TableLookup (database, "actor"); | |
479 | ||
480 | int id = table_lookup.id_for_string ("1st-actor"); | |
481 | - assert_cmpint (table_lookup.id_for_string ("2nd-actor"), OperatorType.EQUAL, id+1); | |
482 | - assert_cmpint (table_lookup.id_for_string ("1st-actor"), OperatorType.EQUAL, id); | |
483 | + assert_cmpint (table_lookup.id_for_string ("2nd-actor"), CompareOperator.EQ, id+1); | |
484 | + assert_cmpint (table_lookup.id_for_string ("1st-actor"), CompareOperator.EQ, id); | |
485 | ||
486 | int rc = db.exec ("DELETE FROM actor WHERE value='1st-actor'"); | |
487 | assert (rc == Sqlite.OK); | |
488 | ||
489 | table_lookup.remove (1); | |
490 | - assert_cmpint (table_lookup.id_for_string ("2nd-actor"), OperatorType.EQUAL, id+1); | |
491 | - assert_cmpint (table_lookup.id_for_string ("1st-actor"), OperatorType.EQUAL, id+2); | |
492 | + assert_cmpint (table_lookup.id_for_string ("2nd-actor"), CompareOperator.EQ, id+1); | |
493 | + assert_cmpint (table_lookup.id_for_string ("1st-actor"), CompareOperator.EQ, id+2); | |
494 | } | |
495 | ||
496 | public void get_value_with_query_test () | |
497 | @@ -78,7 +78,7 @@ public void get_value_with_query_test () | |
498 | int rc = db.exec ("INSERT INTO actor (id, value) VALUES (100, 'new-actor')"); | |
499 | assert (rc == Sqlite.OK); | |
500 | ||
501 | - assert_cmpstr (table_lookup.get_value (100), OperatorType.EQUAL, "new-actor"); | |
502 | + assert_cmpstr (table_lookup.get_value (100), CompareOperator.EQ, "new-actor"); | |
503 | } | |
504 | ||
505 | public void engine_test () | |
506 | @@ -88,14 +88,14 @@ public void engine_test () | |
507 | unowned Sqlite.Database db = database.database; | |
508 | TableLookup table_lookup = engine.get_actors_table_lookup(); | |
509 | ||
510 | - assert_cmpint (table_lookup.id_for_string ("something"), OperatorType.EQUAL, 1); | |
511 | + assert_cmpint (table_lookup.id_for_string ("something"), CompareOperator.EQ, 1); | |
512 | ||
513 | // Since we're running with Engine, this should trigger the deletion | |
514 | // callback, which in turn should fix the cache (LP: #598666). | |
515 | int rc = db.exec ("DELETE FROM actor WHERE value='something'"); | |
516 | assert (rc == Sqlite.OK); | |
517 | ||
518 | - assert_cmpint (table_lookup.id_for_string ("something"), OperatorType.EQUAL, 2); | |
519 | + assert_cmpint (table_lookup.id_for_string ("something"), CompareOperator.EQ, 2); | |
520 | } | |
521 | ||
522 | // vim:expandtab:ts=4:sw=4 | |
523 | diff --git a/test/direct/where-clause-test.vala b/test/direct/where-clause-test.vala | |
524 | index e746daf..831a8c1 100644 | |
525 | --- a/test/direct/where-clause-test.vala | |
526 | +++ b/test/direct/where-clause-test.vala | |
527 | @@ -59,16 +59,16 @@ public void basic_test () | |
528 | where = new WhereClause (WhereClause.Type.AND); | |
529 | where.add ("1st condition"); | |
530 | where.add ("2nd condition"); | |
531 | - assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "(1st condition AND 2nd condition)"); | |
532 | + assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "(1st condition AND 2nd condition)"); | |
533 | ||
534 | where = new WhereClause (WhereClause.Type.OR); | |
535 | where.add ("1st condition"); | |
536 | where.add ("2nd condition"); | |
537 | - assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "(1st condition OR 2nd condition)"); | |
538 | + assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "(1st condition OR 2nd condition)"); | |
539 | ||
540 | where = new WhereClause (WhereClause.Type.AND, true); | |
541 | where.add ("some condition"); | |
542 | - assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "NOT some condition"); | |
543 | + assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "NOT some condition"); | |
544 | } | |
545 | ||
546 | public void nested_test () | |
547 | @@ -88,16 +88,16 @@ public void nested_test () | |
548 | where.extend (subwhere); | |
549 | where.add ("last condition"); | |
550 | ||
551 | - assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, | |
552 | + assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, | |
553 | "(1st condition AND (2nd condition OR 3rd condition) AND " + | |
554 | "last condition)"); | |
555 | ||
556 | { | |
557 | var args = where.get_bind_arguments (); | |
558 | - assert_cmpint (args.length, OperatorType.EQUAL, 3); | |
559 | - assert_cmpstr (args[0], OperatorType.EQUAL, "arg1"); | |
560 | - assert_cmpstr (args[1], OperatorType.EQUAL, "arg2"); | |
561 | - assert_cmpstr (args[2], OperatorType.EQUAL, "arg3"); | |
562 | + assert_cmpint (args.length, CompareOperator.EQ, 3); | |
563 | + assert_cmpstr (args[0], CompareOperator.EQ, "arg1"); | |
564 | + assert_cmpstr (args[1], CompareOperator.EQ, "arg2"); | |
565 | + assert_cmpstr (args[2], CompareOperator.EQ, "arg3"); | |
566 | } | |
567 | } | |
568 | ||
569 | @@ -112,7 +112,7 @@ public void nested_negation_test () | |
570 | where.extend (subwhere); | |
571 | where.add ("cond3"); | |
572 | ||
573 | - assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, | |
574 | + assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, | |
575 | "(cond1 OR NOT cond2 OR cond3)"); | |
576 | } | |
577 | ||
578 | @@ -123,14 +123,14 @@ public void match_condition_test () | |
579 | // Plain | |
580 | where = new WhereClause (WhereClause.Type.AND); | |
581 | where.add_match_condition ("field1", 5); | |
582 | - assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, | |
583 | + assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, | |
584 | "field1 = 5"); | |
585 | - assert_cmpint (where.get_bind_arguments ().length, OperatorType.EQUAL, 0); | |
586 | + assert_cmpint (where.get_bind_arguments ().length, CompareOperator.EQ, 0); | |
587 | ||
588 | // Negation | |
589 | where = new WhereClause (WhereClause.Type.AND); | |
590 | where.add_match_condition ("f2", 3, true); | |
591 | - assert_cmpstr (where.get_sql_conditions (), OperatorType.EQUAL, "f2 != 3"); | |
592 | + assert_cmpstr (where.get_sql_conditions (), CompareOperator.EQ, "f2 != 3"); | |
593 | ||
594 | // FIXME: test LIKE stuff... | |
595 | } | |
596 | @@ -138,9 +138,9 @@ public void match_condition_test () | |
597 | public void right_boundary_test () | |
598 | { | |
599 | var clause = new PublicWhereClause (WhereClause.Type.AND); | |
600 | - assert_cmpstr (clause.get_right_boundary ("a"), OperatorType.EQUAL, "b"); | |
601 | - assert_cmpstr (clause.get_right_boundary ("hello"), OperatorType.EQUAL, "hellp"); | |
602 | - assert_cmpstr (clause.get_right_boundary ("a b"), OperatorType.EQUAL, "a c"); | |
603 | + assert_cmpstr (clause.get_right_boundary ("a"), CompareOperator.EQ, "b"); | |
604 | + assert_cmpstr (clause.get_right_boundary ("hello"), CompareOperator.EQ, "hellp"); | |
605 | + assert_cmpstr (clause.get_right_boundary ("a b"), CompareOperator.EQ, "a c"); | |
606 | } | |
607 | ||
608 | // vim:expandtab:ts=4:sw=4 | |
609 | -- | |
610 | cgit v1.1 | |
611 |