Skip to content

Commit 50bc581

Browse files
theshadowcotheshadowco
committed
фикс тестов
1 parent 1c04a3f commit 50bc581

File tree

43 files changed

+17249
-12791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+17249
-12791
lines changed

‎src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/RoleDataConverter.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ private static RoleData.ObjectRight readObjectRight(HierarchicalStreamReader rea
7474
builder.right(right);
7575
} else {
7676
var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
77-
assert fieldClass != null;
77+
if(fieldClass == null) {
78+
continue;
79+
}
7880
var value = ExtendXStream.readValue(context, fieldClass);
7981
TransformationUtils.setValue(builder, name, value);
8082
}
@@ -91,7 +93,9 @@ private static RoleData.Right readRight(HierarchicalStreamReader reader, Unmarsh
9193
reader.moveDown();
9294
var name = reader.getNodeName();
9395
var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
94-
assert fieldClass != null;
96+
if (fieldClass == null) {
97+
continue;
98+
}
9599
var value = ExtendXStream.readValue(context, fieldClass);
96100
TransformationUtils.setValue(builder, name, value);
97101
reader.moveUp();

‎src/test/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationTest.java‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050

5151
@Slf4j
5252
class ConfigurationTest {
53+
5354
@ParameterizedTest
5455
@CsvSource(
5556
{
@@ -83,18 +84,18 @@ void testFullSSL(ArgumentsAccessor argumentsAccessor) {
8384
.allMatch(module -> module.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
8485

8586
assertThat(cf.getAllModules())
86-
.hasSize(1320 + cf.getCommonModules().size())
87+
.hasSize(2162)
8788
.allMatch(module -> module.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
8889

8990
// проверка состава дочерних
9091
checkChildrenSSL(cf);
9192

9293
assertThat(cf.getPlainChildren())
93-
.hasSize(8038)
94+
.hasSize(9810)
9495
.allMatch(md -> md.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
9596

9697
assertThat(cf.getModulesByType())
97-
.hasSize(1792)
98+
.hasSize(2162)
9899
.containsValue(ModuleType.FormModule)
99100
;
100101

@@ -113,7 +114,7 @@ void testFullSSL(ArgumentsAccessor argumentsAccessor) {
113114
;
114115

115116
assertThat(cf.getModulesByObject())
116-
.hasSize(1792)
117+
.hasSize(2162)
117118
.containsValue(cf.findChild(MdoReference.create("BusinessProcess.Задание.Form.ДействиеВыполнить")).get())
118119
;
119120

@@ -169,7 +170,7 @@ void testFullSSL(ArgumentsAccessor argumentsAccessor) {
169170
assertThat(cf.getChildren().stream().filter(md -> md instanceof Form form && !form.getData().isEmpty()))
170171
.hasSize(cf.getCommonForms().size());
171172
assertThat(cf.getPlainChildren().stream().filter(md -> md instanceof Form form && !form.getData().isEmpty()))
172-
.hasSize(726);
173+
.hasSize(857);
173174
assertThat(cf.getPlainChildren().stream().filter(md -> md instanceof Form form && form.getData().isEmpty()))
174175
.isEmpty();
175176

@@ -279,20 +280,20 @@ void testFullSSLSkipAll(ArgumentsAccessor argumentsAccessor) {
279280
.allMatch(module -> module.getSupportVariant().equals(SupportVariant.NONE));
280281

281282
assertThat(cf.getAllModules())
282-
.hasSize(1320 + cf.getCommonModules().size())
283+
.hasSize(2162)
283284
.allMatch(module -> module.getSupportVariant().equals(SupportVariant.NONE));
284285

285286
assertThat(cf.getPlainChildren())
286-
.hasSize(8038)
287+
.hasSize(9810)
287288
.allMatch(md -> md.getSupportVariant().equals(SupportVariant.NONE));
288289

289290
assertThat(cf.getRoles())
290-
.hasSize(86)
291+
.hasSize(103)
291292
.allMatch(role -> role.getData() == RoleData.EMPTY)
292293
;
293294

294295
assertThat(cf.getXDTOPackages())
295-
.hasSize(38)
296+
.hasSize(49)
296297
.allMatch(xdtoPackage -> xdtoPackage.getData() == XdtoPackageData.EMPTY)
297298
;
298299

@@ -304,7 +305,7 @@ void testFullSSLSkipAll(ArgumentsAccessor argumentsAccessor) {
304305
.toList();
305306

306307
assertThat(forms)
307-
.hasSize(632)
308+
.hasSize(752)
308309
.allMatch(form -> form.getData().getPlainItems().isEmpty());
309310

310311
var templates = cf.getPlainChildren().stream()
@@ -315,7 +316,7 @@ void testFullSSLSkipAll(ArgumentsAccessor argumentsAccessor) {
315316
.toList();
316317

317318
assertThat(templates)
318-
.hasSize(89)
319+
.hasSize(128)
319320
.allMatch(template -> template.getData().isEmpty());
320321
}
321322

@@ -363,93 +364,95 @@ private static void checkChildrenSSL(Configuration cf) {
363364
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
364365

365366
assertThat(cf.getCommonModules())
366-
.hasSize(472)
367+
.hasSize(556)
367368
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
368369

369370
assertThat(cf.getSessionParameters())
370-
.hasSize(57)
371+
.hasSize(62)
371372
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
372373

373374
assertThat(cf.getRoles())
374-
.hasSize(86)
375+
.hasSize(103)
375376
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
376377

377378
assertThat(cf.getCommonAttributes())
378-
.hasSize(6)
379+
.hasSize(7)
379380
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
380381

381382
assertThat(cf.getExchangePlans())
382383
.hasSize(1)
383384
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
384385

385386
assertThat(cf.getFilterCriteria())
386-
.hasSize(2)
387+
.hasSize(1)
387388
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
388389

389390
assertThat(cf.getEventSubscriptions())
390-
.hasSize(88)
391+
.hasSize(91)
391392
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
392393

393394
assertThat(cf.getScheduledJobs())
394-
.hasSize(38)
395+
.hasSize(49)
395396
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
396397

397398
assertThat(cf.getBots()).isEmpty();
398399

399400
assertThat(cf.getFunctionalOptions())
400-
.hasSize(65)
401+
.hasSize(74)
401402
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
402403

403404
assertThat(cf.getFunctionalOptionsParameters())
404-
.hasSize(3)
405+
.hasSize(4)
405406
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
406407

407408
assertThat(cf.getDefinedTypes())
408-
.hasSize(63)
409+
.hasSize(72)
409410
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
410411

411412
assertThat(cf.getSettingsStorages())
412413
.hasSize(1)
413414
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
414415

415416
assertThat(cf.getCommonForms())
416-
.hasSize(94)
417+
.hasSize(105)
417418
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
418419

419420
assertThat(cf.getCommonCommands())
420-
.hasSize(58)
421+
.hasSize(61)
421422
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
422423

423424
assertThat(cf.getCommandGroups())
424425
.hasSize(6)
425426
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
426427

427428
assertThat(cf.getCommonTemplates())
428-
.hasSize(9)
429+
.hasSize(15)
429430
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
430431

431432
assertThat(cf.getCommonPictures())
432-
.hasSize(395)
433+
.hasSize(567)
433434
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
434435

435436
assertThat(cf.getInterfaces()).isEmpty();
436437

437438
assertThat(cf.getXDTOPackages())
438-
.hasSize(38)
439+
.hasSize(49)
439440
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
440441

441442
assertThat(cf.getWebServices())
442-
.hasSize(11)
443+
.hasSize(13)
443444
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
444445

445-
assertThat(cf.getHttpServices()).isEmpty();
446+
assertThat(cf.getHttpServices())
447+
.hasSize(1)
448+
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
446449

447450
assertThat(cf.getWsReferences()).isEmpty();
448451

449452
assertThat(cf.getIntegrationServices()).isEmpty();
450453

451454
assertThat(cf.getStyleItems())
452-
.hasSize(74)
455+
.hasSize(92)
453456
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
454457

455458
assertThat(cf.getStyles()).isEmpty();
@@ -459,15 +462,15 @@ private static void checkChildrenSSL(Configuration cf) {
459462
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
460463

461464
assertThat(cf.getConstants())
462-
.hasSize(135)
465+
.hasSize(167)
463466
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
464467

465468
assertThat(cf.getCatalogs())
466-
.hasSize(64)
469+
.hasSize(72)
467470
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
468471

469472
assertThat(cf.getDocuments())
470-
.hasSize(10)
473+
.hasSize(11)
471474
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
472475

473476
assertThat(cf.getDocumentNumerators()).isEmpty();
@@ -479,15 +482,15 @@ private static void checkChildrenSSL(Configuration cf) {
479482
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
480483

481484
assertThat(cf.getEnums())
482-
.hasSize(80)
485+
.hasSize(98)
483486
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
484487

485488
assertThat(cf.getReports())
486-
.hasSize(28)
489+
.hasSize(41)
487490
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
488491

489492
assertThat(cf.getDataProcessors())
490-
.hasSize(68)
493+
.hasSize(77)
491494
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
492495

493496
assertThat(cf.getChartsOfCharacteristicTypes())
@@ -499,7 +502,7 @@ private static void checkChildrenSSL(Configuration cf) {
499502
assertThat(cf.getChartsOfCalculationTypes()).isEmpty();
500503

501504
assertThat(cf.getInformationRegisters())
502-
.hasSize(154)
505+
.hasSize(187)
503506
.allMatch(mdo -> mdo.getSupportVariant().equals(SupportVariant.NOT_EDITABLE));
504507

505508
assertThat(cf.getAccumulationRegisters()).isEmpty();

‎src/test/java/com/github/_1c_syntax/bsl/mdclasses/MDClassesTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import static org.assertj.core.api.Assertions.assertThat;
2929

3030
class MDClassesTest {
31+
3132
@Test
3233
void createConfigurations() {
3334
var srcPath = Paths.get("src/test/resources/ext");

‎src/test/java/com/github/_1c_syntax/bsl/mdclasses/helpers/RightsTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void rightAccessCf() {
5757
mdv = cf.findChild("Task.ЗадачаИсполнителя.Command.Перенаправить");
5858
assertThat(mdv).isPresent();
5959
md = mdv.get();
60-
assertThat(Rights.rightAccess(cf, RoleRight.VIEW, md)).isTrue();
60+
assertThat(Rights.rightAccess(cf, RoleRight.VIEW, md)).isFalse();
6161
assertThat(Rights.rightAccess(cf, RoleRight.USE, md)).isFalse();
6262
assertThat(cf.rightAccess(RoleRight.START, md)).isFalse();
6363

@@ -105,21 +105,21 @@ void rolesAccessCf() {
105105
.anyMatch(role -> role.getName().equals("ЗапускТолстогоКлиента"));
106106

107107
assertThat(Rights.rolesAccess(cf, RoleRight.ALL_FUNCTIONS_MODE)).isEmpty();
108-
assertThat(cf.rolesAccess(RoleRight.ANALYTICS_SYSTEM_CLIENT)).hasSize(26);
108+
assertThat(cf.rolesAccess(RoleRight.ANALYTICS_SYSTEM_CLIENT)).hasSize(78);
109109

110110
var mdv = cf.findChild("Document.Анкета");
111111
assertThat(mdv).isPresent();
112112
var md = mdv.get();
113113
assertThat(Rights.rolesAccess(cf, RoleRight.DELETE, md)).hasSize(1);
114114
assertThat(Rights.rolesAccess(cf, RoleRight.INTERACTIVE_DELETE, md)).isEmpty();
115-
assertThat(Rights.rolesAccess(cf, RoleRight.VIEW, md)).hasSize(2);
115+
assertThat(Rights.rolesAccess(cf, RoleRight.VIEW, md)).hasSize(1);
116116
assertThat(Rights.rolesAccess(cf, RoleRight.USE, md)).isEmpty();
117117
assertThat(cf.rolesAccess(RoleRight.INTERACTIVE_DELETE_MARKED, md)).isEmpty();
118118

119119
mdv = cf.findChild("Task.ЗадачаИсполнителя.Command.Перенаправить");
120120
assertThat(mdv).isPresent();
121121
md = mdv.get();
122-
assertThat(Rights.rolesAccess(cf, RoleRight.VIEW, md)).hasSize(4);
122+
assertThat(Rights.rolesAccess(cf, RoleRight.VIEW, md)).isEmpty();
123123
assertThat(Rights.rolesAccess(cf, RoleRight.USE, md)).isEmpty();
124124
assertThat(cf.rolesAccess(RoleRight.DELETE, md)).isEmpty();
125125

‎src/test/java/com/github/_1c_syntax/bsl/mdo/ExchangePlanTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import static org.assertj.core.api.Assertions.assertThat;
3232

3333
class ExchangePlanTest {
34+
3435
@ParameterizedTest
3536
@CsvSource(
3637
{
@@ -79,6 +80,6 @@ void testSSL(ArgumentsAccessor argumentsAccessor) {
7980
assertThat(exchangePlan.autoRecord(mdo3)).isEqualTo(AutoRecordType.DENY);
8081
assertThat(exchangePlan.isDistributedInfoBase()).isFalse();
8182
assertThat(exchangePlan.isIncludeConfigurationExtensions()).isFalse();
82-
assertThat(exchangePlan.getContent()).hasSize(349);
83+
assertThat(exchangePlan.getContent()).hasSize(406);
8384
}
8485
}

‎src/test/java/com/github/_1c_syntax/bsl/mdo/FilterCriterionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class FilterCriterionTest {
3232
{
3333
"true, mdclasses, FilterCriteria.КритерийОтбора1, _edt",
3434
"false, mdclasses, FilterCriteria.КритерийОтбора1",
35-
"true, ssl_3_1, FilterCriteria.ФайлыВТоме, _edt",
36-
"false, ssl_3_1, FilterCriteria.ФайлыВТоме"
35+
"true, ssl_3_1, FilterCriteria.СвязанныеДокументы, _edt",
36+
"false, ssl_3_1, FilterCriteria.СвязанныеДокументы"
3737
}
3838
)
3939
void test(ArgumentsAccessor argumentsAccessor) {

0 commit comments

Comments
 (0)