Skip to content

Commit c8be983

Browse files
dourouc05dourouc05
committed
Adapt tests to output_var annotation.
1 parent 25da1ad commit c8be983

File tree

1 file changed

+59
-59
lines changed

1 file changed

+59
-59
lines changed

‎test/FlatZinc/FlatZinc.jl

+59-59
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,14 @@
143143
write(io, m)
144144
fzn = String(take!(io))
145145

146-
@test fzn == """var -1.7976931348623157e308..0.0: x1;
147-
var float: x2 = 0.0;
148-
var 0.0..1.0: x3;
149-
var -9223372036854775808..0: x4;
150-
var int: x5 = 0;
151-
var 0..1: x6;
152-
var bool: x7 = false;
153-
var float: x8;
146+
@test fzn == """var -1.7976931348623157e308..0.0: x1 :: output_var;
147+
var float: x2 :: output_var = 0.0;
148+
var 0.0..1.0: x3 :: output_var;
149+
var -9223372036854775808..0: x4 :: output_var;
150+
var int: x5 :: output_var = 0;
151+
var 0..1: x6 :: output_var;
152+
var bool: x7 :: output_var = false;
153+
var float: x8 :: output_var;
154154
155155
156156
@@ -230,16 +230,16 @@
230230
write(io, m)
231231
fzn = String(take!(io))
232232

233-
@test fzn == """var int: x1;
234-
var int: x2;
235-
var int: x3;
236-
var int: x4;
237-
var int: x5;
238-
var float: x6;
239-
var float: x7;
240-
var float: x8;
241-
var float: x9;
242-
var float: x10;
233+
@test fzn == """var int: x1 :: output_var;
234+
var int: x2 :: output_var;
235+
var int: x3 :: output_var;
236+
var int: x4 :: output_var;
237+
var int: x5 :: output_var;
238+
var float: x6 :: output_var;
239+
var float: x7 :: output_var;
240+
var float: x8 :: output_var;
241+
var float: x9 :: output_var;
242+
var float: x10 :: output_var;
243243
244244
245245
@@ -320,12 +320,12 @@
320320
write(io, m)
321321
fzn = String(take!(io))
322322

323-
@test fzn == """var int: x1;
324-
var int: x2;
325-
var bool: x3;
326-
var bool: x4;
327-
var float: x5;
328-
var float: x6;
323+
@test fzn == """var int: x1 :: output_var;
324+
var int: x2 :: output_var;
325+
var bool: x3 :: output_var;
326+
var bool: x4 :: output_var;
327+
var float: x5 :: output_var;
328+
var float: x6 :: output_var;
329329
330330
331331
array [1..3] of int: ARRAY0 = [6, 5, 4];
@@ -391,10 +391,10 @@
391391
write(io, m)
392392
fzn = String(take!(io))
393393

394-
@test fzn == """var int: x1;
395-
var int: x2;
396-
var float: x3;
397-
var float: x4;
394+
@test fzn == """var int: x1 :: output_var;
395+
var int: x2 :: output_var;
396+
var float: x3 :: output_var;
397+
var float: x4 :: output_var;
398398
399399
400400
@@ -436,7 +436,7 @@
436436
write(io, m)
437437
fzn = String(take!(io))
438438

439-
@test fzn == """var int: x1;
439+
@test fzn == """var int: x1 :: output_var;
440440
441441
set of int: SET0 = {0, 2, 1};
442442
@@ -475,7 +475,7 @@
475475
write(io, m)
476476
fzn = String(take!(io))
477477

478-
@test fzn == """var float: x1;
478+
@test fzn == """var float: x1 :: output_var;
479479
480480
481481
@@ -601,12 +601,12 @@
601601
write(io, m)
602602
fzn = String(take!(io))
603603

604-
@test fzn == """var int: x1;
605-
var int: x2;
606-
var bool: x3;
607-
var bool: x4;
608-
var float: x5;
609-
var float: x6;
604+
@test fzn == """var int: x1 :: output_var;
605+
var int: x2 :: output_var;
606+
var bool: x3 :: output_var;
607+
var bool: x4 :: output_var;
608+
var float: x5 :: output_var;
609+
var float: x6 :: output_var;
610610
611611
612612
@@ -678,8 +678,8 @@
678678
write(io, m)
679679
fzn = String(take!(io))
680680

681-
@test fzn == """var int: x1;
682-
var bool: x2;
681+
@test fzn == """var int: x1 :: output_var;
682+
var bool: x2 :: output_var;
683683
684684
685685
@@ -735,7 +735,7 @@
735735
write(io, m)
736736
fzn = String(take!(io))
737737

738-
@test fzn == """var float: x1;
738+
@test fzn == """var float: x1 :: output_var;
739739
740740
741741
@@ -794,8 +794,8 @@
794794
write(io, m)
795795
fzn = String(take!(io))
796796

797-
@test fzn == """var bool: x1;
798-
var int: x2;
797+
@test fzn == """var bool: x1 :: output_var;
798+
var int: x2 :: output_var;
799799
800800
801801
@@ -854,8 +854,8 @@
854854
write(io, m)
855855
fzn = String(take!(io))
856856

857-
@test fzn == """var bool: x1;
858-
var float: x2;
857+
@test fzn == """var bool: x1 :: output_var;
858+
var float: x2 :: output_var;
859859
860860
861861
@@ -928,10 +928,10 @@
928928
write(io, m)
929929
fzn = String(take!(io))
930930

931-
@test fzn == """var bool: x1;
932-
var bool: x2;
933-
var int: x3;
934-
var int: x4;
931+
@test fzn == """var bool: x1 :: output_var;
932+
var bool: x2 :: output_var;
933+
var int: x3 :: output_var;
934+
var int: x4 :: output_var;
935935
936936
937937
@@ -1003,10 +1003,10 @@
10031003
write(io, m)
10041004
fzn = String(take!(io))
10051005

1006-
@test fzn == """var bool: x1;
1007-
var bool: x2;
1008-
var int: x3;
1009-
var float: x4;
1006+
@test fzn == """var bool: x1 :: output_var;
1007+
var bool: x2 :: output_var;
1008+
var int: x3 :: output_var;
1009+
var float: x4 :: output_var;
10101010
10111011
10121012
@@ -1051,12 +1051,12 @@
10511051
write(io, m)
10521052
fzn = String(take!(io))
10531053

1054-
@test fzn == """var int: x_x;
1055-
var bool: y_1;
1056-
var bool: y_2;
1057-
var bool: y_3;
1058-
var bool: y_4;
1059-
var bool: y_5;
1054+
@test fzn == """var int: x_x :: output_var;
1055+
var bool: y_1 :: output_var;
1056+
var bool: y_2 :: output_var;
1057+
var bool: y_3 :: output_var;
1058+
var bool: y_4 :: output_var;
1059+
var bool: y_5 :: output_var;
10601060
10611061
10621062
@@ -1093,7 +1093,7 @@
10931093
write(io, m)
10941094
fzn = String(take!(io))
10951095

1096-
@test fzn == """var int: x1;
1096+
@test fzn == """var int: x1 :: output_var;
10971097
10981098
10991099
@@ -1124,7 +1124,7 @@
11241124
write(io, m)
11251125
fzn = String(take!(io))
11261126

1127-
@test fzn == """var int: x1;
1127+
@test fzn == """var int: x1 :: output_var;
11281128
11291129
11301130

0 commit comments

Comments
 (0)