Skip to content

Commit cf0ad13

Browse files
RandomByteRandomByte
committed
[INTERNAL] Adapt project tests to new formatter behavior
Application- and LibraryFormatter default the new "propertiesFileSourceEncoding" configuration to "ISO-8859-1"
1 parent 55fd74e commit cf0ad13

File tree

2 files changed

+45
-0
lines changed

2 files changed

+45
-0
lines changed

‎test/lib/extensions.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ test("Project with project-shim extension with dependency configuration", (t) =>
6565
},
6666
resources: {
6767
configuration: {
68+
propertiesFileSourceEncoding: "ISO-8859-1",
6869
paths: {
6970
webapp: "webapp"
7071
}
@@ -88,6 +89,7 @@ test("Project with project-shim extension with dependency configuration", (t) =>
8889
},
8990
resources: {
9091
configuration: {
92+
propertiesFileSourceEncoding: "ISO-8859-1",
9193
paths: {
9294
src: "src",
9395
test: "test"
@@ -176,6 +178,7 @@ test("Project with project-shim extension with dependency declaration and config
176178
},
177179
resources: {
178180
configuration: {
181+
propertiesFileSourceEncoding: "ISO-8859-1",
179182
paths: {
180183
webapp: "webapp"
181184
}
@@ -199,6 +202,7 @@ test("Project with project-shim extension with dependency declaration and config
199202
},
200203
resources: {
201204
configuration: {
205+
propertiesFileSourceEncoding: "ISO-8859-1",
202206
paths: {
203207
src: "src",
204208
test: "test"
@@ -224,6 +228,7 @@ test("Project with project-shim extension with dependency declaration and config
224228
},
225229
resources: {
226230
configuration: {
231+
propertiesFileSourceEncoding: "ISO-8859-1",
227232
paths: {
228233
src: "src",
229234
test: "test"
@@ -251,6 +256,7 @@ test("Project with project-shim extension with dependency declaration and config
251256
},
252257
resources: {
253258
configuration: {
259+
propertiesFileSourceEncoding: "ISO-8859-1",
254260
paths: {
255261
src: "src",
256262
test: "test"
@@ -345,6 +351,7 @@ test("Project with project-shim extension with collection", (t) => {
345351
},
346352
resources: {
347353
configuration: {
354+
propertiesFileSourceEncoding: "ISO-8859-1",
348355
paths: {
349356
webapp: "webapp"
350357
}
@@ -368,6 +375,7 @@ test("Project with project-shim extension with collection", (t) => {
368375
},
369376
resources: {
370377
configuration: {
378+
propertiesFileSourceEncoding: "ISO-8859-1",
371379
paths: {
372380
src: "src",
373381
test: "test"
@@ -393,6 +401,7 @@ test("Project with project-shim extension with collection", (t) => {
393401
},
394402
resources: {
395403
configuration: {
404+
propertiesFileSourceEncoding: "ISO-8859-1",
396405
paths: {
397406
src: "src",
398407
test: "test"
@@ -420,6 +429,7 @@ test("Project with project-shim extension with collection", (t) => {
420429
},
421430
resources: {
422431
configuration: {
432+
propertiesFileSourceEncoding: "ISO-8859-1",
423433
paths: {
424434
src: "src",
425435
test: "test"
@@ -474,6 +484,7 @@ test("Project with project-type extension dependency inline configuration", (t)
474484
},
475485
resources: {
476486
configuration: {
487+
propertiesFileSourceEncoding: "ISO-8859-1",
477488
paths: {
478489
root: ""
479490
}

‎test/lib/projectPreprocessor.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ test("Project with inline configuration", (t) => {
3232
},
3333
resources: {
3434
configuration: {
35+
propertiesFileSourceEncoding: "ISO-8859-1",
3536
paths: {
3637
webapp: "webapp"
3738
}
@@ -67,6 +68,7 @@ test("Project with configPath", (t) => {
6768
},
6869
resources: {
6970
configuration: {
71+
propertiesFileSourceEncoding: "ISO-8859-1",
7072
paths: {
7173
webapp: "webapp"
7274
}
@@ -102,6 +104,7 @@ test("Project with ui5.yaml at default location", (t) => {
102104
},
103105
resources: {
104106
configuration: {
107+
propertiesFileSourceEncoding: "ISO-8859-1",
105108
paths: {
106109
webapp: "webapp"
107110
}
@@ -137,6 +140,7 @@ test("Project with ui5.yaml at default location and some configuration", (t) =>
137140
},
138141
resources: {
139142
configuration: {
143+
propertiesFileSourceEncoding: "ISO-8859-1",
140144
paths: {
141145
webapp: "src"
142146
}
@@ -321,6 +325,7 @@ test("Ignores additional application-projects", (t) => {
321325
},
322326
resources: {
323327
configuration: {
328+
propertiesFileSourceEncoding: "ISO-8859-1",
324329
paths: {
325330
webapp: "webapp"
326331
}
@@ -362,6 +367,7 @@ test("Inconsistent dependencies with same ID", (t) => {
362367
},
363368
resources: {
364369
configuration: {
370+
propertiesFileSourceEncoding: "ISO-8859-1",
365371
paths: {
366372
src: "main/src",
367373
test: "main/test"
@@ -409,6 +415,7 @@ test("Inconsistent dependencies with same ID", (t) => {
409415
},
410416
resources: {
411417
configuration: {
418+
propertiesFileSourceEncoding: "ISO-8859-1",
412419
paths: {
413420
webapp: "webapp"
414421
}
@@ -433,6 +440,7 @@ test("Inconsistent dependencies with same ID", (t) => {
433440
},
434441
resources: {
435442
configuration: {
443+
propertiesFileSourceEncoding: "ISO-8859-1",
436444
paths: {
437445
src: "main/src",
438446
test: "main/test"
@@ -459,6 +467,7 @@ test("Inconsistent dependencies with same ID", (t) => {
459467
},
460468
resources: {
461469
configuration: {
470+
propertiesFileSourceEncoding: "ISO-8859-1",
462471
paths: {
463472
src: "src",
464473
test: "test"
@@ -488,6 +497,7 @@ test("Inconsistent dependencies with same ID", (t) => {
488497
},
489498
resources: {
490499
configuration: {
500+
propertiesFileSourceEncoding: "ISO-8859-1",
491501
paths: {
492502
src: "src",
493503
test: "test"
@@ -629,6 +639,7 @@ const expectedTreeWithInvalidModules = {
629639
"_level": 1,
630640
"resources": {
631641
"configuration": {
642+
"propertiesFileSourceEncoding": "ISO-8859-1",
632643
"paths": {
633644
"src": "src",
634645
"test": "test"
@@ -655,6 +666,7 @@ const expectedTreeWithInvalidModules = {
655666
"_level": 1,
656667
"resources": {
657668
"configuration": {
669+
"propertiesFileSourceEncoding": "ISO-8859-1",
658670
"paths": {
659671
"src": "src",
660672
"test": "test"
@@ -676,6 +688,7 @@ const expectedTreeWithInvalidModules = {
676688
"kind": "project",
677689
"resources": {
678690
"configuration": {
691+
"propertiesFileSourceEncoding": "ISO-8859-1",
679692
"paths": {
680693
"webapp": "webapp"
681694
}
@@ -708,6 +721,7 @@ const treeAWithInlineConfigs = {
708721
},
709722
resources: {
710723
configuration: {
724+
propertiesFileSourceEncoding: "ISO-8859-1",
711725
paths: {
712726
src: "main/src",
713727
test: "main/test"
@@ -813,6 +827,7 @@ const expectedTreeAWithInlineConfigs = {
813827
},
814828
"resources": {
815829
"configuration": {
830+
"propertiesFileSourceEncoding": "ISO-8859-1",
816831
"paths": {
817832
"webapp": "webapp"
818833
}
@@ -837,6 +852,7 @@ const expectedTreeAWithInlineConfigs = {
837852
},
838853
"resources": {
839854
"configuration": {
855+
"propertiesFileSourceEncoding": "ISO-8859-1",
840856
"paths": {
841857
"src": "main/src",
842858
"test": "main/test"
@@ -863,6 +879,7 @@ const expectedTreeAWithInlineConfigs = {
863879
},
864880
"resources": {
865881
"configuration": {
882+
"propertiesFileSourceEncoding": "ISO-8859-1",
866883
"paths": {
867884
"src": "src",
868885
"test": "test"
@@ -892,6 +909,7 @@ const expectedTreeAWithInlineConfigs = {
892909
},
893910
"resources": {
894911
"configuration": {
912+
"propertiesFileSourceEncoding": "ISO-8859-1",
895913
"paths": {
896914
"src": "src",
897915
"test": "test"
@@ -923,6 +941,7 @@ const expectedTreeAWithConfigPaths = {
923941
},
924942
"resources": {
925943
"configuration": {
944+
"propertiesFileSourceEncoding": "ISO-8859-1",
926945
"paths": {
927946
"webapp": "webapp"
928947
}
@@ -948,6 +967,7 @@ const expectedTreeAWithConfigPaths = {
948967
},
949968
"resources": {
950969
"configuration": {
970+
"propertiesFileSourceEncoding": "ISO-8859-1",
951971
"paths": {
952972
"src": "main/src",
953973
"test": "main/test"
@@ -975,6 +995,7 @@ const expectedTreeAWithConfigPaths = {
975995
},
976996
"resources": {
977997
"configuration": {
998+
"propertiesFileSourceEncoding": "ISO-8859-1",
978999
"paths": {
9791000
"src": "src",
9801001
"test": "test"
@@ -1005,6 +1026,7 @@ const expectedTreeAWithConfigPaths = {
10051026
},
10061027
"resources": {
10071028
"configuration": {
1029+
"propertiesFileSourceEncoding": "ISO-8859-1",
10081030
"paths": {
10091031
"src": "src",
10101032
"test": "test"
@@ -1052,6 +1074,7 @@ const treeBWithInlineConfigs = {
10521074
},
10531075
resources: {
10541076
configuration: {
1077+
propertiesFileSourceEncoding: "ISO-8859-1",
10551078
paths: {
10561079
src: "main/src",
10571080
test: "main/test"
@@ -1085,6 +1108,7 @@ const treeBWithInlineConfigs = {
10851108
},
10861109
resources: {
10871110
configuration: {
1111+
propertiesFileSourceEncoding: "ISO-8859-1",
10881112
paths: {
10891113
src: "main/src",
10901114
test: "main/test"
@@ -1122,6 +1146,7 @@ const expectedTreeBWithInlineConfigs = {
11221146
},
11231147
"resources": {
11241148
"configuration": {
1149+
"propertiesFileSourceEncoding": "ISO-8859-1",
11251150
"paths": {
11261151
"webapp": "webapp"
11271152
}
@@ -1146,6 +1171,7 @@ const expectedTreeBWithInlineConfigs = {
11461171
},
11471172
"resources": {
11481173
"configuration": {
1174+
"propertiesFileSourceEncoding": "ISO-8859-1",
11491175
"paths": {
11501176
"src": "src",
11511177
"test": "test"
@@ -1172,6 +1198,7 @@ const expectedTreeBWithInlineConfigs = {
11721198
},
11731199
"resources": {
11741200
"configuration": {
1201+
"propertiesFileSourceEncoding": "ISO-8859-1",
11751202
"paths": {
11761203
"src": "main/src",
11771204
"test": "main/test"
@@ -1198,6 +1225,7 @@ const expectedTreeBWithInlineConfigs = {
11981225
},
11991226
"resources": {
12001227
"configuration": {
1228+
"propertiesFileSourceEncoding": "ISO-8859-1",
12011229
"paths": {
12021230
"src": "src",
12031231
"test": "test"
@@ -1229,6 +1257,7 @@ const expectedTreeBWithInlineConfigs = {
12291257
},
12301258
"resources": {
12311259
"configuration": {
1260+
"propertiesFileSourceEncoding": "ISO-8859-1",
12321261
"paths": {
12331262
"src": "main/src",
12341263
"test": "main/test"
@@ -1255,6 +1284,7 @@ const expectedTreeBWithInlineConfigs = {
12551284
},
12561285
"resources": {
12571286
"configuration": {
1287+
"propertiesFileSourceEncoding": "ISO-8859-1",
12581288
"paths": {
12591289
"src": "src",
12601290
"test": "test"
@@ -1407,6 +1437,7 @@ const expectedTreeApplicationCycleA = {
14071437
"_level": 2,
14081438
"resources": {
14091439
"configuration": {
1440+
"propertiesFileSourceEncoding": "ISO-8859-1",
14101441
"paths": {
14111442
"src": "src",
14121443
"test": "test"
@@ -1446,6 +1477,7 @@ const expectedTreeApplicationCycleA = {
14461477
"_level": 2,
14471478
"resources": {
14481479
"configuration": {
1480+
"propertiesFileSourceEncoding": "ISO-8859-1",
14491481
"paths": {
14501482
"src": "src",
14511483
"test": "test"
@@ -1474,6 +1506,7 @@ const expectedTreeApplicationCycleA = {
14741506
"_level": 1,
14751507
"resources": {
14761508
"configuration": {
1509+
"propertiesFileSourceEncoding": "ISO-8859-1",
14771510
"paths": {
14781511
"src": "src",
14791512
"test": "test"
@@ -1490,6 +1523,7 @@ const expectedTreeApplicationCycleA = {
14901523
"kind": "project",
14911524
"resources": {
14921525
"configuration": {
1526+
"propertiesFileSourceEncoding": "ISO-8859-1",
14931527
"paths": {
14941528
"webapp": "webapp"
14951529
}

0 commit comments

Comments
 (0)