From 3ca4963e4dc5d43167dc930d4a98c8ddbfcbd066 Mon Sep 17 00:00:00 2001 From: Vadim Geraskin Date: Mon, 23 Dec 2024 19:48:30 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=20EDT=202024.2=20(#1458)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Поднятие версий com._1c.g5.v8.dt.form * Перевод таргета на 2024.2 * Подъем версий в dt.bsl.comment * G5V8DT-25485 * Поднятие версий com.e1c.g5.v8.dt.cli.api (#1468) * Исправление ошибок в сообщениях * Поднятие версий com._1c.g5.v8.dt.ui.util * Исправление ошибок в сообщениях * Fix build.yml * G5V8DT-25849 Нет переноса строки при создании новой области в модуле * Revert "G5V8DT-25849 Нет переноса строки при создании новой области в модуле" This reverts commit af7a6669551e4ded71332eada7a125e37888548b. * G5V8DT-25849 Нет переноса строки при создании новой области в модуле * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах (#1467) * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах * G5V8DT-24042 fix build-ci * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах * G5V8DT-24042: Запуск билда без ожидания всего WS Для защиты от блокировки нескольких проектов во время ожидания --------- Co-authored-by: Alexander Tretyakevich * Исправлена версия зависимостей на theming.ui.util * G5V8DT-24085 DcsOutputParameters содержит несуществующие поля Versioning * G5V8DT-26116 При добавлении модулей излишне добавляется область * Update build.yml Removed wrong goal from maven build * Update build.yml Removed verbose output * G5V8DT-25625 Повышение гибкости настройки индексов (#1478) Поднятие версий --------- Co-authored-by: Alexander Tretyakevich Co-authored-by: Almaz Nasibullin Co-authored-by: Maxim Dzyuba Co-authored-by: MaksimDzyuba <77277424+MaksimDzyuba@users.noreply.github.com> Co-authored-by: Dmitry Savenko Co-authored-by: Nikita Kuznetsov Co-authored-by: Alexander Tretyakevich --- .github/workflows/build.yml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 8 +- .../ModuleStructurePropertyPage.java | 8 +- .../services/BslModuleRegionsInfoService.java | 5 +- ...tructureNewWizardRelatedModelsFactory.java | 23 +- .../META-INF/MANIFEST.MF | 4 +- .../bsl/IModuleStructureProvider.java | 4 +- .../internal/bsl/ModuleStructureProvider.java | 9 +- .../templates/en/common_module_reusable.bsl | 12 + .../templates/ru/common_module_reusable.bsl | 12 + .../META-INF/MANIFEST.MF | 6 +- .../FormItemsSingleEventHandlerCheck.java | 33 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- targets/default/default.target | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../itests/AbstractSingleModuleTestBase.java | 111 +++- ...bilityAtClientInObjectModuleCheckTest.java | 27 +- .../AttachableEventHandlerNameCheckTest.java | 4 +- .../itests/BeginTransactionCheckTest.java | 5 +- .../itests/CanonicalPragmaCheckTest.java | 4 +- ...geAndValidateInsteadOfAroundCheckTest.java | 6 +- .../itests/CodeAfterAsyncCallCheckTest.java | 6 +- .../itests/CommitTransactionCheckTest.java | 9 +- .../CommonModuleMissingApiCheckTest.java | 4 +- ...mmonModuleNamedSelfReferenceCheckTest.java | 7 +- .../ConsecutiveEmptyLinesCheckTest.java | 4 +- ...edureOutsideDeprecatedRegionCheckTest.java | 12 +- .../itests/EmptyExceptStatementCheckTest.java | 4 +- .../EventDataExchangeLoadCheckTest.java | 8 +- .../EventHandlerBooleanParamCheckTest.java | 28 +- ...ortMethodInCommandFormModuleCheckTest.java | 13 +- ...xportProcedureMissingCommentCheckTest.java | 10 +- ...ExportVariableInObjectModuleCheckTest.java | 4 +- .../ExtensionMethodPrefixCheckTest.java | 4 +- .../ExtensionVariablePrefixCheckTest.java | 4 +- .../FormModuleMissingPragmaCheckTest.java | 15 +- .../itests/FormModulePragmaCheckTest.java | 4 +- .../FormSelfReferenceOutdatedCheckTest.java | 13 +- .../InvocationFormEventHandlerCheckTest.java | 10 +- .../bsl/check/itests/IsInRoleCheckTest.java | 5 +- .../IsInRoleMethodRoleExistCheckTest.java | 12 +- .../check/itests/LockOutOfTryCheckTest.java | 8 +- ...agerModuleNamedSelfReferenceCheckTest.java | 14 +- .../bsl/check/itests/Messages.java | 497 +++++++++++++++++ ...ionalParameterBeforeRequiredCheckTest.java | 12 +- .../itests/MethodTooManyPramsCheckTest.java | 24 +- ...MissingTemporaryFileDeletionCheckTest.java | 15 +- .../itests/ModuleEmptyMethodCheckTest.java | 14 +- ...uleStructureEventFormRegionsCheckTest.java | 61 ++- .../ModuleStructureEventRegionsCheckTest.java | 6 +- ...uleStructureInitCodeInRegionCheckTest.java | 6 +- ...oduleStructureMethodInRegionCheckTest.java | 18 +- .../ModuleStructureTopRegionCheckTest.java | 33 +- ...leStructureVariablesInRegionCheckTest.java | 8 +- .../ModuleUnusedLocalVariableCheckTest.java | 4 +- .../itests/ModuleUnusedMethodCheckTest.java | 4 +- .../bsl/check/itests/NewColorCheckTest.java | 8 +- .../bsl/check/itests/NewFontCheckTest.java | 6 +- ...escriptionToServerProcedureCheck2Test.java | 21 +- ...escriptionToServerProcedureCheck3Test.java | 14 +- ...DescriptionToServerProcedureCheckTest.java | 15 +- .../NstrStringLiteralFormatCheckTest.java | 16 +- .../OptionalFormParameterAccessCheckTest.java | 4 +- .../itests/PublicMethodCachingCheckTest.java | 4 +- .../check/itests/QueryInLoopCheckTest.java | 4 +- ...eadingAttributesFromDataBaseCheckTest.java | 6 +- .../RedundantExportMethodCheckTest.java | 6 +- .../check/itests/RegionEmptyCheckTest.java | 10 +- .../itests/RollbackTransactionCheckTest.java | 10 +- .../check/itests/SelfReferenceCheckTest.java | 60 +- .../ServerExecutionSafeModeCheckTest.java | 26 +- .../StructureCtorTooManyKeysCheckTest.java | 4 +- .../UnknownFormParameterAccessCheckTest.java | 17 +- .../itests/UseGotoOperatorCheckTest.java | 22 +- .../itests/UseNonRecommendedMethodsTest.java | 18 +- .../itests/UsingFormDataToValueCheckTest.java | 6 +- .../itests/VariableNameInvalidCheckTest.java | 22 +- .../bsl/check/itests/messages.properties | 515 ++++++++++++++++++ .../bsl/check/itests/messages_ru.properties | 515 ++++++++++++++++++ .../CollectionTypeDefinitionCheckTest.java | 4 +- .../itests/DocCommentUseMinusCheckTest.java | 13 +- .../ExportFunctionReturnSectionCheckTest.java | 14 +- ...tProcedureCommentDescriptionCheckTest.java | 4 +- .../itests/FieldDefinitionNameCheckTest.java | 6 +- .../itests/FieldDefinitionTypeCheckTest.java | 4 +- ...eldDefinitionTypeWithLinkRefCheckTest.java | 4 +- .../FunctionReturnSectionCheckTest.java | 16 +- ...ultilineDescriptionEndsOnDotCheckTest.java | 4 +- ...neDescriptionFieldSuggestionCheckTest.java | 4 +- ...scriptionParameterSuggestionCheckTest.java | 4 +- .../itests/ParametersSectionCheckTest.java | 45 +- .../ProcedureReturnSectionCheckTest.java | 4 +- .../RedundantParametersSectionCheckTest.java | 4 +- .../check/itests/RefLinkPartCheckTest.java | 15 +- .../check/itests/TypeDefinitionCheckTest.java | 4 +- .../itests/CommonModuleStrictTypesTest.java | 143 +++-- .../META-INF/MANIFEST.MF | 2 +- .../bsl/ui/itests/BslDocCommentViewTest.java | 12 +- .../ModuleStructurePropertyPageTest.java | 60 +- ...rmatDocCommentModuleEditorHandlerTest.java | 3 +- .../META-INF/MANIFEST.MF | 2 +- ...ListRefUserVisibilityEnabledCheckTest.java | 5 +- .../DynamicListFieldTitleGenerateFixTest.java | 5 +- .../DynamicListItemTitleGenerateFixTest.java | 4 +- .../form/fix/itests/FormFixTestBase.java | 3 + .../v8codestyle/form/fix/itests/Messages.java | 35 ++ .../form/fix/itests/messages.properties | 17 + .../form/fix/itests/messages_ru.properties | 18 + .../MdObjectNameUnallowedLetterCheckTest.java | 6 - .../META-INF/MANIFEST.MF | 2 +- .../check/itests/AbstractQueryTestBase.java | 8 +- .../check/itests/TempTableHasIndexTest.java | 12 +- tests/pom.xml | 6 +- 118 files changed, 2346 insertions(+), 677 deletions(-) create mode 100644 bundles/com.e1c.v8codestyle.bsl/templates/en/common_module_reusable.bsl create mode 100644 bundles/com.e1c.v8codestyle.bsl/templates/ru/common_module_reusable.bsl create mode 100644 tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/Messages.java create mode 100644 tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/messages.properties create mode 100644 tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/messages_ru.properties create mode 100644 tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/Messages.java create mode 100644 tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/messages.properties create mode 100644 tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/messages_ru.properties diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c1d3c766..cfd63c0d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: run: | Xvfb :5 -screen 0 1280x1024x8 -fbdir /tmp & export DISPLAY=:5 - mvn clean verify -PSDK,find-bugs -Dtycho.localArtifacts=ignore -B -V + mvn clean verify -PSDK,find-bugs -Dtycho.localArtifacts=ignore -Dtycho.p2.httptransport.type=JavaUrl -B -V - name: Cache SonarCloud packages uses: actions/cache@v2 diff --git a/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF index 95fe89772..fb2af3d91 100644 --- a/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Import-Package: com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.lifecycle;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.md.sort;version="[1.0.0,2.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)", com.e1c.v8codestyle.autosort;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF index f056cb59e..6fb8ee9be 100644 --- a/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF @@ -27,8 +27,8 @@ Import-Package: com._1c.g5.v8.activitytracking.core;version="[1.0.0,2.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.lifecycle;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.md.sort;version="[1.0.0,2.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", - com.e1c.g5.v8.dt.cli.api;version="[2.0.0,3.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com.e1c.g5.v8.dt.cli.api;version="[3.0.0,4.0.0)", com.e1c.g5.v8.dt.cli.api.components;version="[3.0.0,4.0.0)", com.e1c.v8codestyle;version="[0.7.0,0.8.0)", com.google.common.base;version="[32.1.0,33.0.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF index fc8899803..f9a14fa44 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.0 com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.bsl.comment;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.bsl.common;version="[7.0.0,8.0.0)", - com._1c.g5.v8.dt.bsl.documentation.comment;version="[5.0.0,6.0.0)", + com._1c.g5.v8.dt.bsl.documentation.comment;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.bsl.formatting;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.bsl.model.util;version="[4.7.0,5.0.0)", @@ -42,9 +42,9 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.0 com._1c.g5.v8.dt.lcore.nodemodel.util;version="[1.0.0,2.0.0)", com._1c.g5.v8.dt.lcore.ui.texteditor;version="[1.1.0,2.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", - com._1c.g5.v8.dt.theming.ui.util;version="[1.0.0,2.0.0)", - com._1c.g5.v8.dt.ui.util;version="[7.0.0,8.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.theming.ui.util;version="[2.0.0,3.0.0)", + com._1c.g5.v8.dt.ui.util;version="[8.0.0,9.0.0)", com._1c.g5.v8.dt.ui.wizards;version="[8.0.0,9.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/properties/ModuleStructurePropertyPage.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/properties/ModuleStructurePropertyPage.java index f1312c836..c0beaa11c 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/properties/ModuleStructurePropertyPage.java +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/properties/ModuleStructurePropertyPage.java @@ -30,6 +30,7 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.PreferenceDialog; +import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.IStructuredSelection; @@ -76,6 +77,8 @@ public class ModuleStructurePropertyPage private Button createStrictTypesButton; + private Button openButton; + private CheckboxTableViewer checkBoxViewer; private final Set existTemplates = new HashSet<>(); @@ -192,7 +195,8 @@ private void saveTemplate(ModuleType type) return; } ScriptVariant script = v8Project.getScriptVariant(); - Supplier content = moduleStructureProvider.getModuleStructureTemplate(getProject(), type, script); + Supplier content = + moduleStructureProvider.getModuleStructureTemplate(getProject(), type, false, script); if (content == null) { return; @@ -292,7 +296,7 @@ private void addSecondSection(Composite parent) checkBoxViewer.setInput(ModuleType.VALUES); Composite buttonPanel = createDefaultComposite(composite); - Button openButton = new Button(buttonPanel, SWT.PUSH); + openButton = new Button(buttonPanel, SWT.PUSH); openButton.setText(Messages.ModuleStructurePropertyPage_Open_template); openButton.setToolTipText(Messages.ModuleStructurePropertyPage_Open_template_tooltip); openButton.setEnabled(false); diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java index bc0be477b..f2199d98e 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java @@ -136,10 +136,7 @@ public String wrap(IBslModuleTextInsertInfo moduleTextInsertInfo, String content builder.append(beginRegion).append(space).append(regionName); builder.append(content); builder.append(endRegion); - if (moduleTextInsertInfo.getPosition() == 0) - { - builder.append(lineSeparator); - } + builder.append(lineSeparator); return builder.toString(); } } diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/wizard/ModuleStructureNewWizardRelatedModelsFactory.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/wizard/ModuleStructureNewWizardRelatedModelsFactory.java index 3e73d30c3..581472878 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/wizard/ModuleStructureNewWizardRelatedModelsFactory.java +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/wizard/ModuleStructureNewWizardRelatedModelsFactory.java @@ -35,6 +35,8 @@ import com._1c.g5.v8.dt.common.StringUtils; import com._1c.g5.v8.dt.core.filesystem.IQualifiedNameFilePathConverter; import com._1c.g5.v8.dt.metadata.mdclass.AbstractForm; +import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; +import com._1c.g5.v8.dt.metadata.mdclass.ReturnValuesReuse; import com._1c.g5.v8.dt.metadata.mdclass.ScriptVariant; import com._1c.g5.v8.dt.ui.wizards.IDtNewWizardContext; import com.e1c.v8codestyle.bsl.IModuleStructureProvider; @@ -85,15 +87,22 @@ public void createModels(IDtNewWizardContext context, Set crea { formToAddModule = (AbstractForm)model; } - else if (model instanceof Module) + else if (model instanceof Module module) { formToAddModule = null; - Module module = (Module)model; IFile bslFile = getModuleFile(module); if (bslFile != null) { ModuleType type = BslUtil.computeModuleType(module, qualifiedNameFilePathConverter); - createOrUpdateModule(bslFile, type, context); + if (type == ModuleType.COMMON_MODULE && context.getModel() instanceof CommonModule commonModule) + { + createOrUpdateModule(bslFile, ModuleType.COMMON_MODULE, + commonModule.getReturnValuesReuse() != ReturnValuesReuse.DONT_USE, context); + } + else + { + createOrUpdateModule(bslFile, type, false, context); + } } } } @@ -103,7 +112,7 @@ else if (model instanceof Module) IFile bslFile = getModuleFile(formToAddModule, project); if (bslFile != null) { - createOrUpdateModule(bslFile, ModuleType.FORM_MODULE, context); + createOrUpdateModule(bslFile, ModuleType.FORM_MODULE, false, context); EObject module = createBslProxyModule(bslFile); createdModels.add(module); @@ -111,11 +120,12 @@ else if (model instanceof Module) } } - private void createOrUpdateModule(IFile bslFile, ModuleType type, IDtNewWizardContext context) + private void createOrUpdateModule(IFile bslFile, ModuleType type, boolean reusableModule, + IDtNewWizardContext context) { ScriptVariant script = context.getV8project().getScriptVariant(); Supplier content = - moduleStructureProvider.getModuleStructureTemplate(bslFile.getProject(), type, script); + moduleStructureProvider.getModuleStructureTemplate(bslFile.getProject(), type, reusableModule, script); if (content == null) { return; @@ -178,5 +188,4 @@ else if (!currentCode.isEmpty()) UiPlugin.log(status); } } - } diff --git a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF index e697bc448..8910cc30c 100644 --- a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.bsl.comment;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.bsl.common;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.bsl.contextdef;version="[2.0.0,3.0.0)", - com._1c.g5.v8.dt.bsl.documentation.comment;version="[5.0.0,6.0.0)", + com._1c.g5.v8.dt.bsl.documentation.comment;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.bsl.model.resource.owner;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.bsl.model.util;version="[4.0.0,5.0.0)", @@ -40,7 +40,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.lcore.util;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.mcore.util;version="[3.6.0,4.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.platform;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.13.0,3.0.0)", com._1c.g5.wiring;version="[2.0.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/IModuleStructureProvider.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/IModuleStructureProvider.java index 3c9c2ec8a..1eb41c05c 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/IModuleStructureProvider.java +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/IModuleStructureProvider.java @@ -54,11 +54,13 @@ public interface IModuleStructureProvider * * @param project the project, cannot be {@code null}. * @param moduleType the module type, cannot be {@code null}. + * @param reusableModule module is reusable common module. * @param script the script, cannot be {@code null}. * @return the module structure template supplier of input stream, may return {@code null} if there is no template * for such module type and script variant. */ - Supplier getModuleStructureTemplate(IProject project, ModuleType moduleType, ScriptVariant script); + Supplier getModuleStructureTemplate(IProject project, ModuleType moduleType, boolean reusableModule, + ScriptVariant script); /** * Gets the module structure top regions in order of as they should be in module. diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/internal/bsl/ModuleStructureProvider.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/internal/bsl/ModuleStructureProvider.java index e67268af0..cc88533e7 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/internal/bsl/ModuleStructureProvider.java +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/internal/bsl/ModuleStructureProvider.java @@ -53,6 +53,8 @@ public class ModuleStructureProvider private static final String FOLDER_EN = "/templates/en/"; //$NON-NLS-1$ + private static final String REUSABLE_SUFFIX = "_reusable"; //$NON-NLS-1$ + private static final IPath FOLDER_SETTINGS = new org.eclipse.core.runtime.Path(".settings/templates"); //$NON-NLS-1$ @Override @@ -68,9 +70,8 @@ public boolean canCreateStructure(IProject project) @Override public Supplier getModuleStructureTemplate(IProject project, ModuleType moduleType, - ScriptVariant script) + boolean reusableModule, ScriptVariant script) { - if (moduleType == null || script == null) { return null; @@ -78,6 +79,10 @@ public Supplier getModuleStructureTemplate(IProject project, Module StringBuilder sb = new StringBuilder(); sb.append(moduleType.getName().toLowerCase()); + if (reusableModule) + { + sb.append(REUSABLE_SUFFIX); + } sb.append("."); //$NON-NLS-1$ sb.append(BSL_FILE_EXTENSION); diff --git a/bundles/com.e1c.v8codestyle.bsl/templates/en/common_module_reusable.bsl b/bundles/com.e1c.v8codestyle.bsl/templates/en/common_module_reusable.bsl new file mode 100644 index 000000000..a65ab195d --- /dev/null +++ b/bundles/com.e1c.v8codestyle.bsl/templates/en/common_module_reusable.bsl @@ -0,0 +1,12 @@ + +#Region Internal + +// Enter code here. + +#EndRegion + +#Region Private + +// Enter code here. + +#EndRegion diff --git a/bundles/com.e1c.v8codestyle.bsl/templates/ru/common_module_reusable.bsl b/bundles/com.e1c.v8codestyle.bsl/templates/ru/common_module_reusable.bsl new file mode 100644 index 000000000..ed9847cff --- /dev/null +++ b/bundles/com.e1c.v8codestyle.bsl/templates/ru/common_module_reusable.bsl @@ -0,0 +1,12 @@ + +#Область СлужебныйПрограммныйИнтерфейс + +// Код процедур и функций + +#КонецОбласти + +#Область СлужебныеПроцедурыИФункции + +// Код процедур и функций + +#КонецОбласти diff --git a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF index de6d95966..1ffaa5fe3 100644 --- a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF @@ -24,12 +24,12 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.dcs.model.settings;version="[3.2.0,4.0.0)", com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.form.model.util;version="[7.2.0,8.0.0)", - com._1c.g5.v8.dt.form.service;version="[8.0.0,9.0.0)", + com._1c.g5.v8.dt.form.service;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.form.service.datasourceinfo;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.metadata;version="[5.0.0,6.0.0)", - com._1c.g5.v8.dt.metadata.dbview;version="[4.0.0,5.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.dbview;version="[5.0.0,6.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.14.0,3.0.0)", com._1c.g5.v8.dt.ql.model;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.ql.resource;version="[5.0.0,6.0.0)", diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/FormItemsSingleEventHandlerCheck.java b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/FormItemsSingleEventHandlerCheck.java index 1fbf6c5d9..5cd7a760a 100644 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/FormItemsSingleEventHandlerCheck.java +++ b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/FormItemsSingleEventHandlerCheck.java @@ -32,6 +32,7 @@ import com._1c.g5.v8.dt.form.model.FormItemContainer; import com._1c.g5.v8.dt.form.model.FormPackage; import com._1c.g5.v8.dt.form.service.FormItemInformationService; +import com._1c.g5.v8.dt.mcore.Event; import com._1c.g5.v8.dt.metadata.mdclass.ScriptVariant; import com.e1c.g5.v8.dt.check.CheckComplexity; import com.e1c.g5.v8.dt.check.ICheckParameters; @@ -48,7 +49,7 @@ * @author Manaev Konstantin */ public class FormItemsSingleEventHandlerCheck - extends BasicCheck + extends BasicCheck { private static final String CHECK_ID = "form-items-single-event-handler"; //$NON-NLS-1$ @@ -74,12 +75,12 @@ public String getCheckId() protected void check(Object object, ResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor) { - if (object instanceof Form) + if (object instanceof Form form) { - IV8Project project = v8ProjectManager.getProject((EObject)object); - ScriptVariant variant = project == null ? ScriptVariant.ENGLISH : project.getScriptVariant(); + IV8Project v8project = v8ProjectManager.getProject((EObject)object); + ScriptVariant variant = v8project == null ? ScriptVariant.ENGLISH : v8project.getScriptVariant(); Map handlers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - checkEObjectEventHandlers((EObject)object, handlers, variant, resultAceptor, monitor); + checkEObjectEventHandlers(form, handlers, variant, resultAceptor, monitor); } } @@ -137,19 +138,27 @@ private void checkHandlersList(EObject item, List eventHandlers, M { return; } - EventHandler event = eventIterator.next(); - String handlerName = - variant == ScriptVariant.ENGLISH ? event.getEvent().getName() : event.getEvent().getNameRu(); - if (handlers.containsKey(event.getName())) + EventHandler eventHandler = eventIterator.next(); + Event event = eventHandler.getEvent(); + if (event.eIsProxy()) + { + continue; + } + String handlerName = eventHandler.getName(); + String eventName = variant == ScriptVariant.ENGLISH ? event.getName() : event.getNameRu(); + + if (handlers.containsKey(handlerName)) { resultAceptor.addIssue(MessageFormat.format( Messages.FormItemsSingleEventHandlerCheck_the_handler_is_already_assigned_to_event, handlerName, - handlers.get(event.getName())), event, FormPackage.Literals.EVENT_HANDLER__NAME); + handlers.get(handlerName)), eventHandler, FormPackage.Literals.EVENT_HANDLER__NAME); } else { - handlers.put(event.getName(), MessageFormat - .format(Messages.FormItemsSingleEventHandlerCheck_itemName_dot_eventName, itemName, handlerName)); + handlers.put(handlerName, + eventName != null ? MessageFormat + .format(Messages.FormItemsSingleEventHandlerCheck_itemName_dot_eventName, itemName, eventName) + : itemName); } } } diff --git a/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF index cf27ca060..5e16d4dd8 100644 --- a/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Bundle-Localization: plugin Import-Package: com._1c.g5.v8.dt.common;version="[6.4.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.md.ui.shared;version="[2.3.200,3.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.ui.wizards;version="[8.0.0,9.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF index 75024fc41..2d4adfcf4 100644 --- a/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.mcore.util;version="[3.13.0,4.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.platform;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.schedule.model;version="[2.0.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF index dd170f99d..9f8387feb 100644 --- a/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.metadata.dbview;version="4.0.0", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.ql.model;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.ql.typesystem;version="5.0.0", com._1c.g5.wiring;version="[2.2.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF index 289bceacf..a5e5ac0a5 100644 --- a/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.md;version="[20.0.0,21.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.rights;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.rights.model;version="[4.0.0,5.0.0)", diff --git a/targets/default/default.target b/targets/default/default.target index 78a3ca050..ce8a14a66 100644 --- a/targets/default/default.target +++ b/targets/default/default.target @@ -20,7 +20,7 @@ - + diff --git a/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF index f5a273d6e..c926a2998 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF @@ -8,7 +8,8 @@ Fragment-Host: com.e1c.v8codestyle.bsl;bundle-version="[0.7.0,0.8.0)" Automatic-Module-Name: com.e1c.v8codestyle.md.itests Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: fragment -Import-Package: com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)", +Import-Package: com._1c.g5.v8.dt.core.lifecycle;version="[9.2.0,10.0.0)", + com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.md.naming;version="[5.1.0,6.0.0)", diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AbstractSingleModuleTestBase.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AbstractSingleModuleTestBase.java index fc234e915..7c8bd35a4 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AbstractSingleModuleTestBase.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AbstractSingleModuleTestBase.java @@ -16,24 +16,33 @@ import static org.junit.Assert.assertTrue; import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.jobs.Job; import org.junit.Before; import org.junit.Ignore; import com._1c.g5.v8.bm.core.IBmObject; import com._1c.g5.v8.dt.bsl.model.Module; +import com._1c.g5.v8.dt.core.lifecycle.ProjectStopType; +import com._1c.g5.v8.dt.core.lifecycle.ServiceLifecycleJob; +import com._1c.g5.v8.dt.core.lifecycle.WorkspaceProjectStopRequest; import com._1c.g5.v8.dt.core.platform.IDtProject; import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; +import com._1c.g5.v8.dt.testing.TestingProjectLifecycleSupport; import com._1c.g5.v8.dt.validation.marker.Marker; import com.e1c.g5.v8.dt.check.ICheck; import com.e1c.g5.v8.dt.check.settings.CheckUid; @@ -181,16 +190,6 @@ protected void updateModule(String pathToResource) throws Exception { IProject project = getProject().getWorkspaceProject(); IFile file = project.getFile(getModuleFileName()); - boolean[] wasChanged = new boolean[1]; - IResourceChangeListener listener = event -> { - if (event.getResource() == file - || event.getDelta() != null && event.getDelta().findMember(file.getFullPath()) != null) - { - wasChanged[0] = true; - } - }; - project.getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE); - try (InputStream in = getClass().getResourceAsStream(pathToResource)) { if (file.exists()) @@ -202,15 +201,23 @@ protected void updateModule(String pathToResource) throws Exception file.create(in, true, new NullProgressMonitor()); } } - for (int i = 0; !wasChanged[0] && i < 4; i++) + ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + + // As well as AUTO_BUILD-family job is being scheduled synchronously + // So all we need is to wait for auto-build job is being finished + // And also a little protection from direct file changes (without Eclipse + // resource subsystem) + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + try + { + Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null); + Job.getJobManager().join(ResourcesPlugin.FAMILY_MANUAL_BUILD, null); + } + catch (OperationCanceledException | InterruptedException e) { - Thread.sleep(500); + throw new IllegalStateException("Cannot update file:" + file.toString(), e); //$NON-NLS-1$ } - testingWorkspace.waitForBuildCompletion(); - project.getWorkspace().removeResourceChangeListener(listener); waitForDD(getProject()); - //after fixing the problem in EDT - delete it - Thread.sleep(5000); } /** @@ -286,4 +293,72 @@ protected ICheck getCheckInstance() } return check; } + + /** + * Delete project in the workspace. + * @param project deleted project, cannot be null + * @throws CoreException if workspace clean up error occurred + */ + protected void cleanUpProject(IProject project) throws CoreException + { + // First of all we need to stop all DT projects to perform the most effective + // cleanup, without stray dependent projects restarts and so on + Collection stopRequests = new ArrayList<>(); + + IDtProject dtProject = dtProjectManager.getDtProject(project); + if (dtProject != null) + { + stopRequests.add(new WorkspaceProjectStopRequest(project, ProjectStopType.DELETE)); + } + + // Stopping projects in the right order + orchestrator.stopWorkspaceProjects(stopRequests, new NullProgressMonitor()); + + // Delete projects physically + + try + { + project.delete(false, true, null); + TestingProjectLifecycleSupport.waitForProjectStop(project); + } + catch (Throwable e) + { + e.printStackTrace(System.err); + //nop + } + + // Checking if there are critical failures during the shutdown of the project + try + { + // Force closing services that failed during the normal close + if (dtProject != null && orchestrator.isStarted(dtProject)) + { + orchestrator.stopProject(dtProject, ProjectStopType.DELETE); + TestingProjectLifecycleSupport.waitForProjectStop(project); + } + } + catch (Throwable e) + { + //nop + } + try + { + testingWorkspace.getWorkspaceRoot().refreshLocal(IResource.DEPTH_INFINITE, null); + } + catch (Throwable e) + { + e.printStackTrace(System.err); + } + + try + { + Job.getJobManager().join(ServiceLifecycleJob.FAMILY, new NullProgressMonitor()); + Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null); + Job.getJobManager().join(ResourcesPlugin.FAMILY_MANUAL_BUILD, null); + } + catch (OperationCanceledException | InterruptedException e) + { + // Nothing + } + } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AccessibilityAtClientInObjectModuleCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AccessibilityAtClientInObjectModuleCheckTest.java index b59c93025..275298258 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AccessibilityAtClientInObjectModuleCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AccessibilityAtClientInObjectModuleCheckTest.java @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.AccessibilityAtClientInObjectModuleCheck; /** @@ -62,14 +62,12 @@ public void testObjectModule() throws Exception { List markers = getObjectModuleMarkers(); assertEquals(3, markers.size()); - - Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(1); - assertEquals("10", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(2); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(2, 5, 10), errorLines); } @Test @@ -77,11 +75,12 @@ public void testManagerModule() throws Exception { List markers = getModuleMarkers(); assertEquals(2, markers.size()); - - Marker marker = markers.get(0); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(1); - assertEquals("27", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(2, 27), errorLines); } private List getObjectModuleMarkers() diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AttachableEventHandlerNameCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AttachableEventHandlerNameCheckTest.java index 22a743254..8458124b4 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AttachableEventHandlerNameCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AttachableEventHandlerNameCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.AttachableEventHandlerNameCheck; /** @@ -49,6 +49,6 @@ public void testAttachableEventHandlerName() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/BeginTransactionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/BeginTransactionCheckTest.java index a1e28c2f0..9fa6abb45 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/BeginTransactionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/BeginTransactionCheckTest.java @@ -47,7 +47,7 @@ public void testNotFoundTryAfterBegin() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("The try operator was not found after calling begin transaction", marker.getMessage()); + assertEquals(Messages.BeginTransactionCheck_Try_was_not_found_after_calling_begin, marker.getMessage()); } @Test @@ -58,6 +58,7 @@ public void testShouldBeNoExecutableCodebetweenBeginAndTry() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("There should be no executable code between begin transaction and try", marker.getMessage()); + assertEquals(Messages.BeginTransactionCheck_Executable_code_between_begin_transaction_and_try, + marker.getMessage()); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CanonicalPragmaCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CanonicalPragmaCheckTest.java index 98cff448e..12590d4ce 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CanonicalPragmaCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CanonicalPragmaCheckTest.java @@ -31,8 +31,8 @@ import com._1c.g5.v8.dt.bsl.model.Pragma; import com._1c.g5.v8.dt.core.platform.IDtProject; import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.CanonicalPragmaCheck; /** @@ -111,7 +111,7 @@ public void testCanonicalPragma() throws Exception continue; } - String uriToProblem = marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY); + String uriToProblem = marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM); assertTrue(uriErrors.contains(uriToProblem)); uriErrors.remove(uriToProblem); } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ChangeAndValidateInsteadOfAroundCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ChangeAndValidateInsteadOfAroundCheckTest.java index a7023d3bb..604ca842c 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ChangeAndValidateInsteadOfAroundCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ChangeAndValidateInsteadOfAroundCheckTest.java @@ -31,8 +31,8 @@ import com._1c.g5.v8.dt.bsl.model.Pragma; import com._1c.g5.v8.dt.core.platform.IDtProject; import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ChangeAndValidateInsteadOfAroundCheck; /** @@ -104,11 +104,13 @@ public void testChangeAndValidateInsteadOfAround() throws Exception continue; } - String uriToProblem = marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY); + String uriToProblem = marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM); assertTrue(uriErrors.contains(uriToProblem)); uriErrors.remove(uriToProblem); } assertEquals(0, uriErrors.size()); + + cleanUpProject(dtProject.getWorkspaceProject()); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CodeAfterAsyncCallCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CodeAfterAsyncCallCheckTest.java index 6789b20a0..6c8bf67f5 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CodeAfterAsyncCallCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CodeAfterAsyncCallCheckTest.java @@ -22,8 +22,8 @@ import org.junit.Test; import com._1c.g5.v8.dt.core.platform.IDtProject; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.check.settings.CheckUid; import com.e1c.g5.v8.dt.check.settings.ICheckSettings; import com.e1c.v8codestyle.bsl.check.CodeAfterAsyncCallCheck; @@ -57,7 +57,7 @@ public void testCodeAfterExistence() throws Exception Marker marker = getFirstMarker(CHECK_ID, getModuleId(), getProject()); assertNotNull(marker); - assertEquals("7", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(7), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -120,7 +120,7 @@ public void testSpreadsheetDocumentNonCompliant() throws Exception Marker marker = getFirstMarker(CHECK_ID, getModuleId(), getProject()); assertNotNull(marker); - assertEquals("8", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(8), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } private void setParameterValue(Boolean value) diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommitTransactionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommitTransactionCheckTest.java index a3552a35c..078fd03e7 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommitTransactionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommitTransactionCheckTest.java @@ -46,7 +46,7 @@ public void testCommitTransactionMustBeInTtryCatch() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("Commit transaction must be in a try-catch", marker.getMessage()); + assertEquals(Messages.CommitTransactionCheck_Commit_transaction_must_be_in_try_catch, marker.getMessage()); } @Test @@ -57,7 +57,7 @@ public void testNoBeginTransactionForCommitTransaction() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("There is no begin transaction for commit transaction", marker.getMessage()); + assertEquals(Messages.CommitTransactionCheck_No_begin_transaction_for_commit_transaction, marker.getMessage()); } @Test @@ -68,7 +68,8 @@ public void testNoRollbackTransactionForBeginTransaction() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("There is no rollback transaction for begin transaction", marker.getMessage()); + assertEquals(Messages.CommitTransactionCheck_No_rollback_transaction_for_begin_transaction, + marker.getMessage()); } @Test @@ -79,7 +80,7 @@ public void testShouldBeNoExecutableCodebetweenCommitAndException() throws Excep List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("There should be no executable code between commit transaction and exception", + assertEquals(Messages.CommitTransactionCheck_Should_be_no_executable_code_between_commit_and_exception, marker.getMessage()); } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommonModuleMissingApiCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommonModuleMissingApiCheckTest.java index ba1577bd0..24d1ce8ff 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommonModuleMissingApiCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommonModuleMissingApiCheckTest.java @@ -17,8 +17,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.CommonModuleMissingApiCheck; /** @@ -42,7 +42,7 @@ public void testProgrammingInterface() throws Exception Marker marker = getModuleFirstMarker(); assertNotNull(marker); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommonModuleNamedSelfReferenceCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommonModuleNamedSelfReferenceCheckTest.java index c4dfb5db7..b033e6c69 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommonModuleNamedSelfReferenceCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/CommonModuleNamedSelfReferenceCheckTest.java @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.CommonModuleNamedSelfReferenceCheck; /** @@ -40,7 +40,6 @@ public class CommonModuleNamedSelfReferenceCheckTest private static final String CACHED_COMMON_MODULE_FILE_NAME = "/src/CommonModules/MyCommonModuleCached/Module.bsl"; - public CommonModuleNamedSelfReferenceCheckTest() { super(CommonModuleNamedSelfReferenceCheck.class); @@ -63,8 +62,8 @@ public void testCommonModule() throws Exception List markers = getMarkers(COMMON_MODULE_FILE_NAME); assertEquals(2, markers.size()); - assertEquals("6", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("6", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(Integer.valueOf(6), markers.get(1).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ConsecutiveEmptyLinesCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ConsecutiveEmptyLinesCheckTest.java index e700597a5..f40e46916 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ConsecutiveEmptyLinesCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ConsecutiveEmptyLinesCheckTest.java @@ -11,8 +11,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ConsecutiveEmptyLinesCheck; /** @@ -36,7 +36,7 @@ public void testWithManyEmptyLines() throws Exception List markers = getModuleMarkers(); assertFalse(markers.isEmpty()); - assertEquals("3", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/DeprecatedProcedureOutsideDeprecatedRegionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/DeprecatedProcedureOutsideDeprecatedRegionCheckTest.java index b4fec0bb5..166968a79 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/DeprecatedProcedureOutsideDeprecatedRegionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/DeprecatedProcedureOutsideDeprecatedRegionCheckTest.java @@ -20,8 +20,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.DeprecatedProcedureOutsideDeprecatedRegionCheck; /** @@ -32,9 +32,7 @@ public class DeprecatedProcedureOutsideDeprecatedRegionCheckTest extends AbstractSingleModuleTestBase { - private static final String MESSAGE = - "The deprecated procedure (function) {0} should be placed in the Deprecated region of the Public region in a common module area"; - private static final String DEPRECATED_PROCEDURE_NAME = "\"DeprecatedProcedure\""; + private static final String DEPRECATED_PROCEDURE_NAME = "DeprecatedProcedure"; public DeprecatedProcedureOutsideDeprecatedRegionCheckTest() { @@ -110,7 +108,9 @@ public void testNonCompliantDeprecatedMethod() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); - assertEquals("4", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(MessageFormat.format(MESSAGE, DEPRECATED_PROCEDURE_NAME), markers.get(0).getMessage()); + assertEquals(Integer.valueOf(4), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format( + Messages.DeprecatedProcedureOutsideDeprecatedRegionCheck_Deprecated_function_out_of_deprecated_area, + DEPRECATED_PROCEDURE_NAME), markers.get(0).getMessage()); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EmptyExceptStatementCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EmptyExceptStatementCheckTest.java index 07ea68ddd..7c6b2e2bd 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EmptyExceptStatementCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EmptyExceptStatementCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.EmptyExceptStatementCheck; /** @@ -50,7 +50,7 @@ public void testEmptyExceptStatement() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EventDataExchangeLoadCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EventDataExchangeLoadCheckTest.java index 20c97ee76..9a0016057 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EventDataExchangeLoadCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EventDataExchangeLoadCheckTest.java @@ -30,8 +30,8 @@ import com._1c.g5.v8.dt.bsl.model.Statement; import com._1c.g5.v8.dt.core.platform.IDtProject; import com._1c.g5.v8.dt.metadata.mdclass.Catalog; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.check.settings.CheckUid; import com.e1c.g5.v8.dt.check.settings.ICheckSettings; import com.e1c.g5.v8.dt.testing.check.CheckTestBase; @@ -76,7 +76,7 @@ public void testDataExchangeLoad() throws Exception Marker marker = getFirstMarker(CHECK_ID, methods.get(0), dtProject); assertNotNull(marker); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); Method method = methods.get(2); assertEquals(2, method.allStatements().size()); @@ -85,7 +85,7 @@ public void testDataExchangeLoad() throws Exception marker = getFirstMarker(CHECK_ID, ((IfStatement)statement).getIfPart(), dtProject); assertNotNull(marker); - assertEquals("24", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(24), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -118,7 +118,7 @@ public void testDataExchangeLoadAtBeginning() throws Exception Method method = methods.get(2); Marker marker = getFirstMarker(CHECK_ID, method, dtProject); assertNotNull(marker); - assertEquals("18", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(18), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); assertEquals(2, method.allStatements().size()); Statement statement = method.allStatements().get(1); diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EventHandlerBooleanParamCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EventHandlerBooleanParamCheckTest.java index 494e0a56a..b7b1ea982 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EventHandlerBooleanParamCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/EventHandlerBooleanParamCheckTest.java @@ -32,8 +32,8 @@ import com._1c.g5.v8.dt.form.model.Form; import com._1c.g5.v8.dt.metadata.mdclass.Catalog; import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.check.settings.CheckUid; import com.e1c.g5.v8.dt.check.settings.ICheckSettings; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; @@ -95,7 +95,7 @@ public void testCatalogObjectModuleEvents() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); Method compliantMethod = methods.get(1); assertEquals(1, compliantMethod.allStatements().size()); @@ -143,7 +143,7 @@ public void testCatalogManagerModuleEvents() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); Method compliantMethod = methods.get(1); assertEquals(1, compliantMethod.allStatements().size()); @@ -190,7 +190,7 @@ public void testCommonModuleEvents() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); // Noncompliant but disabled in check's parameters Method compliantMethod = methods.get(1); @@ -239,14 +239,14 @@ public void testCatalogFormModuleEvents() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); assertTrue(noncompliantMethod.allStatements().get(1) instanceof SimpleStatement); statement = (SimpleStatement)noncompliantMethod.allStatements().get(1); marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("7", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(7), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); noncompliantMethod = methods.get(1); assertEquals(1, noncompliantMethod.allStatements().size()); @@ -255,7 +255,7 @@ public void testCatalogFormModuleEvents() throws Exception marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("15", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(15), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); Method compliantMethod = methods.get(2); assertEquals(2, compliantMethod.allStatements().size()); @@ -310,7 +310,7 @@ public void testCatalogObjectModuleEventsNotEventOnly() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); Method compliantMethod = methods.get(1); assertEquals(1, compliantMethod.allStatements().size()); @@ -359,7 +359,7 @@ public void testCatalogManagerModuleEventsNotEventOnly() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); Method compliantMethod = methods.get(1); assertEquals(1, compliantMethod.allStatements().size()); @@ -408,7 +408,7 @@ public void testCommonModuleEventsNotEventOnly() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); // Noncompliant works only if enabled in check's parameters noncompliantMethod = methods.get(1); @@ -418,7 +418,7 @@ public void testCommonModuleEventsNotEventOnly() throws Exception marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("12", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(12), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); Method compliantMethod = methods.get(2); assertEquals(1, compliantMethod.allStatements().size()); @@ -459,14 +459,14 @@ public void testCatalogFormModuleEventsNotEventOnly() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); assertTrue(noncompliantMethod.allStatements().get(1) instanceof SimpleStatement); statement = (SimpleStatement)noncompliantMethod.allStatements().get(1); marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("7", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(7), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); noncompliantMethod = methods.get(1); assertEquals(1, noncompliantMethod.allStatements().size()); @@ -475,7 +475,7 @@ public void testCatalogFormModuleEventsNotEventOnly() throws Exception marker = getFirstMarker(CHECK_ID, statement.getRight(), dtProject); assertNotNull(marker); - assertEquals("15", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(15), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); Method compliantMethod = methods.get(2); assertEquals(2, compliantMethod.allStatements().size()); diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportMethodInCommandFormModuleCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportMethodInCommandFormModuleCheckTest.java index ffb67a071..8a1cdc5d5 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportMethodInCommandFormModuleCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportMethodInCommandFormModuleCheckTest.java @@ -42,10 +42,6 @@ public class ExportMethodInCommandFormModuleCheckTest { private static final String CHECK_ID = "export-method-in-command-form-module"; - private static final String MESSAGE = - "Do not embed export procedures and functions in modules of commands and forms. " - + "You cannot address such modules from external code, " - + "so embedded export procedures and functions become dysfunctional."; private static final String PROJECT_NAME = "ExportMethodInCommandFormModuleCheck"; private static final String FQN_CATALOG = "Catalog.Products"; private static final String FQN_CATALOG_FORM = "Catalog.Products.Form.ItemForm.Form"; @@ -75,7 +71,8 @@ public void testForm() throws Exception Method noncompliantMethod = methods.get(0); Marker marker = getFirstMarker(CHECK_ID, noncompliantMethod, dtProject); assertNotNull(marker); - assertEquals(MESSAGE, marker.getMessage()); + assertEquals(Messages.ExportMethodInCommandModule_Do_not_emded_export_method_in_modules_of_command_result, + marker.getMessage()); } @Test @@ -95,7 +92,8 @@ public void testCommonCommand() throws Exception Method noncompliantMethod = methods.get(0); Marker marker = getFirstMarker(CHECK_ID, noncompliantMethod, dtProject); assertNotNull(marker); - assertEquals(MESSAGE, marker.getMessage()); + assertEquals(Messages.ExportMethodInCommandModule_Do_not_emded_export_method_in_modules_of_command_result, + marker.getMessage()); } @Test @@ -137,7 +135,8 @@ public void testCatalogCommand() throws Exception Method noncompliantMethod = methods.get(0); Marker marker = getFirstMarker(CHECK_ID, noncompliantMethod, dtProject); assertNotNull(marker); - assertEquals(MESSAGE, marker.getMessage()); + assertEquals(Messages.ExportMethodInCommandModule_Do_not_emded_export_method_in_modules_of_command_result, + marker.getMessage()); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportProcedureMissingCommentCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportProcedureMissingCommentCheckTest.java index 4931f35be..1f12b041f 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportProcedureMissingCommentCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportProcedureMissingCommentCheckTest.java @@ -20,8 +20,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ExportProcedureMissingCommentCheck; /** @@ -32,8 +32,7 @@ public class ExportProcedureMissingCommentCheckTest extends AbstractSingleModuleTestBase { - private static final String MESSAGE = "Export procedure (function) {0} should be described by adding comment"; - private static final String EXPORT_PROCEDURE_NAME = "\"ExportProcedureWithoutComment\""; + private static final String EXPORT_PROCEDURE_NAME = "ExportProcedureWithoutComment"; public ExportProcedureMissingCommentCheckTest() { @@ -66,8 +65,9 @@ public void testExportMethodWithoutComment() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); - assertEquals("3", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(MessageFormat.format(MESSAGE, EXPORT_PROCEDURE_NAME), markers.get(0).getMessage()); + assertEquals(Integer.valueOf(3), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format(Messages.ExportProcedureMissingCommentCheck_Export_procedure_missing_comment, + EXPORT_PROCEDURE_NAME), markers.get(0).getMessage()); } /** diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportVariableInObjectModuleCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportVariableInObjectModuleCheckTest.java index ef28c0318..908166fc7 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportVariableInObjectModuleCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExportVariableInObjectModuleCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ExportVariableInObjectModuleCheck; /** @@ -60,6 +60,6 @@ public void testExportVariable() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); - assertEquals("3", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExtensionMethodPrefixCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExtensionMethodPrefixCheckTest.java index 97c41d9e1..3a4f46973 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExtensionMethodPrefixCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExtensionMethodPrefixCheckTest.java @@ -23,8 +23,8 @@ import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; import com.e1c.v8codestyle.bsl.check.ExtensionMethodPrefixCheck; import com.e1c.v8codestyle.internal.bsl.BslPlugin; @@ -79,7 +79,7 @@ public void testNonCompliantPrefix() throws Exception List markers = getMarkers(COMMON_MODULE_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("3", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExtensionVariablePrefixCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExtensionVariablePrefixCheckTest.java index f5cb975bc..e3c075e57 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExtensionVariablePrefixCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ExtensionVariablePrefixCheckTest.java @@ -24,8 +24,8 @@ import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; import com.e1c.v8codestyle.bsl.check.ExtensionVariablePrefixCheck; import com.e1c.v8codestyle.internal.bsl.BslPlugin; @@ -101,7 +101,7 @@ public void testDSVariablePrefix() throws Exception { List markers = getMarkers(CATALOG_FORM_MODULE_FILE_NAME); assertFalse(markers.isEmpty()); - assertEquals("1", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(1), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } private List getMarkers(String moduleFileName) diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormModuleMissingPragmaCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormModuleMissingPragmaCheckTest.java index fb5182837..92a4fbb95 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormModuleMissingPragmaCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormModuleMissingPragmaCheckTest.java @@ -17,14 +17,15 @@ import static org.junit.Assert.assertTrue; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; import com._1c.g5.v8.bm.core.IBmObject; import com._1c.g5.v8.dt.bsl.model.Module; import com._1c.g5.v8.dt.metadata.mdclass.AbstractForm; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.FormModuleMissingPragmaCheck; /** @@ -77,12 +78,12 @@ public void testFormModuleHasPragma() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - - Marker marker = markers.get(0); - assertEquals("7", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(1); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(2, 7), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormModulePragmaCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormModulePragmaCheckTest.java index 671fb8567..1a6a4bdac 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormModulePragmaCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormModulePragmaCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.FormModulePragmaCheck; /** @@ -50,7 +50,7 @@ public void testCommonModuleHasPragma() throws Exception assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormSelfReferenceOutdatedCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormSelfReferenceOutdatedCheckTest.java index 0c491280d..04e4bf15c 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormSelfReferenceOutdatedCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/FormSelfReferenceOutdatedCheckTest.java @@ -15,12 +15,13 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.FormSelfReferenceOutdatedCheck; /** @@ -62,9 +63,11 @@ public void testFormModule() throws Exception { List markers = getModuleMarkers(); assertEquals(3, markers.size()); - - assertEquals("11", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("12", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("13", markers.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(11, 12, 13), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/InvocationFormEventHandlerCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/InvocationFormEventHandlerCheckTest.java index 79751a6fd..699294cee 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/InvocationFormEventHandlerCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/InvocationFormEventHandlerCheckTest.java @@ -40,7 +40,6 @@ public class InvocationFormEventHandlerCheckTest { private static final String CHECK_ID = "invocation-form-event-handler"; - private static final String INV_FORM_EVENT_HANDLER_CHECK = "Program invocation of form event handler"; private static final String PROJECT_NAME = "InvocationFormEventHandler"; private static final String FQN_CATALOG_PRODUCTS_FORM = "Catalog.Products.Form.ItemForm.Form"; private static final String FQN_CATALOG_PRODUCTS_FORM_ITEM = "Catalog.Products.Form.ItemForm1.Form"; @@ -73,7 +72,8 @@ public void invocationFormEventHandler() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getLeft(), dtProject); assertNotNull(marker); - assertEquals(INV_FORM_EVENT_HANDLER_CHECK, marker.getMessage()); + assertEquals(Messages.InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_result, + marker.getMessage()); } @Test @@ -97,7 +97,8 @@ public void invocationItemEventHandler() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getLeft(), dtProject); assertNotNull(marker); - assertEquals(INV_FORM_EVENT_HANDLER_CHECK, marker.getMessage()); + assertEquals(Messages.InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_result, + marker.getMessage()); } @Test @@ -121,6 +122,7 @@ public void invocationCommandEventHandler() throws Exception Marker marker = getFirstMarker(CHECK_ID, statement.getLeft(), dtProject); assertNotNull(marker); - assertEquals(INV_FORM_EVENT_HANDLER_CHECK, marker.getMessage()); + assertEquals(Messages.InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_result, + marker.getMessage()); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/IsInRoleCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/IsInRoleCheckTest.java index 6554cb1be..c1d1250d5 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/IsInRoleCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/IsInRoleCheckTest.java @@ -29,9 +29,6 @@ public class IsInRoleCheckTest extends AbstractSingleModuleTestBase { - - private static final String USING_IS_IN_ROLE_METHOD = "Use the AccessRight() function instead of IsInRole()"; - public IsInRoleCheckTest() { super(IsInRoleCheck.class); @@ -50,6 +47,6 @@ public void testIsInRoleMethod() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals(USING_IS_IN_ROLE_METHOD, marker.getMessage()); + assertEquals(Messages.IsInRoleCheck_Use_AccessRight_instead_IsInRole, marker.getMessage()); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/IsInRoleMethodRoleExistCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/IsInRoleMethodRoleExistCheckTest.java index f4fffc31f..437be7e72 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/IsInRoleMethodRoleExistCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/IsInRoleMethodRoleExistCheckTest.java @@ -16,11 +16,12 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.IsInRoleMethodRoleExistCheck; /** @@ -63,9 +64,12 @@ public void testIsInRoleMethodRoleExistCheck() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - - assertEquals("2", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("9", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(2, 9), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/LockOutOfTryCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/LockOutOfTryCheckTest.java index d0bc6b07d..d7bfef3bf 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/LockOutOfTryCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/LockOutOfTryCheckTest.java @@ -30,12 +30,8 @@ public class LockOutOfTryCheckTest extends AbstractSingleModuleTestBase { - private static final String LOCK_OUT_OF_TRY = "Method Lock() out of try block"; - /** * Test {@link LockOutOfTryCheck}. - * - * @param checkClass */ public LockOutOfTryCheckTest() { @@ -50,7 +46,7 @@ public void testLockOutOfTry() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals(LOCK_OUT_OF_TRY, marker.getMessage()); + assertEquals(Messages.LockOutOfTry_Method_lock_out_of_try, marker.getMessage()); } @Test @@ -61,6 +57,6 @@ public void testLockOutOfTry2() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals(LOCK_OUT_OF_TRY, marker.getMessage()); + assertEquals(Messages.LockOutOfTry_Method_lock_out_of_try, marker.getMessage()); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ManagerModuleNamedSelfReferenceCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ManagerModuleNamedSelfReferenceCheckTest.java index 87c2b7799..8e4bf38a1 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ManagerModuleNamedSelfReferenceCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ManagerModuleNamedSelfReferenceCheckTest.java @@ -15,12 +15,13 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ManagerModuleNamedSelfReferenceCheck; /** @@ -63,10 +64,11 @@ public void testManagerModule() throws Exception { List markers = getModuleMarkers(); assertEquals(4, markers.size()); - - assertEquals("6", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("6", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("7", markers.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("7", markers.get(3).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(6, 6, 7, 7), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/Messages.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/Messages.java new file mode 100644 index 000000000..b973660e7 --- /dev/null +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/Messages.java @@ -0,0 +1,497 @@ +/******************************************************************************* + * Copyright (C) 2021, 1C-Soft LLC and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * 1C-Soft LLC - initial API and implementation + * Aleksandr Kapralov - issue #17, #449, #458 + *******************************************************************************/ +package com.e1c.v8codestyle.bsl.check.itests; + +import org.eclipse.osgi.util.NLS; + +/** + * NLS messages + * + * @author Dmitriy Marmyshev + */ +final class Messages + extends NLS +{ + private static final String BUNDLE_NAME = Messages.class.getPackageName() + ".messages"; //$NON-NLS-1$ + + public static String AccessibilityAtClientInObjectModuleCheck_Declared_variable_accessible_AtClient; + + public static String AccessibilityAtClientInObjectModuleCheck_description; + + public static String AccessibilityAtClientInObjectModuleCheck_Event_handler_should_be_accessible_AtClient; + + public static String AccessibilityAtClientInObjectModuleCheck_Manager_event_handlers_allows_to_be_AtClient; + + public static String AccessibilityAtClientInObjectModuleCheck_Method_accessible_AtClient; + + public static String AccessibilityAtClientInObjectModuleCheck_Methods_should_be_AtClient; + + public static String AccessibilityAtClientInObjectModuleCheck_title; + + public static String CachedPublicCheck_Description; + + public static String CachedPublicCheck_Issue; + + public static String CachedPublicCheck_Title; + + public static String AttachableEventHandlerNameCheck_Description; + + public static String AttachableEventHandlerNameCheck_Event_handler_name_pattern; + + public static String AttachableEventHandlerNameCheck_Message; + + public static String AttachableEventHandlerNameCheck_Title; + + public static String CanonicalPragmaCheck_description; + public static String CanonicalPragmaCheck_Pragma_0_is_not_written_canonically_correct_spelling_is_1; + public static String CanonicalPragmaCheck_title; + + public static String ChangeAndValidateInsteadOfAroundCheck_description; + public static String ChangeAndValidateInsteadOfAroundCheck_Use_ChangeAndValidate_instead_of_Around; + public static String ChangeAndValidateInsteadOfAroundCheck_title; + + public static String CodeAfterAsyncCallCheck_Description; + + public static String CodeAfterAsyncCallCheck_Issue; + + public static String CodeAfterAsyncCallCheck_Parameter; + + public static String CodeAfterAsyncCallCheck_Title; + + public static String CommitTransactionCheck_Commit_transaction_must_be_in_try_catch; + + public static String CommitTransactionCheck_No_begin_transaction_for_commit_transaction; + + public static String RollbackTransactionCheck_No_begin_transaction_for_rollback_transaction; + + public static String RollbackTransactionCheck_No_commit_transaction_for_begin_transaction; + + public static String CommitTransactionCheck_No_rollback_transaction_for_begin_transaction; + + public static String CommitTransactionCheck_Should_be_no_executable_code_between_commit_and_exception; + + public static String RollbackTransactionCheck_Should_be_no_executable_code_between_exception_and_rollback; + + public static String BeginTransactionCheck_Executable_code_between_begin_transaction_and_try; + + public static String CommitTransactionCheck_Transaction_contains_empty_except; + + public static String CommitTransactionCheck_Transactions_is_broken; + + public static String CommitTransactionCheck_Transactions_is_broken_des; + + public static String BeginTransactionCheck_Begin_transaction_is_incorrect; + + public static String BeginTransactionCheck_Try_must_be_after_begin; + + public static String BeginTransactionCheck_Try_was_not_found_after_calling_begin; + + public static String CommonModuleMissingApiCheck_Description; + + public static String CommonModuleMissingApiCheck_Issue; + + public static String CommonModuleMissingApiCheck_Title; + + public static String CommonModuleNamedSelfReferenceCheck_description; + + public static String CommonModuleNamedSelfReferenceCheck_issue; + + public static String CommonModuleNamedSelfReferenceCheck_title; + + public static String ConsecutiveEmptyLines_Description; + + public static String ConsecutiveEmptyLines_Parameter_title; + + public static String ConsecutiveEmptyLines_Sequence_of_empty_lines_between__0__and__1__is_greator_than__2; + + public static String ConsecutiveEmptyLines_Title; + + public static String DeprecatedProcedureOutsideDeprecatedRegionCheck_Deprecated_function_out_of_deprecated_area; + + public static String DeprecatedProcedureOutsideDeprecatedRegionCheck_description; + + public static String DeprecatedProcedureOutsideDeprecatedRegionCheck_title; + + public static String EmptyExceptStatementCheck_description; + public static String EmptyExceptStatementCheck_title; + + public static String EventDataExchangeLoadCheck_Check_at_the_beginning_of_event_handler; + public static String EventDataExchangeLoadCheck_description; + public static String EventDataExchangeLoadCheck_Function_list_that_checks_DataExchange_Load; + public static String EventDataExchangeLoadCheck_Mandatory_checking_of_DataExchangeLoad_is_absent_in_event_handler_0; + public static String EventDataExchangeLoadCheck_No_return_in__DataExchange_Load__checking; + public static String EventDataExchangeLoadCheck_title; + + public static String EventHandlerBooleanParamCheck_Check_only_in_event_handlers; + + public static String EventHandlerBooleanParamCheck_description; + + public static String EventHandlerBooleanParamCheck_Parameter_0_should_set_to_False; + + public static String EventHandlerBooleanParamCheck_Parameter_0_should_set_to_True; + + public static String EventHandlerBooleanParamCheck_Prams_to_set_to_False; + + public static String EventHandlerBooleanParamCheck_Prams_to_set_to_True; + + public static String EventHandlerBooleanParamCheck_title; + + public static String ReadingAttributesFromDataBaseCheck_Message; + + public static String ReadingAttributesFromDataBaseCheck_Description; + + public static String ReadingAttributesFromDataBaseCheck_Issue__0; + + public static String ReadingAttributesFromDataBaseCheck_Title; + + public static String RedundantExportCheck_Escess_title; + + public static String RedundantExportCheck_Excess_description; + + public static String RedundantExportCheck_Exclude_title; + + public static String RedundantExportCheck_Unused_export_method__0; + + public static String ExportMethodInCommandFormModuleCheck_CheckClientMethodForm; + + public static String ExportMethodInCommandFormModuleCheck_CheckServerMethodForm; + + public static String ExportMethodInCommandFormModuleCheck_ExludeMethodNamePattern; + + public static String ExportMethodInCommandFormModuleCheck_Notify_description_methods; + + public static String ExportMethodInCommandModule_Do_not_emded_export_method_in_modules_of_command_des; + + public static String ExportMethodInCommandModule_Do_not_emded_export_method_in_modules_of_command_result; + + public static String ExportMethodInCommandModule_Do_not_use_export_method_in_commands_module; + + public static String ExportProcedureMissingCommentCheck_description; + + public static String ExportProcedureMissingCommentCheck_Export_procedure_missing_comment; + + public static String ExportProcedureMissingCommentCheck_title; + + public static String ExportVariableInObjectModuleCheck_Description; + + public static String ExportVariableInObjectModuleCheck_Issue; + + public static String ExportVariableInObjectModuleCheck_Title; + + public static String ExtensionVariablePrefixCheck_Description; + + public static String ExtensionVariablePrefixCheck_Title; + + public static String ExtensionVariablePrefixCheck_Variable_0_should_have_1_prefix; + + public static String ExtensionMethodPrefixCheck_Description; + + public static String ExtensionMethodPrefixCheck_Ext_method__0__should_have__1__prefix; + + public static String ExtensionMethodPrefixCheck_Title; + + public static String ManagerModuleNamedSelfReferenceCheck_description; + + public static String ManagerModuleNamedSelfReferenceCheck_issue; + + public static String ManagerModuleNamedSelfReferenceCheck_title; + + public static String ModuleStructureTopRegionCheck_Check_duplicates_of_standard_regions; + + public static String ModuleStructureTopRegionCheck_Check_order_of_standard_regions; + + public static String ModuleStructureTopRegionCheck_description; + + public static String ModuleStructureTopRegionCheck_error_message; + + public static String ModuleStructureTopRegionCheck_Exclude_region_name; + + public static String ModuleStructureTopRegionCheck_Region_has_duplicate; + + public static String ModuleStructureTopRegionCheck_Region_has_the_wrong_order; + + public static String ModuleStructureTopRegionCheck_Region_is_not_standard_for_current_type_of_module; + + public static String ModuleStructureTopRegionCheck_title; + + public static String ModuleUnusedMethodCheck_Title; + public static String ModuleUnusedMethodCheck_Description; + public static String ModuleUnusedMethodCheck_Exclude_method_name_pattern_title; + public static String ModuleUnusedMethodCheck_Unused_method__0; + + public static String ModuleEmptyMethodCheck_Title; + public static String ModuleEmptyMethodCheck_Description; + public static String ModuleEmptyMethodCheck_Exclude_method_name_pattern_title; + public static String ModuleEmptyMethodCheck_Allow_method_comments_title; + public static String ModuleEmptyMethodCheck_Empty_method__0; + + public static String ModuleUnusedLocalVariableCheck_Title; + public static String ModuleUnusedLocalVariableCheck_Description; + public static String ModuleUnusedLocalVariableCheck_Unused_local_variable__0; + public static String ModuleUnusedLocalVariableCheck_Probably_variable_not_initilized_yet__0; + + public static String ModuleStructureEventFormRegionsCheck_Description; + + public static String ModuleStructureEventFormRegionsCheck_Event_method__0__can_not_be_placed_in_the_region__1; + + public static String ModuleStructureEventFormRegionsCheck_Event_method__0__should_be_placed_in_the_region__1; + + public static String ModuleStructureEventFormRegionsCheck_Excluded_method_names; + + public static String ModuleStructureEventFormRegionsCheck_Multilevel_nesting_of_regions; + + public static String ModuleStructureEventFormRegionsCheck_Title; + + public static String ModuleStructureEventRegionsCheck_Description; + + public static String ModuleStructureEventRegionsCheck_Event_handler__0__not_region__1; + + public static String ModuleStructureEventRegionsCheck_Only_event_methods__0; + + public static String ModuleStructureEventRegionsCheck_Title; + + public static String ModuleStructureInitCodeInRegion_Description; + + public static String ModuleStructureInitCodeInRegion_Issue__0; + + public static String ModuleStructureInitCodeInRegion_Title; + + public static String ModuleStructureMethodInRegionCheck_Description; + + public static String ModuleStructureMethodInRegionCheck_Method_should_be_placed_in_one_of_the_standard_regions; + + public static String ModuleStructureMethodInRegionCheck_Multilevel_nesting_of_regions; + + public static String ModuleStructureMethodInRegionCheck_Only_export; + + public static String ModuleStructureMethodInRegionCheck_Title; + + public static String ModuleStructureVariablesInRegionCheck_Description; + + public static String ModuleStructureVariablesInRegionCheck_Issue__0; + + public static String ModuleStructureVariablesInRegionCheck_Title; + + public static String QueryInLoop_check_query_in_infinite_loop; + public static String QueryInLoop_description; + public static String QueryInLoop_Loop_has_method_with_query__0; + public static String QueryInLoop_Loop_has_query; + public static String QueryInLoop_title; + + public static String SelfReferenceCheck_check_object_module; + + public static String SelfReferenceCheck_check_only_existing_form_properties; + + public static String SelfReferenceCheck_Description; + + public static String SelfReferenceCheck_Title; + + public static String SelfReferenceCheck_Issue; + + public static String ServerExecutionSafeModeCheck_description; + + public static String ServerExecutionSafeModeCheck_eval_issue; + + public static String ServerExecutionSafeModeCheck_execute_issue; + + public static String ServerExecutionSafeModeCheck_title; + + public static String StructureCtorTooManyKeysCheck_description; + public static String StructureCtorTooManyKeysCheck_Maximum_structure_constructor_keys; + public static String StructureCtorTooManyKeysCheck_Structure_constructor_has_more_than__0__keys; + public static String StructureCtorTooManyKeysCheck_title; + + public static String NewColorCheck_Use_style_elements; + + public static String NewColorCheck_Use_style_elements_not_specific_values; + + public static String NewColorCheck_Using_new_color; + + public static String NewFontCheck_Description; + + public static String NewFontCheck_Issue; + + public static String NewFontCheck_Title; + + public static String NstrStringLiteralFormatCheck_Check_empty_interface_for_each_language; + + public static String NstrStringLiteralFormatCheck_description; + + public static String NstrStringLiteralFormatCheck_NStr_contains_unknown_language_code__S; + + public static String NstrStringLiteralFormatCheck_NStr_format_is_incorrect__E; + + public static String NstrStringLiteralFormatCheck_NStr_message_for_code__S__ends_with_space; + + public static String NstrStringLiteralFormatCheck_NStr_message_for_language_code__S__is_empty; + + public static String NstrStringLiteralFormatCheck_NStr_message_is_empty; + + public static String NstrStringLiteralFormatCheck_NStr_method_should_accept_string_as_first_param; + + public static String NstrStringLiteralFormatCheck_title; + + public static String RegionEmptyCheck_description; + + public static String RegionEmptyCheck_Region_is_empty; + + public static String RegionEmptyCheck_title; + + public static String RollbackTransactionCheck_Rollback_transaction_must_be_in_try_catch; + + public static String RollbackTransactionCheck_Transactions_is_broken; + + public static String RollbackTransactionCheck_Transactions_is_broken_des; + + public static String UseGotoOperatorCheck_description; + + public static String UseGotoOperatorCheck_title; + + public static String UseGotoOperatorCheck_Use_Goto_operator; + + public static String UseGotoOperatorCheck_Use_Label_with_Goto_operator; + + public static String UnknownFormParameterAccessCheck_description; + + public static String UnknownFormParameterAccessCheck_title; + + public static String UnknownFormParameterAccessCheck_Unknown_form_parameter_access; + + public static String UseNonRecommendedMethods_description; + + public static String UseNonRecommendedMethods_message; + + public static String UseNonRecommendedMethods_parameter; + + public static String UseNonRecommendedMethods_title; + + public static String MethodOptionalParameterBeforeRequiredCheck_description; + + public static String MethodOptionalParameterBeforeRequiredCheck_Optional_parameter_before_required; + + public static String MethodOptionalParameterBeforeRequiredCheck_title; + + public static String MethodTooManyPramsCheck_description; + + public static String MethodTooManyPramsCheck_Max_parameters; + + public static String MethodTooManyPramsCheck_Max_parameters_with_default_value; + + public static String MethodTooManyPramsCheck_Method_has_more_than__N__params; + + public static String MethodTooManyPramsCheck_Method_has_more_than__N__params_with_default_value; + + public static String MethodTooManyPramsCheck_title; + + public static String MissingTemporaryFileDeletionCheck_Delete_File_Methods; + + public static String MissingTemporaryFileDeletionCheck_description; + + public static String MissingTemporaryFileDeletionCheck_Missing_Temporary_File_Deletion; + + public static String MissingTemporaryFileDeletionCheck_title; + + public static String FormDataToValueCheck_Description; + + public static String FormDataToValueCheck_Issue; + + public static String FormDataToValueCheck_Title; + + public static String FormModulePragmaCheck_description; + + public static String FormModulePragmaCheck_Form_module_compilation_pragma_used; + + public static String FormModulePragmaCheck_title; + + public static String NotifyDescriptionToServerProcedureCheck_description; + + public static String NotifyDescriptionToServerProcedureCheck_Notify_description_procedure_should_be_export; + + public static String NotifyDescriptionToServerProcedureCheck_Notify_description_to_Server_procedure; + + public static String NotifyDescriptionToServerProcedureCheck_title; + + public static String FormModuleMissingPragmaCheck_description; + + public static String FormModuleMissingPragmaCheck_Missing_compilation_directives; + + public static String FormModuleMissingPragmaCheck_title; + + public static String FormSelfReferenceOutdatedCheck_Description; + + public static String FormSelfReferenceOutdatedCheck_Issue; + + public static String FormSelfReferenceOutdatedCheck_Title; + + public static String InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_description; + + public static String InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_result; + + public static String InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_title; + + public static String IsInRoleCheck_Exception_Roles; + + public static String IsInRoleCheck_Use_AccessRight; + + public static String IsInRoleCheck_Use_AccessRight_instead_IsInRole; + + public static String IsInRoleCheck_Using_IsInRole; + + public static String IsInRoleMethodRoleExistCheck_description; + + public static String IsInRoleMethodRoleExistCheck_Role_named_not_exists_in_configuration; + + public static String IsInRoleMethodRoleExistCheck_title; + + public static String ModuleUndefinedVariableCheck_Title; + public static String ModuleUndefinedVariableCheck_Description; + public static String ModuleUndefinedVariable_msg; + public static String ModuleUndefinedMethodCheck_Title; + public static String ModuleUndefinedMethodCheck_Description; + public static String ModuleUndefinedFunctionCheck_Title; + public static String ModuleUndefinedFunctionCheck_Description; + public static String ModuleUndefinedFunction_msg; + public static String ModuleUndefinedMethod_msg; + + public static String LockOutOfTry_Checks_for_init_of_the_data_lock; + + public static String LockOutOfTry_Lock_out_of_try; + + public static String LockOutOfTry_Method_lock_out_of_try; + + public static String OptionalFormParameterAccessCheck_description; + + public static String OptionalFormParameterAccessCheck_Optional_form_parameter_access; + + public static String OptionalFormParameterAccessCheck_title; + + public static String VariableNameInvalidCheck_description; + public static String VariableNameInvalidCheck_message_variable_length_is_less_than; + public static String VariableNameInvalidCheck_param_MIN_NAME_LENGTH_PARAM_title; + public static String VariableNameInvalidCheck_title; + public static String VariableNameInvalidCheck_variable_name_is_invalid; + public static String VariableNameInvalidCheck_variable_name_must_start_with_a_capital_letter; + public static String VariableNameInvalidCheck_variable_name_starts_with_an_underline; + + static + { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() + { + // N/A + } +} diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MethodOptionalParameterBeforeRequiredCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MethodOptionalParameterBeforeRequiredCheckTest.java index 7f10ae16e..7b405fdeb 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MethodOptionalParameterBeforeRequiredCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MethodOptionalParameterBeforeRequiredCheckTest.java @@ -16,11 +16,12 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.MethodOptionalParameterBeforeRequiredCheck; /** @@ -48,9 +49,12 @@ public void testOptionalParamBeforeRequire() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - - assertEquals("1", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("10", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(1, 10), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MethodTooManyPramsCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MethodTooManyPramsCheckTest.java index beab8ae54..f9ad35eee 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MethodTooManyPramsCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MethodTooManyPramsCheckTest.java @@ -22,8 +22,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.MethodTooManyPramsCheck; /** @@ -53,25 +53,25 @@ public void testMethodHasTooManyParameters() throws Exception List markers = getModuleMarkers(); assertEquals(12, markers.size()); - Set errorLines = new HashSet<>(); + Set errorLines = new HashSet<>(); for (Marker marker : markers) { - String line = marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY); + Integer line = marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE); switch (line) { // Noncompliant1 - case "7": - case "8": - case "9": - case "10": - case "11": - case "12": - case "13": + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: // Noncompliant2 - case "24": + case 24: // Noncompliant3: 29, 30, 31 - not error yet // Noncompliant4 - case "40": + case 40: errorLines.add(line); break; diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MissingTemporaryFileDeletionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MissingTemporaryFileDeletionCheckTest.java index 38e6a0e7b..925b00e41 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MissingTemporaryFileDeletionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/MissingTemporaryFileDeletionCheckTest.java @@ -16,15 +16,15 @@ import static org.junit.Assert.assertEquals; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import org.eclipse.core.resources.IProject; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.check.settings.CheckUid; import com.e1c.g5.v8.dt.check.settings.ICheckParameterSettings; import com.e1c.g5.v8.dt.check.settings.ICheckSettings; @@ -47,8 +47,6 @@ public class MissingTemporaryFileDeletionCheckTest private static final String TEST_CUSTOM_DELETE_FILE_METHODS_PARAM_LEVEL2 = "Справочники.Товары.МоеУдалениеФайла,Catalog.Goods.MyFileDeletion"; //$NON-NLS-1$ - private static final String MESSAGE = "Missing temporary file deletion after use."; //$NON-NLS-1$ - public MissingTemporaryFileDeletionCheckTest() { super(MissingTemporaryFileDeletionCheck.class); @@ -67,13 +65,14 @@ public void testNonCompliant() throws Exception List markers = getModuleMarkers(); assertEquals(3, markers.size()); - Set lines = new HashSet<>(); + Set lines = new LinkedHashSet<>(); for (Marker marker : markers) { - assertEquals(MESSAGE, marker.getMessage()); - lines.add(marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Messages.MissingTemporaryFileDeletionCheck_Missing_Temporary_File_Deletion, + marker.getMessage()); + lines.add(marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } - assertEquals(Set.of("3", "12", "22"), lines); + assertEquals(Set.of(3, 12, 22), lines); } /** diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleEmptyMethodCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleEmptyMethodCheckTest.java index f107f6196..ae8e50e08 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleEmptyMethodCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleEmptyMethodCheckTest.java @@ -15,11 +15,12 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ModuleEmptyMethodCheck; /** @@ -44,10 +45,11 @@ public void testSingleCheckMarker() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(1); - assertEquals("12", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(6, 12), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureEventFormRegionsCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureEventFormRegionsCheckTest.java index 8ac8b0892..1b73f7fab 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureEventFormRegionsCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureEventFormRegionsCheckTest.java @@ -14,14 +14,15 @@ import static org.junit.Assert.assertEquals; +import java.text.MessageFormat; import java.util.List; import java.util.stream.Collectors; import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; import com.e1c.v8codestyle.bsl.check.ModuleStructureEventFormRegionsCheck; @@ -80,9 +81,10 @@ public void testFormEventInWrongRegion() throws Exception List markers = getMarkers(CATALOG_WRONG_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("20", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("The event method \"OnOpen\" should be placed in the \"FormEventHandlers\" region", - markers.get(0).getMessage()); + assertEquals(Integer.valueOf(20), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format( + Messages.ModuleStructureEventFormRegionsCheck_Event_method__0__should_be_placed_in_the_region__1, "OnOpen", + "FormEventHandlers"), markers.get(0).getMessage()); } @Test @@ -91,9 +93,10 @@ public void testFormEventInWrongMethod() throws Exception List markers = getMarkers(CATALOG_WRONG_METHOD_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("3", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("Method \"WrongMethod\" can not be placed in the \"FormEventHandlers\" region", - markers.get(0).getMessage()); + assertEquals(Integer.valueOf(3), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format( + Messages.ModuleStructureEventFormRegionsCheck_Event_method__0__can_not_be_placed_in_the_region__1, + "WrongMethod", "FormEventHandlers"), markers.get(0).getMessage()); } @Test @@ -109,9 +112,10 @@ public void testFormFieldEventInWrongRegion() throws Exception List markers = getMarkers(CATALOG_FIELD_WRONG_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("13", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("The event method \"DescriptionOnChange\" should be placed " - + "in the \"FormHeaderItemsEventHandlers\" region", markers.get(0).getMessage()); + assertEquals(Integer.valueOf(13), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format( + Messages.ModuleStructureEventFormRegionsCheck_Event_method__0__should_be_placed_in_the_region__1, + "DescriptionOnChange", "FormHeaderItemsEventHandlers"), markers.get(0).getMessage()); } @Test @@ -120,9 +124,10 @@ public void testFormFieldEventInWrongMethod() throws Exception List markers = getMarkers(CATALOG_FIELD_WRONG_METHOD_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("7", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("Method \"WrongMethod\" can not be placed in the \"FormHeaderItemsEventHandlers\" region", - markers.get(0).getMessage()); + assertEquals(Integer.valueOf(7), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format( + Messages.ModuleStructureEventFormRegionsCheck_Event_method__0__can_not_be_placed_in_the_region__1, + "WrongMethod", "FormHeaderItemsEventHandlers"), markers.get(0).getMessage()); } @Test @@ -138,9 +143,10 @@ public void testFormCommandEventInWrongRegion() throws Exception List markers = getMarkers(CATALOG_COMMAND_WRONG_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("5", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("The event method \"Command1\" should be placed in the \"FormCommandsEventHandlers\" region", - markers.get(0).getMessage()); + assertEquals(Integer.valueOf(5), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format( + Messages.ModuleStructureEventFormRegionsCheck_Event_method__0__should_be_placed_in_the_region__1, + "Command1", "FormCommandsEventHandlers"), markers.get(0).getMessage()); } @Test @@ -149,9 +155,10 @@ public void testFormFieldCommandInWrongMethod() throws Exception List markers = getMarkers(CATALOG_COMMAND_WRONG_METHOD_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("15", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("Method \"WrongMethod\" can not be placed in the \"FormCommandsEventHandlers\" region", - markers.get(0).getMessage()); + assertEquals(Integer.valueOf(15), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format( + Messages.ModuleStructureEventFormRegionsCheck_Event_method__0__can_not_be_placed_in_the_region__1, + "WrongMethod", "FormCommandsEventHandlers"), markers.get(0).getMessage()); } @Test @@ -167,11 +174,10 @@ public void testFormTableEventInWrongRegion() throws Exception List markers = getMarkers(CATALOG_TABLE_WRONG_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("9", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals( - "The event method \"TableAttribute1OnChange\" should be placed " - + "in the \"FormTableItemsEventHandlersTable\" region", - markers.get(0).getMessage()); + assertEquals(Integer.valueOf(9), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format( + Messages.ModuleStructureEventFormRegionsCheck_Event_method__0__should_be_placed_in_the_region__1, + "TableAttribute1OnChange", "FormTableItemsEventHandlersTable"), markers.get(0).getMessage()); } @Test @@ -180,9 +186,10 @@ public void testFormTableCommandInWrongMethod() throws Exception List markers = getMarkers(CATALOG_TABLE_WRONG_METHOD_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("12", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("Method \"WrongMethod\" can not be placed in the \"FormTableItemsEventHandlers\" region", - markers.get(0).getMessage()); + assertEquals(Integer.valueOf(12), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(MessageFormat.format( + Messages.ModuleStructureEventFormRegionsCheck_Event_method__0__can_not_be_placed_in_the_region__1, + "WrongMethod", "FormTableItemsEventHandlers"), markers.get(0).getMessage()); } private List getMarkers(String moduleFileName) diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureEventRegionsCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureEventRegionsCheckTest.java index 1a2656242..1e3a57998 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureEventRegionsCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureEventRegionsCheckTest.java @@ -20,8 +20,8 @@ import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; import com.e1c.v8codestyle.bsl.check.ModuleStructureEventRegionsCheck; @@ -57,7 +57,7 @@ public void testEventModuleManagerInWrongRegion() throws Exception List markers = getMarkers(CATALOG_MODULE_MANAGER_EVENT_WRONG_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("16", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(16), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -73,7 +73,7 @@ public void testEventModuleManagerInRegionWrongMethod() throws Exception List markers = getMarkers(CATALOG_MODULE_MANAGER_EVENT_WRONG_METHOD_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("8", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(8), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureInitCodeInRegionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureInitCodeInRegionCheckTest.java index 9d8bdadec..87181f72e 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureInitCodeInRegionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureInitCodeInRegionCheckTest.java @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; import com.e1c.v8codestyle.bsl.check.ModuleStructureInitCodeInRegionCheck; @@ -60,7 +60,7 @@ public void testInWrongRegion() throws Exception List markers = getMarkers(CATALOG_WRONG_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("20", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(20), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -69,7 +69,7 @@ public void testOutOfRegion() throws Exception List markers = getMarkers(CATALOG_OUT_OF_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("31", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(31), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } private List getMarkers(String moduleFileName) diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureMethodInRegionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureMethodInRegionCheckTest.java index ada955cff..2782f9ab3 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureMethodInRegionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureMethodInRegionCheckTest.java @@ -24,8 +24,8 @@ import org.junit.Test; import com._1c.g5.v8.dt.core.platform.IDtProject; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.check.settings.CheckUid; import com.e1c.g5.v8.dt.check.settings.ICheckSettings; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; @@ -90,7 +90,7 @@ public void testNoRegion() throws Exception List markers = getMarkers(COMMON_MODULE_NO_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("1", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(1), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -99,7 +99,7 @@ public void testMethodAfterRegion() throws Exception List markers = getMarkers(COMMON_MODULE_AFTER_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("5", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(5), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -108,7 +108,7 @@ public void testEventModuleManagerOutOfRegion() throws Exception List markers = getMarkers(CATALOG_MODULE_MANAGER_EVENT_OUT_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("10", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(10), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -117,7 +117,7 @@ public void testExportMethodInNonInterfaceRegion() throws Exception List markers = getMarkers(COMMON_MODULE_EXPORT_IN_NON_INTERFACE_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("3", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -126,7 +126,7 @@ public void testMethodInRegion() throws Exception List markers = getMarkers(COMMON_MODULE_IN_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("3", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -142,7 +142,7 @@ public void testMethodOutOfRegionInForm() throws Exception List markers = getMarkers(FORM_MODULE_OUT_OF_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("2", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -151,7 +151,7 @@ public void testMethodOutOfRegionInCommand() throws Exception List markers = getMarkers(COMMAND_MODULE_OUT_OF_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("3", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -181,7 +181,7 @@ public void testMethodOutOfNonMultiRegionOptionNonComplient() throws Exception List markers = getMarkers(COMMON_MODULE_OUT_OF_MULTI_REGION_NONCOMPLIENT_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("6", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureTopRegionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureTopRegionCheckTest.java index c5a2f01b1..e0850a56b 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureTopRegionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureTopRegionCheckTest.java @@ -20,8 +20,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ModuleStructureTopRegionCheck; /** @@ -33,9 +33,6 @@ public class ModuleStructureTopRegionCheckTest extends AbstractSingleModuleTestBase { - private static final String REGION_HAS_THE_WRONG_ORDER = "Region has the wrong order"; - private static final String REGION_HAS_DUPLICATE = "Region has duplicate"; - private static final String CATALOG_FORM_MODULE_FILE_NAME = "/src/Catalogs/Catalog/Forms/ItemForm/Module.bsl"; private static final String CHECK_ID = "module-structure-top-region"; //$NON-NLS-1$ @@ -44,12 +41,6 @@ public ModuleStructureTopRegionCheckTest() super(ModuleStructureTopRegionCheck.class); } - @Override - protected String getTestConfigurationName() - { - return "ModuleStructureTopRegionCheck"; - } - /** * Test that the region is on top of the module structure. * @@ -76,7 +67,7 @@ public void testSubRegion() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); - assertEquals("12", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(12), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -92,7 +83,7 @@ public void testSubRegionAfterMethod() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("18", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(18), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -122,7 +113,7 @@ public void testTopRegionNonCompliant() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -138,7 +129,7 @@ public void testTopRegionNotOnTop() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("10", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(10), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -153,8 +144,8 @@ public void testTopRegionIsDuplicated() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - assertEquals(REGION_HAS_DUPLICATE, markers.get(0).getMessage()); - assertEquals(REGION_HAS_DUPLICATE, markers.get(1).getMessage()); + assertEquals(Messages.ModuleStructureTopRegionCheck_Region_has_duplicate, markers.get(0).getMessage()); + assertEquals(Messages.ModuleStructureTopRegionCheck_Region_has_duplicate, markers.get(1).getMessage()); } /** @@ -169,8 +160,8 @@ public void testTopRegionIsWrongOrder() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - assertEquals(REGION_HAS_THE_WRONG_ORDER, markers.get(0).getMessage()); - assertEquals(REGION_HAS_THE_WRONG_ORDER, markers.get(1).getMessage()); + assertEquals(Messages.ModuleStructureTopRegionCheck_Region_has_the_wrong_order, markers.get(0).getMessage()); + assertEquals(Messages.ModuleStructureTopRegionCheck_Region_has_the_wrong_order, markers.get(1).getMessage()); } /** @@ -184,4 +175,10 @@ public void testTopRegionFormModuleCompliant() throws Exception Marker marker = getFirstMarker(CHECK_ID, CATALOG_FORM_MODULE_FILE_NAME, getProject()); assertNull(marker); } + + @Override + protected String getTestConfigurationName() + { + return "ModuleStructureTopRegionCheck"; + } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureVariablesInRegionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureVariablesInRegionCheckTest.java index d86fea794..effbe7212 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureVariablesInRegionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureVariablesInRegionCheckTest.java @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; import com.e1c.v8codestyle.bsl.check.ModuleStructureVariablesInRegionCheck; @@ -69,7 +69,7 @@ public void testNoVariablesRegion() throws Exception List markers = getMarkers(CATALOG_NO_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("2", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -78,7 +78,7 @@ public void testOutOfVariablesRegion() throws Exception List markers = getMarkers(CATALOG_OUT_OF_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("5", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(5), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -87,7 +87,7 @@ public void testWrongRegion() throws Exception List markers = getMarkers(CATALOG_WRONG_REGION_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("6", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } private List getMarkers(String moduleFileName) diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleUnusedLocalVariableCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleUnusedLocalVariableCheckTest.java index add58bb98..737c36f2a 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleUnusedLocalVariableCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleUnusedLocalVariableCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ModuleUnusedLocalVariableCheck; /** @@ -46,7 +46,7 @@ public void testSingleCheckMarker() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("9", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(9), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleUnusedMethodCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleUnusedMethodCheckTest.java index 85864794b..071eb7a24 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleUnusedMethodCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleUnusedMethodCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ModuleUnusedMethodCheck; /** @@ -48,7 +48,7 @@ public void testSingleCheckMarker() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Override diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NewColorCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NewColorCheckTest.java index bbfeeb4a9..27d13fbde 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NewColorCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NewColorCheckTest.java @@ -30,10 +30,6 @@ public class NewColorCheckTest extends AbstractSingleModuleTestBase { - - private static final String NEW_COLOR = - "To change the design, you should use style elements, and not set specific values directly in the controls"; - public NewColorCheckTest() { super(NewColorCheck.class); @@ -47,7 +43,7 @@ public void testNewColor1() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals(NEW_COLOR, marker.getMessage()); + assertEquals(Messages.NewColorCheck_Use_style_elements, marker.getMessage()); } @Test @@ -58,7 +54,7 @@ public void testNewColor2() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals(NEW_COLOR, marker.getMessage()); + assertEquals(Messages.NewColorCheck_Use_style_elements, marker.getMessage()); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NewFontCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NewFontCheckTest.java index c26d44a46..40328c39a 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NewFontCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NewFontCheckTest.java @@ -19,8 +19,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.NewFontCheck; /** @@ -45,7 +45,7 @@ public void testNewFont1() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -56,7 +56,7 @@ public void testNewFont2() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("8", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(8), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheck2Test.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheck2Test.java index fc5cfa153..039a337b6 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheck2Test.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheck2Test.java @@ -15,11 +15,12 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.NotifyDescriptionToServerProcedureCheck; /** @@ -48,18 +49,12 @@ public void testCommonModuleServerProcedure() throws Exception List markers = getModuleMarkers(); assertEquals(4, markers.size()); - - Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(1); - assertEquals("8", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(2); - assertEquals("18", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(3); - assertEquals("20", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(6, 8, 18, 20), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheck3Test.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheck3Test.java index fea86c25c..358a3be16 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheck3Test.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheck3Test.java @@ -22,8 +22,8 @@ import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; import com.e1c.v8codestyle.bsl.check.NotifyDescriptionToServerProcedureCheck; import com.e1c.v8codestyle.internal.bsl.BslPlugin; @@ -50,12 +50,12 @@ public void testCommonModuleServerProcedure() throws Exception { List markers = getModuleMarkers(); assertEquals(2, markers.size()); - - Marker marker = markers.get(0); - assertEquals("11", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(1); - assertEquals("21", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(11, 21), errorLines); } @Override diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheckTest.java index 5f7310ca9..ef9f90d02 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NotifyDescriptionToServerProcedureCheckTest.java @@ -15,12 +15,13 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; import com._1c.g5.v8.dt.bsl.model.Module; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.NotifyDescriptionToServerProcedureCheck; /** @@ -72,12 +73,12 @@ public void testLocalServerProcedure() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - - Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(1); - assertEquals("7", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(5, 7), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NstrStringLiteralFormatCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NstrStringLiteralFormatCheckTest.java index 67f0a3606..70e1ad699 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NstrStringLiteralFormatCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/NstrStringLiteralFormatCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.NstrStringLiteralFormatCheck; /** @@ -64,7 +64,7 @@ public void testNstrStringIsStringLiteral() throws Exception Marker marker = getModuleFirstMarker(); assertNotNull(marker); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -80,7 +80,7 @@ public void testNstrStringLiteralIsEmpty() throws Exception Marker marker = getModuleFirstMarker(); assertNotNull(marker); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -96,7 +96,7 @@ public void testNstrStringLiteralFormatIsNotValid() throws Exception Marker marker = getModuleFirstMarker(); assertNotNull(marker); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -112,7 +112,7 @@ public void testNstrLanguageCodeNotExist() throws Exception Marker marker = getModuleFirstMarker(); assertNotNull(marker); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -128,7 +128,7 @@ public void testNstrLanguageTextIsEmpty() throws Exception Marker marker = getModuleFirstMarker(); assertNotNull(marker); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -144,7 +144,7 @@ public void testNstrStringLiteralEndsWithStapce() throws Exception Marker marker = getModuleFirstMarker(); assertNotNull(marker); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -160,7 +160,7 @@ public void testNstrStringLiteralEndsWithNewLine() throws Exception Marker marker = getModuleFirstMarker(); assertNotNull(marker); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/OptionalFormParameterAccessCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/OptionalFormParameterAccessCheckTest.java index bda1d6ec4..8e34f5b90 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/OptionalFormParameterAccessCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/OptionalFormParameterAccessCheckTest.java @@ -19,8 +19,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.OptionalFormParameterAccessCheck; /** @@ -63,7 +63,7 @@ public void testOptionalFormParameterAccess() throws Exception assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/PublicMethodCachingCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/PublicMethodCachingCheckTest.java index 88cbf0a8d..1c285f143 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/PublicMethodCachingCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/PublicMethodCachingCheckTest.java @@ -21,8 +21,8 @@ import org.eclipse.core.runtime.Path; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; import com.e1c.v8codestyle.bsl.check.PublicMethodCachingCheck; @@ -53,7 +53,7 @@ public void testCachedMethod() throws Exception { List markers = getMarkers(CACHED_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("2", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/QueryInLoopCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/QueryInLoopCheckTest.java index c353021b2..2d1197707 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/QueryInLoopCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/QueryInLoopCheckTest.java @@ -29,8 +29,8 @@ import com._1c.g5.v8.dt.bsl.model.FeatureAccess; import com._1c.g5.v8.dt.bsl.model.Method; import com._1c.g5.v8.dt.bsl.model.Module; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.check.settings.CheckUid; import com.e1c.g5.v8.dt.check.settings.ICheckSettings; import com.e1c.v8codestyle.bsl.check.QueryInLoopCheck; @@ -141,7 +141,7 @@ public void testQueryInLoop() throws Exception for (Marker marker : markers) { - String uriToProblem = marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY); + String uriToProblem = marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM); assertTrue(uriErrors.contains(uriToProblem)); uriErrors.remove(uriToProblem); } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ReadingAttributesFromDataBaseCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ReadingAttributesFromDataBaseCheckTest.java index 4ce3c759a..14dbebf2f 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ReadingAttributesFromDataBaseCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ReadingAttributesFromDataBaseCheckTest.java @@ -19,8 +19,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ReadingAttributesFromDataBaseCheck; /** @@ -61,7 +61,7 @@ public void testWrongReadPropertyDbCompliant() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); - assertEquals("3", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -90,7 +90,7 @@ public void testReadPropertyNonCompliant() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); - assertEquals("8", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(8), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RedundantExportMethodCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RedundantExportMethodCheckTest.java index 50f204ad4..b280f380e 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RedundantExportMethodCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RedundantExportMethodCheckTest.java @@ -21,8 +21,8 @@ import org.junit.Ignore; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; import com.e1c.v8codestyle.bsl.check.RedundantExportMethodCheck; @@ -58,7 +58,7 @@ public void testNoCallNoPublic() throws Exception List markers = getMarkers(MODULE_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("1", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(1), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test @@ -82,7 +82,7 @@ public void testLocalCall() throws Exception List markers = getMarkers(CATALOG_FILE_NAME); assertEquals(1, markers.size()); - assertEquals("2", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), markers.get(0).getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @Test diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RegionEmptyCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RegionEmptyCheckTest.java index 93a11b356..13dea05e1 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RegionEmptyCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RegionEmptyCheckTest.java @@ -19,8 +19,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.RegionEmptyCheck; /** @@ -50,7 +50,7 @@ public void testRegionIsEmpty() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -66,7 +66,7 @@ public void testRegionAfterIsEmpty() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("10", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(10), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -82,7 +82,7 @@ public void testRegionBeforeIsEmpty() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -98,7 +98,7 @@ public void testRegionHasEmptySubRegion() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RollbackTransactionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RollbackTransactionCheckTest.java index 48181646b..c8c87db03 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RollbackTransactionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RollbackTransactionCheckTest.java @@ -46,7 +46,7 @@ public void testRollbackTransactionMustBeInTtryCatch() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("Rollback transaction must be in a try-catch", marker.getMessage()); + assertEquals(Messages.RollbackTransactionCheck_Rollback_transaction_must_be_in_try_catch, marker.getMessage()); } @Test @@ -57,7 +57,8 @@ public void testNoBeginTransactionForRollbackTransaction() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("There is no begin transaction for rollback transaction", marker.getMessage()); + assertEquals(Messages.RollbackTransactionCheck_No_begin_transaction_for_rollback_transaction, + marker.getMessage()); } @Test @@ -68,7 +69,8 @@ public void testNoCommitTransactionForBeginTransaction() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("There is no commit transaction for begin transaction", marker.getMessage()); + assertEquals(Messages.RollbackTransactionCheck_No_commit_transaction_for_begin_transaction, + marker.getMessage()); } @Test @@ -79,7 +81,7 @@ public void testShouldBeNoExecutableCodebetweenExceptionAndRollback() throws Exc List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("There should be no executable code between exception and rollback transaction", + assertEquals(Messages.RollbackTransactionCheck_Should_be_no_executable_code_between_exception_and_rollback, marker.getMessage()); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/SelfReferenceCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/SelfReferenceCheckTest.java index 6a511c894..8a30c91d5 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/SelfReferenceCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/SelfReferenceCheckTest.java @@ -24,8 +24,8 @@ import org.junit.Test; import com._1c.g5.v8.dt.core.platform.IDtProject; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.check.settings.CheckUid; import com.e1c.g5.v8.dt.check.settings.ICheckSettings; import com.e1c.v8codestyle.bsl.check.SelfReferenceCheck; @@ -71,11 +71,12 @@ public void testCommonModule() throws Exception { List markers = getMarkers(COMMON_MODULE_FILE_NAME); assertEquals(4, markers.size()); - - assertEquals("6", markers.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("6", markers.get(3).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("10", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("10", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(6, 6, 10, 10), errorLines); } /** @@ -88,10 +89,12 @@ public void testFormModule() throws Exception { List markers = getMarkers(FORM_MODULE_FILE_NAME); assertEquals(3, markers.size()); - - assertEquals("11", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("12", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("13", markers.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(11, 12, 13), errorLines); IDtProject dtProject = getProject(); IProject project = dtProject.getWorkspaceProject(); @@ -101,17 +104,12 @@ public void testFormModule() throws Exception List markersAfterSettingsChange = getMarkers(FORM_MODULE_FILE_NAME); assertEquals(5, markersAfterSettingsChange.size()); - - assertEquals("11", - markersAfterSettingsChange.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("11", - markersAfterSettingsChange.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("12", - markersAfterSettingsChange.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("12", - markersAfterSettingsChange.get(3).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("13", - markersAfterSettingsChange.get(4).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + errorLines = markersAfterSettingsChange.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(11, 11, 12, 12, 13), errorLines); } /** @@ -124,11 +122,12 @@ public void testObjectModule() throws Exception { List markers = getMarkers(OBJECT_MODULE_FILE_NAME); assertEquals(4, markers.size()); - - assertEquals("8", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("8", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("9", markers.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("9", markers.get(3).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(8, 8, 9, 9), errorLines); IDtProject dtProject = getProject(); IProject project = dtProject.getWorkspaceProject(); @@ -145,14 +144,11 @@ private List getMarkers(String moduleFileName) String moduleId = Path.ROOT.append(getTestConfigurationName()).append(moduleFileName).toString(); List markers = List.of(markerManager.getMarkers(getProject().getWorkspaceProject(), moduleId)); - String chekcId = getCheckId(); + String checkId = getCheckId(); - assertNotNull(chekcId); + assertNotNull(checkId); return markers.stream() - .filter(marker -> chekcId.equals(getCheckIdFromMarker(marker, getProject()))) - .sorted((marker1, marker2) -> marker1.getExtraInfo() - .get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY) - .compareTo(marker2.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY))) + .filter(marker -> checkId.equals(getCheckIdFromMarker(marker, getProject()))) .collect(Collectors.toList()); } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ServerExecutionSafeModeCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ServerExecutionSafeModeCheckTest.java index 85637ee6b..6695f69f5 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ServerExecutionSafeModeCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ServerExecutionSafeModeCheckTest.java @@ -22,8 +22,8 @@ import org.junit.Ignore; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.ServerExecutionSafeModeCheck; /** @@ -79,13 +79,12 @@ public void testCommonModuleServerCall() throws Exception { List markers = getMarkers(COMMON_MODULE_SERVER_CALL_FILE_NAME); assertEquals(6, markers.size()); - - assertEquals("4", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("5", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("11", markers.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("26", markers.get(3).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("29", markers.get(4).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("30", markers.get(5).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(4, 5, 11, 26, 29, 30), errorLines); } /** @@ -98,11 +97,12 @@ public void testFormModule() throws Exception { List markers = getMarkers(FORM_MODULE_FILE_NAME); assertEquals(4, markers.size()); - - assertEquals("4", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("5", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("14", markers.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals("15", markers.get(3).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(4, 5, 14, 15), errorLines); } private List getMarkers(String moduleFileName) diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/StructureCtorTooManyKeysCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/StructureCtorTooManyKeysCheckTest.java index dda3e973a..280dad6ff 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/StructureCtorTooManyKeysCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/StructureCtorTooManyKeysCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.StructureCtorTooManyKeysCheck; /** @@ -49,7 +49,7 @@ public void testStructureConstructorKeys() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("11", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(11), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UnknownFormParameterAccessCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UnknownFormParameterAccessCheckTest.java index 97708bf7d..3d35303ba 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UnknownFormParameterAccessCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UnknownFormParameterAccessCheckTest.java @@ -19,8 +19,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.UnknownFormParameterAccessCheck; /** @@ -30,17 +30,16 @@ public class UnknownFormParameterAccessCheckTest extends AbstractSingleModuleTestBase { - + private static final String PROJECT_NAME = "UnknownFormParameterAccess"; - + private static final String COMMON_FORM_FILE_NAME = "/src/CommonForms/TestForm/Module.bsl"; - - + public UnknownFormParameterAccessCheckTest() { super(UnknownFormParameterAccessCheck.class); } - + @Override protected String getTestConfigurationName() { @@ -52,7 +51,7 @@ protected String getModuleFileName() { return COMMON_FORM_FILE_NAME; } - + /** * Test the form module use unknown parameters access. * @@ -66,9 +65,9 @@ public void testFormModuleUnknownParametersAccess() throws Exception assertEquals(2, markers.size()); Marker marker = markers.get(0); - assertEquals("8", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(8), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); marker = markers.get(1); - assertEquals("10", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(10), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UseGotoOperatorCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UseGotoOperatorCheckTest.java index 3a40a3a9e..001c8ea8e 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UseGotoOperatorCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UseGotoOperatorCheckTest.java @@ -1,16 +1,14 @@ package com.e1c.v8codestyle.bsl.check.itests; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.util.List; -import java.util.Set; -import java.util.TreeSet; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.UseGotoOperatorCheck; /** @@ -40,16 +38,12 @@ public void testUseGotoOperator() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - - Set testMarkersList = Set.of("3", "5"); - Set projectMarkersList = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); - - for (Marker marker : markers) - { - projectMarkersList.add(marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } - - assertTrue(testMarkersList.equals(projectMarkersList)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(3, 5), errorLines); } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UseNonRecommendedMethodsTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UseNonRecommendedMethodsTest.java index e26682109..9b74d68cd 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UseNonRecommendedMethodsTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UseNonRecommendedMethodsTest.java @@ -15,11 +15,12 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.UseNonRecommendedMethodCheck; /** @@ -49,14 +50,11 @@ public void testUseNonRecommendedMethods() throws Exception List markers = getModuleMarkers(); assertEquals(3, markers.size()); - - Marker marker = markers.get(0); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(1); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - marker = markers.get(2); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(2, 3, 4), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UsingFormDataToValueCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UsingFormDataToValueCheckTest.java index 44ad9f469..b7e5f8df7 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UsingFormDataToValueCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/UsingFormDataToValueCheckTest.java @@ -21,13 +21,13 @@ import com._1c.g5.v8.bm.core.IBmObject; import com._1c.g5.v8.dt.bsl.model.Module; import com._1c.g5.v8.dt.metadata.mdclass.AbstractForm; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.UsingFormDataToValueCheck; /** * The test for {@link UsingFormDataToValueCheck} check. - * + * * @author Artem Iliukhin */ public class UsingFormDataToValueCheckTest @@ -76,6 +76,6 @@ public void testFormModuleHasPragma() throws Exception updateModule(FOLDER_RESOURCE + "using-form-data-to-value.bsl"); Marker marker = getModuleFirstMarker(); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/VariableNameInvalidCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/VariableNameInvalidCheckTest.java index 9c0d9af6d..4bf37552a 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/VariableNameInvalidCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/VariableNameInvalidCheckTest.java @@ -2,14 +2,13 @@ import static org.junit.Assert.assertEquals; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.VariableNameInvalidCheck; /** @@ -39,17 +38,12 @@ public void testVariableName() throws Exception List markers = getModuleMarkers(); assertEquals(7, markers.size()); - - List benchmarkLines = Arrays.asList("2", "3", "7", "8", "12", "13", "36"); - - List markersLines = new ArrayList<>(); - for (Marker m : markers) - { - markersLines.add(m.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } - - assertEquals(true, markersLines.containsAll(benchmarkLines) && benchmarkLines.containsAll(markersLines)); - + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(2, 3, 7, 8, 12, 13, 36), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/messages.properties b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/messages.properties new file mode 100644 index 000000000..2b2d397bb --- /dev/null +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/messages.properties @@ -0,0 +1,515 @@ + +#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) +############################################################################### +# Copyright (C) 2021-2022, 1C-Soft LLC and others. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# 1C-Soft LLC - initial API and implementation +# Aleksandr Kapralov - issue #17, #449, #458 +# Viktor Gukov - issue #394 +############################################################################### +AccessibilityAtClientInObjectModuleCheck_Declared_variable_accessible_AtClient = Declared variable accessible AtClient + +AccessibilityAtClientInObjectModuleCheck_Event_handler_should_be_accessible_AtClient = Event handler should be accessible AtClient + +AccessibilityAtClientInObjectModuleCheck_Manager_event_handlers_allows_to_be_AtClient = Manager event handlers allows to be AtClient, comma-separated + +AccessibilityAtClientInObjectModuleCheck_Method_accessible_AtClient = Method accessible AtClient + +AccessibilityAtClientInObjectModuleCheck_Methods_should_be_AtClient = Methods should be AtClient, comma separated + +AccessibilityAtClientInObjectModuleCheck_description = Method or variable accessible AtClient in manager or object module + +AccessibilityAtClientInObjectModuleCheck_title = Method or variable accessible AtClient + +AttachableEventHandlerNameCheck_Description = Programmatically added event handler name should match pattern + +AttachableEventHandlerNameCheck_Event_handler_name_pattern = Event handler name pattern + +AttachableEventHandlerNameCheck_Message = Programmatically added event handler name "{0}" should match pattern + +AttachableEventHandlerNameCheck_Title = Attachable event handler name + +BeginTransactionCheck_Begin_transaction_is_incorrect = Begin transaction is incorrect + +BeginTransactionCheck_Executable_code_between_begin_transaction_and_try = There should be no executable code between begin transaction and try + +BeginTransactionCheck_Try_must_be_after_begin = Try-catch must be after begin transaction + +BeginTransactionCheck_Try_was_not_found_after_calling_begin = The try operator was not found after calling begin transaction + +CachedPublicCheck_Description = Cached public method + +CachedPublicCheck_Issue = Not recommended to use cached public method + +CachedPublicCheck_Title = Cached public method + +CanonicalPragmaCheck_Pragma_0_is_not_written_canonically_correct_spelling_is_1 = Annotation {0} is not written canonically, correct spelling is {1} + +CanonicalPragmaCheck_description = Check pragma is written canonically + +CanonicalPragmaCheck_title = Pragma is written canonically + +ChangeAndValidateInsteadOfAroundCheck_Use_ChangeAndValidate_instead_of_Around = It's recommended to use pragma &ChangeAndValidate instead of &Around + +ChangeAndValidateInsteadOfAroundCheck_description = Checks that pragma &ChangeAndValidate is used when there is no call ProceedWithCall + +ChangeAndValidateInsteadOfAroundCheck_title = Use pragma &ChangeAndValidate instead of &Around + +CodeAfterAsyncCallCheck_Description = Checks that the asynchronous method is not followed by lines of code, since in this case the specified lines of code are executed immediately, without waiting for the asynchronous method to execute + +CodeAfterAsyncCallCheck_Issue = The asynchronous method is followed by lines of code + +CodeAfterAsyncCallCheck_Parameter = Only with the defined parameter NotifyDescription, if applicable + +CodeAfterAsyncCallCheck_Title = The code should not follow an asynchronous call + +CommitTransactionCheck_Commit_transaction_must_be_in_try_catch = Commit transaction must be in a try-catch + +CommitTransactionCheck_No_begin_transaction_for_commit_transaction = There is no begin transaction for commit transaction + +CommitTransactionCheck_No_rollback_transaction_for_begin_transaction = There is no rollback transaction for begin transaction + +CommitTransactionCheck_Should_be_no_executable_code_between_commit_and_exception = There should be no executable code between commit transaction and exception + +CommitTransactionCheck_Transaction_contains_empty_except = The transaction contains an empty exception block + +CommitTransactionCheck_Transactions_is_broken = Commit transaction is incorrect + +CommitTransactionCheck_Transactions_is_broken_des = Commit transaction must be in a try-catch, there should be no executable code between commit transaction and exception, there is no begin transaction for commit transaction, there is no rollback transaction for begin transaction. + +CommonModuleMissingApiCheck_Description = Programming interface + +CommonModuleMissingApiCheck_Issue = Common module does not contain a programming interface + +CommonModuleMissingApiCheck_Title = Programming interface + +CommonModuleNamedSelfReferenceCheck_description = Excessive named self reference + +CommonModuleNamedSelfReferenceCheck_issue = Excessive named self reference + +CommonModuleNamedSelfReferenceCheck_title = Excessive named self reference in common module + +ConsecutiveEmptyLines_Description = Consecutive empty lines + +ConsecutiveEmptyLines_Parameter_title = Maximum number of empty lines + +ConsecutiveEmptyLines_Sequence_of_empty_lines_between__0__and__1__is_greator_than__2 = The sequence of empty lines between lines {0} and {1} is more than {2} + +ConsecutiveEmptyLines_Title = Consecutive empty lines + +DeprecatedProcedureOutsideDeprecatedRegionCheck_Deprecated_function_out_of_deprecated_area = The deprecated procedure (function) "{0}" should be placed in the Deprecated region of the Public region in a common module area + +DeprecatedProcedureOutsideDeprecatedRegionCheck_description = Deprecated procedure (function) should be placed in the Deprecated region of the Public region in a common module area + +DeprecatedProcedureOutsideDeprecatedRegionCheck_title = Deprecated procedure (function) is outside deprecated region + +EmptyExceptStatementCheck_description = Empty except statement + +EmptyExceptStatementCheck_title = Empty except statement + +EventDataExchangeLoadCheck_Check_at_the_beginning_of_event_handler = Check at the beginning of event handler + +EventDataExchangeLoadCheck_Function_list_that_checks_DataExchange_Load = Function list that checks DataExchange.Load + +EventDataExchangeLoadCheck_Mandatory_checking_of_DataExchangeLoad_is_absent_in_event_handler_0 = Mandatory checking of "DataExchange.Load" is absent in event handler "{0}" + +EventDataExchangeLoadCheck_No_return_in__DataExchange_Load__checking = No Return in "DataExchange.Load" checking + +EventDataExchangeLoadCheck_description = Mandatory checking of DataExchange.Load is absent in event handler + +EventDataExchangeLoadCheck_title = Check DataExchange.Load in event handler + +EventHandlerBooleanParamCheck_Check_only_in_event_handlers = Check only in event handlers + +EventHandlerBooleanParamCheck_Parameter_0_should_set_to_False = Parameter "{0}" should set to False, but expression may replace exiting value to True + +EventHandlerBooleanParamCheck_Parameter_0_should_set_to_True = Parameter "{0}" should set to True, but expression may replace exiting value to False + +EventHandlerBooleanParamCheck_Prams_to_set_to_False = Prams to set to False + +EventHandlerBooleanParamCheck_Prams_to_set_to_True = Prams to set to True + +EventHandlerBooleanParamCheck_description = Use event handler boolean parameter + +EventHandlerBooleanParamCheck_title = Use event handler boolean parameter + +ExportMethodInCommandFormModuleCheck_CheckClientMethodForm = Check the client method of the form + +ExportMethodInCommandFormModuleCheck_CheckServerMethodForm = Check the server method of the form + +ExportMethodInCommandFormModuleCheck_ExludeMethodNamePattern = Exclude method name pattern + +ExportMethodInCommandFormModuleCheck_Notify_description_methods = Comma-separated list of excluded notification method names + +ExportMethodInCommandModule_Do_not_emded_export_method_in_modules_of_command_des = Do not embed export procedures and functions in modules of commands and forms. You cannot address such modules from external code, so embedded export procedures and functions become dysfunctional. + +ExportMethodInCommandModule_Do_not_emded_export_method_in_modules_of_command_result = Do not embed export procedures and functions in modules of commands and forms. You cannot address such modules from external code, so embedded export procedures and functions become dysfunctional. + +ExportMethodInCommandModule_Do_not_use_export_method_in_commands_module = Restrictions on the use of export procedures and functions + +ExportProcedureMissingCommentCheck_Export_procedure_missing_comment = Export procedure (function) "{0}" should be described by adding comment + +ExportProcedureMissingCommentCheck_description = Export procedure (function) should be described by adding comment + +ExportProcedureMissingCommentCheck_title = Export procedure (function) should be described by adding comment + +ExportVariableInObjectModuleCheck_Description = Use of an export variable is not recommended + +ExportVariableInObjectModuleCheck_Issue = It's not recommended to use the export variable in the object module + +ExportVariableInObjectModuleCheck_Title = Use of an export variable is not recommended + +ExtensionMethodPrefixCheck_Description = The procedure (function) in the module of the extension object does not have a prefix corresponding to the prefix of the extension itself + +ExtensionMethodPrefixCheck_Ext_method__0__should_have__1__prefix = The method "{0}" should have "{1}" prefix + +ExtensionMethodPrefixCheck_Title = Extension method does not have extension prefix + +ExtensionVariablePrefixCheck_Description = The variable in the module of the extension object does not have a prefix corresponding to the prefix of the extension itself + +ExtensionVariablePrefixCheck_Title = Extension variable does not have extension prefix + +ExtensionVariablePrefixCheck_Variable_0_should_have_1_prefix = The variable "{0}" should have "{1}" prefix + +FormDataToValueCheck_Description = Using FormDataToValue instead FormAttributeToValue + +FormDataToValueCheck_Issue = Use FormAttributeToValue instead FormDataToValue + +FormDataToValueCheck_Title = Using FormDataToValue instead FormAttributeToValue + +FormModuleMissingPragmaCheck_Missing_compilation_directives = Missing compilation directives + +FormModuleMissingPragmaCheck_description = Always use compilation pragma in form module + +FormModuleMissingPragmaCheck_title = Always use compilation pragma in form module + +FormModulePragmaCheck_Form_module_compilation_pragma_used = Form module compilation pragma used + +FormModulePragmaCheck_description = Use form module compilation pragma + +FormModulePragmaCheck_title = Use form module compilation pragma + +FormSelfReferenceOutdatedCheck_Description = "ThisObject" should be used instead of outdated "ThisForm" + +FormSelfReferenceOutdatedCheck_Issue = "ThisObject" should be used instead of outdated "ThisForm" + +FormSelfReferenceOutdatedCheck_Title = Outdated alias used + +InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_description = Program invocation of form event handler + +InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_result = Program invocation of form event handler + +InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_title = Program invocation of form event handler + +IsInRoleCheck_Exception_Roles = Untested roles + +IsInRoleCheck_Use_AccessRight = Use the AccessRight() function instead of IsInRole() + +IsInRoleCheck_Use_AccessRight_instead_IsInRole = Use the AccessRight() function instead of IsInRole() + +IsInRoleCheck_Using_IsInRole = Using "IsInRole" method + +IsInRoleMethodRoleExistCheck_Role_named_not_exists_in_configuration=Role named {0} not exists in configuration + +IsInRoleMethodRoleExistCheck_description=Referring to a non-existent role + +IsInRoleMethodRoleExistCheck_title=Referring to a non-existent role + +LockOutOfTry_Checks_for_init_of_the_data_lock = Checks for initialization of the data lock. If the creation of a lock is found, the call of the Lock() method is checked, and the call must be in a try. + +LockOutOfTry_Lock_out_of_try = Lock out of Try + +LockOutOfTry_Method_lock_out_of_try = Method Lock() out of try block + +ManagerModuleNamedSelfReferenceCheck_description = Excessive named self reference + +ManagerModuleNamedSelfReferenceCheck_issue = Excessive named self reference + +ManagerModuleNamedSelfReferenceCheck_title = Excessive named self reference in manager module + +MethodOptionalParameterBeforeRequiredCheck_description=Optional parameter before required + +MethodOptionalParameterBeforeRequiredCheck_Optional_parameter_before_required=Optional parameter before required + +MethodOptionalParameterBeforeRequiredCheck_title=Optional parameter before required + +MethodTooManyPramsCheck_Max_parameters = Max parameters + +MethodTooManyPramsCheck_Max_parameters_with_default_value = Max parameters with default value + +MethodTooManyPramsCheck_Method_has_more_than__N__params = Method has more then {0} parameters + +MethodTooManyPramsCheck_Method_has_more_than__N__params_with_default_value = Method has more then {0} parameters with default value + +MethodTooManyPramsCheck_description = Method has to many parameters + +MethodTooManyPramsCheck_title = Method has to many parameters + +MissingTemporaryFileDeletionCheck_Delete_File_Methods = Delete file methods + +MissingTemporaryFileDeletionCheck_Missing_Temporary_File_Deletion = Missing temporary file deletion after use. + +MissingTemporaryFileDeletionCheck_description = Missing temporary file deletion after use. + +MissingTemporaryFileDeletionCheck_title = Missing temporary file deletion after use. + +ModuleEmptyMethodCheck_Allow_method_comments_title = Allow method comments + +ModuleEmptyMethodCheck_Description = Empty module method check + +ModuleEmptyMethodCheck_Empty_method__0 = Empty method "{0}" + +ModuleEmptyMethodCheck_Exclude_method_name_pattern_title = Exclude method name pattern + +ModuleEmptyMethodCheck_Title = Empty method check + +ModuleStructureEventFormRegionsCheck_Description = Checks the region of form event handlers for methods related only to handlers + +ModuleStructureEventFormRegionsCheck_Event_method__0__can_not_be_placed_in_the_region__1 = Method "{0}" can not be placed in the "{1}" region + +ModuleStructureEventFormRegionsCheck_Event_method__0__should_be_placed_in_the_region__1 = The event method "{0}" should be placed in the "{1}" region + +ModuleStructureEventFormRegionsCheck_Excluded_method_names = Comma-separated list of excluded command event method names + +ModuleStructureEventFormRegionsCheck_Multilevel_nesting_of_regions = Allow multilevel nesting of regions + +ModuleStructureEventFormRegionsCheck_Title = Checks the region of form event handlers for methods related only to handlers + +ModuleStructureEventRegionsCheck_Description = Checks the region of event handlers for the existence of methods related only to handlers + +ModuleStructureEventRegionsCheck_Event_handler__0__not_region__1 = The event handler "{0}" should be placed in the "{1}" region + +ModuleStructureEventRegionsCheck_Only_event_methods__0 = Only event methods can be placed in the "{0}" region + +ModuleStructureEventRegionsCheck_Title = Checks the region of event handlers for the existence of methods related only to handlers + +ModuleStructureInitCodeInRegion_Description = Initialize code should be placed in the Initialize region + +ModuleStructureInitCodeInRegion_Issue__0 = Initialize code should be placed in the {0} region + +ModuleStructureInitCodeInRegion_Title = Initialize code is in the correct region + +ModuleStructureMethodInRegionCheck_Description = Checks that the method is outside the standard region, and suggests placing the method in one of the standard regions for the current type of module + +ModuleStructureMethodInRegionCheck_Method_should_be_placed_in_one_of_the_standard_regions = The method "{0}" should be placed in one of the standard regions: {1} + +ModuleStructureMethodInRegionCheck_Multilevel_nesting_of_regions = Allow multilevel nesting of regions + +ModuleStructureMethodInRegionCheck_Only_export = Only export methods can be placed in the "{0}" region + +ModuleStructureMethodInRegionCheck_Title = Method is outside a standard region + +ModuleStructureTopRegionCheck_Check_duplicates_of_standard_regions = Check duplicates of standard regions + +ModuleStructureTopRegionCheck_Check_order_of_standard_regions = Check order of standard regions + +ModuleStructureTopRegionCheck_Exclude_region_name = Comma-separated list of excluded region names + +ModuleStructureTopRegionCheck_Region_has_duplicate = Region has duplicate + +ModuleStructureTopRegionCheck_Region_has_the_wrong_order = Region has the wrong order + +ModuleStructureTopRegionCheck_Region_is_not_standard_for_current_type_of_module = Region is not standard for current type of module + +ModuleStructureTopRegionCheck_description = Check that the regions on top of the module structure matches with the standard + +ModuleStructureTopRegionCheck_error_message = Module structure region is not on top + +ModuleStructureTopRegionCheck_title = Module structure top region + +ModuleStructureVariablesInRegionCheck_Description = Variable declaration should be placed in the variable declaration region + +ModuleStructureVariablesInRegionCheck_Issue__0 = Variable declaration should be placed in the {0} region + +ModuleStructureVariablesInRegionCheck_Title = Variable declaration is in the correct region + +ModuleUndefinedFunctionCheck_Description = Undefined function + +ModuleUndefinedFunctionCheck_Title = Undefined function + +ModuleUndefinedFunction_msg = Function "{0}" is not defined + +ModuleUndefinedMethodCheck_Description = Undefined function or procedure + +ModuleUndefinedMethodCheck_Title = Undefined method + +ModuleUndefinedMethod_msg = Procedure or function "{0}" is not defined + +ModuleUndefinedVariableCheck_Description = Undefined variable + +ModuleUndefinedVariableCheck_Title = Undefined variable + +ModuleUndefinedVariable_msg = Variable "{0}" is not defined + +ModuleUnusedLocalVariableCheck_Description = Unused module local variable check + +ModuleUnusedLocalVariableCheck_Probably_variable_not_initilized_yet__0 = Probably local variable "{0}" has not been initialized yet + +ModuleUnusedLocalVariableCheck_Title = Unused local variable check + +ModuleUnusedLocalVariableCheck_Unused_local_variable__0 = Unused local variable "{0}" + +ModuleUnusedMethodCheck_Description = Unused module method check + +ModuleUnusedMethodCheck_Exclude_method_name_pattern_title = Exclude method name pattern + +ModuleUnusedMethodCheck_Title = Unused method check + +ModuleUnusedMethodCheck_Unused_method__0 = Unused method "{0}" + +NewColorCheck_Use_style_elements = To change the design, you should use style elements, and not set specific values directly in the controls + +NewColorCheck_Use_style_elements_not_specific_values = To change the design, you should use style elements, and not set specific values directly in the controls. This is required in order for similar controls to look the same in all forms where they occur. + +NewColorCheck_Using_new_color = Using the "New Color" construction + +NewFontCheck_Description = To change the font you should use style elements + +NewFontCheck_Issue = To change the font you should use style elements + +NewFontCheck_Title = Using the "New Font" construction + +NotifyDescriptionToServerProcedureCheck_Notify_description_procedure_should_be_export = Notify description procedure should exist and be export + +NotifyDescriptionToServerProcedureCheck_Notify_description_to_Server_procedure = Notify description to Server procedure + +NotifyDescriptionToServerProcedureCheck_description = Notify description to Server procedure + +NotifyDescriptionToServerProcedureCheck_title = Notify description to Server procedure + +NstrStringLiteralFormatCheck_Check_empty_interface_for_each_language = Check empty interface for each language + +NstrStringLiteralFormatCheck_NStr_contains_unknown_language_code__S = NStr contains unknown language code {0} + +NstrStringLiteralFormatCheck_NStr_format_is_incorrect__E = NStr format is incorrect {0} + +NstrStringLiteralFormatCheck_NStr_message_for_code__S__ends_with_space = NStr message for code {0} ends with space + +NstrStringLiteralFormatCheck_NStr_message_for_language_code__S__is_empty = NStr message for language code {0} is empty + +NstrStringLiteralFormatCheck_NStr_message_is_empty = NStr message is empty + +NstrStringLiteralFormatCheck_NStr_method_should_accept_string_as_first_param = NStr method should accept string as first parameter + +NstrStringLiteralFormatCheck_description = NStr string literal format + +NstrStringLiteralFormatCheck_title = NStr string literal format + +OptionalFormParameterAccessCheck_description = Optional form parameter access + +OptionalFormParameterAccessCheck_Optional_form_parameter_access = Optional form parameter {0} access + +OptionalFormParameterAccessCheck_title = Optional form parameter access + +QueryInLoop_Loop_has_method_with_query__0 = Loop has method with query "{0}" + +QueryInLoop_Loop_has_query = Loop has query + +QueryInLoop_check_query_in_infinite_loop = Check query in infinite loop + +QueryInLoop_description = Check query in loop + +QueryInLoop_title = Query in loop + +ReadingAttributesFromDataBaseCheck_Description = Reading single object attribute from the database + +ReadingAttributesFromDataBaseCheck_Issue__0 = When the {0} is read from the reference, the entire object is imported from the database + +ReadingAttributesFromDataBaseCheck_Message = Allow field access with composite non reference type + +ReadingAttributesFromDataBaseCheck_Title = Reading single object attribute from the database + +RedundantExportCheck_Escess_title = Redundant Export keyword + +RedundantExportCheck_Excess_description = Checks the modules contain unused export procedures and functions. The check searches for all references to the method, so it can take a long time. + +RedundantExportCheck_Exclude_title = Comma-separated list of excluded region names + +RedundantExportCheck_Unused_export_method__0 = Unused export method "{0}" + +RegionEmptyCheck_Region_is_empty = Region is empty + +RegionEmptyCheck_description = Check that module region is empty + +RegionEmptyCheck_title = Region is empty + +RollbackTransactionCheck_No_begin_transaction_for_rollback_transaction = There is no begin transaction for rollback transaction + +RollbackTransactionCheck_No_commit_transaction_for_begin_transaction = There is no commit transaction for begin transaction + +RollbackTransactionCheck_Rollback_transaction_must_be_in_try_catch = Rollback transaction must be in a try-catch + +RollbackTransactionCheck_Should_be_no_executable_code_between_exception_and_rollback = There should be no executable code between exception and rollback transaction + +RollbackTransactionCheck_Transactions_is_broken = Rollback transaction is incorrect + +RollbackTransactionCheck_Transactions_is_broken_des = Rollback transaction must be in a try-catch, there should be no executable code between exception and rollback transaction, there is no begin transaction for rollback transaction, there is no commit transaction for begin transaction. + +SelfReferenceCheck_Description = Excessive usage of self reference (when referencing method, property or attribute) + +SelfReferenceCheck_Issue = Excessive usage of self reference (when referencing method, property or attribute) + +SelfReferenceCheck_Title = Excessive self reference + +SelfReferenceCheck_check_object_module = Check object (recordset, value manager) module + +SelfReferenceCheck_check_only_existing_form_properties = Check only existing form properties + +ServerExecutionSafeModeCheck_description = Safe mode is not enabled when calling "Execute" or "Eval' + +ServerExecutionSafeModeCheck_eval_issue = Safe mode is not enabled when calling "Eval" + +ServerExecutionSafeModeCheck_execute_issue = Safe mode is not enabled when calling "Execute" + +ServerExecutionSafeModeCheck_title = Safe mode is not enabled when calling "Execute" or "Eval" + +StructureCtorTooManyKeysCheck_Maximum_structure_constructor_keys = Maximum structure constructor keys + +StructureCtorTooManyKeysCheck_Structure_constructor_has_more_than__0__keys = Structure constructor has more then {0} keys + +StructureCtorTooManyKeysCheck_description = Check structure constructor has too many keys + +StructureCtorTooManyKeysCheck_title = Structure constructor has too many keys + +UseGotoOperatorCheck_Use_Goto_operator = Use Goto operator + +UseGotoOperatorCheck_Use_Label_with_Goto_operator = Use Label with Goto operator + +UseGotoOperatorCheck_description = Use Goto operator + +UseGotoOperatorCheck_title = Use Goto operator + +UnknownFormParameterAccessCheck_Unknown_form_parameter_access = Unknown form parameter "{0}" access + +UnknownFormParameterAccessCheck_description = Unknown form parameter access + +UnknownFormParameterAccessCheck_title = Unknown form parameter access + +UseNonRecommendedMethods_description = Using non-recommended methods + +UseNonRecommendedMethods_message = Using non-recommended method + +UseNonRecommendedMethods_parameter = List of non-recommended methods + +UseNonRecommendedMethods_title = Using non-recommended methods + +VariableNameInvalidCheck_description = Variable name is invalid + +VariableNameInvalidCheck_message_variable_length_is_less_than = variable length is less than {0} + +VariableNameInvalidCheck_param_MIN_NAME_LENGTH_PARAM_title = Min. lenght of variable name + +VariableNameInvalidCheck_title = Variable name is invalid + +VariableNameInvalidCheck_variable_name_is_invalid = Variable name {0} is invalid: {1} + +VariableNameInvalidCheck_variable_name_must_start_with_a_capital_letter = variable name must start with a capital letter + +VariableNameInvalidCheck_variable_name_starts_with_an_underline = variable name starts with an underline diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/messages_ru.properties b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/messages_ru.properties new file mode 100644 index 000000000..9eadbaf33 --- /dev/null +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/messages_ru.properties @@ -0,0 +1,515 @@ +#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) +############################################################################### +# Copyright (C) 2021-2022, 1C-Soft LLC and others. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# 1C-Soft LLC - initial API and implementation +# Aleksandr Kapralov - issue #17, #449, #458 +# Viktor Gukov - issue #394 +############################################################################### + +AccessibilityAtClientInObjectModuleCheck_Declared_variable_accessible_AtClient = Объявленная переменная доступна НаКлиенте + +AccessibilityAtClientInObjectModuleCheck_Event_handler_should_be_accessible_AtClient = Обработчик события должен быть доступен НаКлиенте + +AccessibilityAtClientInObjectModuleCheck_Manager_event_handlers_allows_to_be_AtClient = Обработчики событий менеджер разрешены НаКлиенте, разделенные запятой + +AccessibilityAtClientInObjectModuleCheck_Method_accessible_AtClient = Метод доступен НаКлиенте + +AccessibilityAtClientInObjectModuleCheck_Methods_should_be_AtClient = Методы должны быть НаКлиенте, разделенные запятой + +AccessibilityAtClientInObjectModuleCheck_description = Метод или переменная доступны НаКлиенте в модулях менеджера или объекта + +AccessibilityAtClientInObjectModuleCheck_title = Метод или переменная доступны НаКлиенте + +AttachableEventHandlerNameCheck_Description = Имя программно добавленного обработчика события должно соответствовать шаблону + +AttachableEventHandlerNameCheck_Event_handler_name_pattern = Шаблон имени обработчика события + +AttachableEventHandlerNameCheck_Message = Программно добавленное имя обработчика события "{0}" должно соответствовать шаблону + +AttachableEventHandlerNameCheck_Title = Имя подключаемого обработчика события + +BeginTransactionCheck_Begin_transaction_is_incorrect = Нарушена схема работы с "НачатьТранзакцию()" + +BeginTransactionCheck_Executable_code_between_begin_transaction_and_try = Между "НачатьТранзакцию()" и "Попытка" есть исполняемый код + +BeginTransactionCheck_Try_must_be_after_begin = После начала транзакции не найден оператор "Попытка" + +BeginTransactionCheck_Try_was_not_found_after_calling_begin = Не найден оператор "Попытка" после вызова "НачатьТранзакцию()" + +CachedPublicCheck_Description = Кэширование интерфейсного метода + +CachedPublicCheck_Issue = Не рекомендуется кэшировать программный интерфейс + +CachedPublicCheck_Title = Кэширование интерфейсного метода + +CanonicalPragmaCheck_Pragma_0_is_not_written_canonically_correct_spelling_is_1 = Аннотация {0} написана не канонически, правильное написание {1} + +CanonicalPragmaCheck_description = Проверяет что аннотация метода написана канонически + +CanonicalPragmaCheck_title = Аннотация написана канонически + +ChangeAndValidateInsteadOfAroundCheck_Use_ChangeAndValidate_instead_of_Around = Рекомендуется использовать аннотацию &ИзменениеИКонтроль вместо &Вместо + +ChangeAndValidateInsteadOfAroundCheck_description = Проверяет, что при отсутствии вызова ПродолжитьВызов используется аннотация &ИзменениеИКонтроль + +ChangeAndValidateInsteadOfAroundCheck_title = Используется аннотация &ИзменениеИКонтроль вместо &Вместо + +CodeAfterAsyncCallCheck_Description = Проверяет, что за асинхронным методом не следуют строки кода, поскольку в этом случае указанные строки кода выполняются немедленно, не дожидаясь выполнения асинхронного метода + +CodeAfterAsyncCallCheck_Issue = За асинхронным методом следуют строки кода + +CodeAfterAsyncCallCheck_Parameter = Tолько с заданным параметром ОписаниеОповещения, если применимо + +CodeAfterAsyncCallCheck_Title = Код не должен следовать за асинхронным вызовом + +CommitTransactionCheck_Commit_transaction_must_be_in_try_catch = Вызов "ЗафиксироватьТранзакцию()" находится вне конструкции "Попытка... Исключение" + +CommitTransactionCheck_No_begin_transaction_for_commit_transaction = Отсутствует вызов "НачатьТранзакцию()", хотя вызываются "ЗафиксироватьТранзакцию()" + +CommitTransactionCheck_No_rollback_transaction_for_begin_transaction = Для вызова "НачатьТранзакцию()" отсутствует парный вызов "ОтменитьТранзакцию()" + +CommitTransactionCheck_Should_be_no_executable_code_between_commit_and_exception = Между "ЗафиксироватьТранзакцию()" и "Исключение" есть исполняемый код, который может вызвать исключение + +CommitTransactionCheck_Transaction_contains_empty_except = Транзакция содержит пустой блок Исключение + +CommitTransactionCheck_Transactions_is_broken = Нарушена схема работы с "ЗафиксироватьТранзакцию()" + +CommitTransactionCheck_Transactions_is_broken_des = Вызов "ЗафиксироватьТранзакцию()" находится вне конструкции "Попытка... Исключение". Отсутствует вызов "НачатьТранзакцию()", хотя вызываются "ЗафиксироватьТранзакцию()". Для вызова "НачатьТранзакцию()" отсутствует парный вызов "ОтменитьТранзакцию()". Между "ЗафиксироватьТранзакцию()" и "Исключение" есть исполняемый код, который может вызвать исключение. + +CommonModuleMissingApiCheck_Description = Программный интерфейс + +CommonModuleMissingApiCheck_Issue = Общий модуль не содержит программный интерфейс + +CommonModuleMissingApiCheck_Title = Программный интерфейс + +CommonModuleNamedSelfReferenceCheck_description = Избыточное обращение по собственному имени + +CommonModuleNamedSelfReferenceCheck_issue = Избыточное обращение по собственному имени + +CommonModuleNamedSelfReferenceCheck_title = Избыточное обращение по собственному имени в общем модуле + +ConsecutiveEmptyLines_Description = Последовательно расположенные пустые строки + +ConsecutiveEmptyLines_Parameter_title = Максимальное количество последовательно расположенных пустых строк + +ConsecutiveEmptyLines_Sequence_of_empty_lines_between__0__and__1__is_greator_than__2 = Между строками {0} и {1} расположено больше {2} пустых строк + +ConsecutiveEmptyLines_Title = Последовательность пустых строк + +DeprecatedProcedureOutsideDeprecatedRegionCheck_Deprecated_function_out_of_deprecated_area = Устаревшую процедуру (функцию) "{0}" следует перенести в область общего модуля УстаревшиеПроцедурыИФункции, размещенную внутри области ПрограммныйИнтерфейс + +DeprecatedProcedureOutsideDeprecatedRegionCheck_description = Устаревшую процедуру (функцию) следует перенести в область общего модуля УстаревшиеПроцедурыИФункции, размещенную внутри области ПрограммныйИнтерфейс + +DeprecatedProcedureOutsideDeprecatedRegionCheck_title = Устаревшая процедура (функция) расположена вне области УстаревшиеПроцедурыИФункции + +EmptyExceptStatementCheck_description = "Попытка...Исключение" не содержит кода в исключении + +EmptyExceptStatementCheck_title = "Попытка...Исключение" не содержит кода в исключении + +EventDataExchangeLoadCheck_Check_at_the_beginning_of_event_handler = Проверять в начале обработка события + +EventDataExchangeLoadCheck_Function_list_that_checks_DataExchange_Load = Список функций проверяющие ОбменДанными.Загрузка + +EventDataExchangeLoadCheck_Mandatory_checking_of_DataExchangeLoad_is_absent_in_event_handler_0 = Отсутствует обязательная проверка признака ОбменДанными.Загрузка в обработчике события "{0}" + +EventDataExchangeLoadCheck_No_return_in__DataExchange_Load__checking = Отсутствует Возврат в проверке "ОбменДанными.Загрузка" + +EventDataExchangeLoadCheck_description = Отсутствует обязательная проверка признака ОбменДанными.Загрузка в обработчике события + +EventDataExchangeLoadCheck_title = Проверка ОбменДанными.Загрузка в обработчике события + +EventHandlerBooleanParamCheck_Check_only_in_event_handlers = Проверять только в обработчиках событий + +EventHandlerBooleanParamCheck_Parameter_0_should_set_to_False = Параметр "{0}" должен устанавливаться в Ложь, но выражение может заменить текущее значение в Истина + +EventHandlerBooleanParamCheck_Parameter_0_should_set_to_True = Параметр "{0}" должен устанавливаться в Истина, но выражение может заменить текущее значение в Ложь + +EventHandlerBooleanParamCheck_Prams_to_set_to_False = Параметры устанавливаемые в Ложь + +EventHandlerBooleanParamCheck_Prams_to_set_to_True = Параметры устанавливаемые в Истина + +EventHandlerBooleanParamCheck_description = Использование булевого параметра обработчика события + +EventHandlerBooleanParamCheck_title = Использование булевого параметра обработчика события + +ExportMethodInCommandFormModuleCheck_CheckClientMethodForm = Проверить клиентский метод формы + +ExportMethodInCommandFormModuleCheck_CheckServerMethodForm = Проверить серверный метод формы + +ExportMethodInCommandFormModuleCheck_ExludeMethodNamePattern = Шаблон исключаемых имен методов + +ExportMethodInCommandFormModuleCheck_Notify_description_methods = Список исключаемых имен методов оповещения, разделенные запятой + +ExportMethodInCommandModule_Do_not_emded_export_method_in_modules_of_command_des = Не следует размещать экспортные процедуры и функции в модулях команд и форм. К этим модулям нет возможности обращаться из внешнего по отношению к ним кода, поэтому экспортные процедуры и функции в этих модулях не имеют смысла. + +ExportMethodInCommandModule_Do_not_emded_export_method_in_modules_of_command_result = Не следует размещать экспортные процедуры и функции в модулях команд и форм. К этим модулям нет возможности обращаться из внешнего по отношению к ним кода, поэтому экспортные процедуры и функции в этих модулях не имеют смысла. + +ExportMethodInCommandModule_Do_not_use_export_method_in_commands_module = Ограничения на использование экспортных процедур и функций + +ExportProcedureMissingCommentCheck_Export_procedure_missing_comment = Отсутствует комментарий к экспортной процедуре (функции) "{0}" + +ExportProcedureMissingCommentCheck_description = Отсутствует комментарий к экспортной процедуре (функции) + +ExportProcedureMissingCommentCheck_title = Отсутствует комментарий к экспортной процедуре (функции) + +ExportVariableInObjectModuleCheck_Description = Использование экспортной переменной не рекомендовано + +ExportVariableInObjectModuleCheck_Issue = Не рекомендуется использовать экспортную переменную в модуле объекта + +ExportVariableInObjectModuleCheck_Title = Использование экспортной переменной не рекомендовано + +ExtensionMethodPrefixCheck_Description = Имя метода не содержит префикс расширения + +ExtensionMethodPrefixCheck_Ext_method__0__should_have__1__prefix = Имя метода "{0}" должно содержать префикс "{1}" + +ExtensionMethodPrefixCheck_Title = Метод расширения не содержит в имени метода префикс расширения + +ExtensionVariablePrefixCheck_Description = Переменная модуля расширения должна в имени содержать префикс расширения + +ExtensionVariablePrefixCheck_Title = Переменная расширения должна содержать в имени префикс расширения + +ExtensionVariablePrefixCheck_Variable_0_should_have_1_prefix = Переменная "{0}" должна иметь префикс "{1}" + +FormDataToValueCheck_Description = Использование ДанныеФормыВЗначение вместо РеквизитФормыВЗначение + +FormDataToValueCheck_Issue = Рекомендуется использовать РеквизитФормыВЗначение вместо ДанныеФормыВЗначение + +FormDataToValueCheck_Title = Использование ДанныеФормыВЗначение вместо РеквизитФормыВЗначение + +FormModuleMissingPragmaCheck_Missing_compilation_directives = Пропущена директива компиляции + +FormModuleMissingPragmaCheck_description = Всегда использовать директивы компиляции в модуле формы + +FormModuleMissingPragmaCheck_title = Всегда использовать директивы компиляции в модуле формы + +FormModulePragmaCheck_Form_module_compilation_pragma_used = Использована директива компиляции модуля формы + +FormModulePragmaCheck_description = Использование директив компиляции модуля формы + +FormModulePragmaCheck_title = Использование директив компиляции модуля формы + +FormSelfReferenceOutdatedCheck_Description = Следует использовать псевдоним "ЭтотОбъект" вместо устаревшего "ЭтаФорма" + +FormSelfReferenceOutdatedCheck_Issue = Следует использовать псевдоним "ЭтотОбъект" вместо устаревшего "ЭтаФорма" + +FormSelfReferenceOutdatedCheck_Title = Использование устаревшего псевдонима + +InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_description = Программный вызов обработчика события формы + +InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_result = Программный вызов обработчика события формы + +InvocationFormEventHandlerCheck_Program_invocation_of_form_event_handler_title = Программный вызов обработчика события формы + +IsInRoleCheck_Exception_Roles = Непроверяемые роли + +IsInRoleCheck_Use_AccessRight = Следует использовать метод "ПравоДоступа" вместо "РольДоступна" + +IsInRoleCheck_Use_AccessRight_instead_IsInRole = Используйте функцию "ПравоДоступа()" вместо "РольДоступна()" + +IsInRoleCheck_Using_IsInRole = Использован не рекомендованный метод "РольДоступна" + +IsInRoleMethodRoleExistCheck_Role_named_not_exists_in_configuration = Роль {0} не существует в конфигурации + +IsInRoleMethodRoleExistCheck_description = Обращение к несуществующей роли + +IsInRoleMethodRoleExistCheck_title = Обращение к несуществующей роли + +LockOutOfTry_Checks_for_init_of_the_data_lock = Правило проверяет наличие инициализации блокировки данных. В случае если найдено создание блокировки, проверяется вызов метода "Заблокировать()", при этом вызов должен быть в попытке. + +LockOutOfTry_Lock_out_of_try = Метод Заблокировать() вне блока Попытка-Исключение + +LockOutOfTry_Method_lock_out_of_try = Метод Заблокировать() вне блока Попытка-Исключение + +ManagerModuleNamedSelfReferenceCheck_description = Избыточное обращение по собственному имени + +ManagerModuleNamedSelfReferenceCheck_issue = Избыточное обращение по собственному имени + +ManagerModuleNamedSelfReferenceCheck_title = Избыточное обращение по собственному имени в модуле менеджера + +MethodOptionalParameterBeforeRequiredCheck_Optional_parameter_before_required = Необязательный параметр расположен перед обязательным + +MethodOptionalParameterBeforeRequiredCheck_description = Необязательный параметр расположен перед обязательным + +MethodOptionalParameterBeforeRequiredCheck_title = Необязательный параметр расположен перед обязательным + +MethodTooManyPramsCheck_Max_parameters = Максимум параметров + +MethodTooManyPramsCheck_Max_parameters_with_default_value = Максимум параметров со значением по умолчанию + +MethodTooManyPramsCheck_Method_has_more_than__N__params = Метод содержит более чем {0} параметров + +MethodTooManyPramsCheck_Method_has_more_than__N__params_with_default_value = Метод содержит более чем {0} параметров со значением по умолчанию + +MethodTooManyPramsCheck_description = Метод содержит слишком много параметров + +MethodTooManyPramsCheck_title = Метод содержит слишком много параметров + +MissingTemporaryFileDeletionCheck_Delete_File_Methods = Методы удаления файла + +MissingTemporaryFileDeletionCheck_Missing_Temporary_File_Deletion = Отсутствует удаление временного файла после использования. + +MissingTemporaryFileDeletionCheck_description = Отсутствует удаление временного файла после использования. + +MissingTemporaryFileDeletionCheck_title = Отсутствует удаление временного файла после использования. + +ModuleEmptyMethodCheck_Allow_method_comments_title = Учитывать комментарии метода + +ModuleEmptyMethodCheck_Description = Проверка модуля на наличие пустых методов + +ModuleEmptyMethodCheck_Empty_method__0 = Пустой метод "{0}" + +ModuleEmptyMethodCheck_Exclude_method_name_pattern_title = Шаблон исключаемых имен методов + +ModuleEmptyMethodCheck_Title = Проверка пустых методов + +ModuleStructureEventFormRegionsCheck_Description = Проверяет методы области обработчиков событий формы относящиеся только к обработчикам + +ModuleStructureEventFormRegionsCheck_Event_method__0__can_not_be_placed_in_the_region__1 = Метод "{0}" не следует размещать в области "{1}" + +ModuleStructureEventFormRegionsCheck_Event_method__0__should_be_placed_in_the_region__1 = Обработчик события "{0}" следует разместить в области "{1}" + +ModuleStructureEventFormRegionsCheck_Excluded_method_names = Исключение имена методов, разделенные запятой + +ModuleStructureEventFormRegionsCheck_Multilevel_nesting_of_regions = Разрешить многоуровневое вложение областей + +ModuleStructureEventFormRegionsCheck_Title = Проверяет методы области обработчиков событий формы относящиеся только к обработчикам + +ModuleStructureEventRegionsCheck_Description = Проверяет область обработчиков событий на наличие методов относящихся только к обработчикам + +ModuleStructureEventRegionsCheck_Event_handler__0__not_region__1 = Обработчик событий "{0}" следует разместить в область "{1}" + +ModuleStructureEventRegionsCheck_Only_event_methods__0 = В области ''{0}'' следует размещать только обработчики событий + +ModuleStructureEventRegionsCheck_Title = Проверяет область обработчиков событий на наличие методов относящихся только к обработчикам + +ModuleStructureInitCodeInRegion_Description = Код инициализации следует расположить в области инициализации + +ModuleStructureInitCodeInRegion_Issue__0 = Код инициализации следует расположить в области {0} + +ModuleStructureInitCodeInRegion_Title = Код инициализации расположен не в правильной области + +ModuleStructureMethodInRegionCheck_Description = Проверяет что метод находится вне области, и предлагает поместить метод в одну из стандартных для текущего типа модуля область + +ModuleStructureMethodInRegionCheck_Method_should_be_placed_in_one_of_the_standard_regions = Метод "{0}" необходимо разместить в одной из верхнеуровневых областей: {1} + +ModuleStructureMethodInRegionCheck_Multilevel_nesting_of_regions = Разрешить многоуровневое вложение областей + +ModuleStructureMethodInRegionCheck_Only_export = Только экспортные методы могут быть размещены в области "{0}" + +ModuleStructureMethodInRegionCheck_Title = Метод вне области + +ModuleStructureTopRegionCheck_Check_duplicates_of_standard_regions = Дубли стандартных областей + +ModuleStructureTopRegionCheck_Check_order_of_standard_regions = Порядок стандартных областей + +ModuleStructureTopRegionCheck_Exclude_region_name = Список имен областей исключений, разделенный запятой + +ModuleStructureTopRegionCheck_Region_has_duplicate = Дублирование стандартной области + +ModuleStructureTopRegionCheck_Region_has_the_wrong_order = Неправильный порядок стандартной области + +ModuleStructureTopRegionCheck_Region_is_not_standard_for_current_type_of_module = Область не стандартная для текущего типа модуля + +ModuleStructureTopRegionCheck_description = Проверить, что области верхнего уровня структуры модуля соответствуют стандарту + +ModuleStructureTopRegionCheck_error_message = Стандартная область структуры модуля является вложенной + +ModuleStructureTopRegionCheck_title = Стандартная область структуры модуля верхнеуровневая + +ModuleStructureVariablesInRegionCheck_Description = Объявление переменной должно быть помещено в область объявления переменной + +ModuleStructureVariablesInRegionCheck_Issue__0 = Объявление переменной должно быть помещено в область {0} + +ModuleStructureVariablesInRegionCheck_Title = Объявление переменных расположено в правильной области + +ModuleUndefinedFunctionCheck_Description = Функция не определена + +ModuleUndefinedFunctionCheck_Title = Функция не определена + +ModuleUndefinedFunction_msg = Функция "{0}" не определена + +ModuleUndefinedMethodCheck_Description = Функция или процедура не определена + +ModuleUndefinedMethodCheck_Title = Метод не определен + +ModuleUndefinedMethod_msg = Процедура или функция "{0}" не определена + +ModuleUndefinedVariableCheck_Description = Переменная не определена + +ModuleUndefinedVariableCheck_Title = Переменная не определена + +ModuleUndefinedVariable_msg = Переменная "{0}" не определена + +ModuleUnusedLocalVariableCheck_Description = Проверка модуля на наличие неиспользуемых локальных переменных + +ModuleUnusedLocalVariableCheck_Probably_variable_not_initilized_yet__0 = Возможно, переменная ''{0}'' еще не была проинициализирована + +ModuleUnusedLocalVariableCheck_Title = Проверка неиспользуемых локальных переменных + +ModuleUnusedLocalVariableCheck_Unused_local_variable__0 = Неиспользуемая локальная переменная ''{0}'' + +ModuleUnusedMethodCheck_Description = Проверка модуля на наличие неиспользуемых методов + +ModuleUnusedMethodCheck_Exclude_method_name_pattern_title = Шаблон исключаемых имен методов + +ModuleUnusedMethodCheck_Title = Проверка неиспользуемых методов + +ModuleUnusedMethodCheck_Unused_method__0 = Неиспользуемый метод "{0}" + +NewColorCheck_Use_style_elements = Для изменения оформления следует использовать элементы стиля, а не задавать конкретные значения непосредственно в элементах управления + +NewColorCheck_Use_style_elements_not_specific_values = Для изменения оформления следует использовать элементы стиля, а не задавать конкретные значения непосредственно в элементах управления. Это требуется для того, чтобы аналогичные элементы управления выглядели одинаково во всех формах, где они встречаются. + +NewColorCheck_Using_new_color = Использование конструкции "Новый Цвет" + +NewFontCheck_Description = Для изменения шрифта следует использовать элементы стиля + +NewFontCheck_Issue = Для изменения шрифта следует использовать элементы стиля + +NewFontCheck_Title = Использование конструкции "Новый Шрифт" + +NotifyDescriptionToServerProcedureCheck_Notify_description_procedure_should_be_export = Процедура описания оповещения должна существовать и быть экспортной + +NotifyDescriptionToServerProcedureCheck_Notify_description_to_Server_procedure = Описание оповещения на серверную процедуру + +NotifyDescriptionToServerProcedureCheck_description = Описание оповещения на серверную процедуру + +NotifyDescriptionToServerProcedureCheck_title = Описание оповещения на серверную процедуру + +NstrStringLiteralFormatCheck_Check_empty_interface_for_each_language = Проверять пустой интерфейс для каждого языка + +NstrStringLiteralFormatCheck_NStr_contains_unknown_language_code__S = НСтр содержит неизвестный код языка {0} + +NstrStringLiteralFormatCheck_NStr_format_is_incorrect__E = НСтр формат не корректен {0} + +NstrStringLiteralFormatCheck_NStr_message_for_code__S__ends_with_space = НСтр сообщение для кода языка {0} оканчивается на пробел + +NstrStringLiteralFormatCheck_NStr_message_for_language_code__S__is_empty = НСтр сообщение для кода языка {0} пустое + +NstrStringLiteralFormatCheck_NStr_message_is_empty = НСтр сообщение пустое + +NstrStringLiteralFormatCheck_NStr_method_should_accept_string_as_first_param = НСтр метод должен принимать строку первым параметром + +NstrStringLiteralFormatCheck_description = НСтр формат строкового литерала + +NstrStringLiteralFormatCheck_title = НСтр формат строкового литерала + +OptionalFormParameterAccessCheck_Optional_form_parameter_access = Обращение к опциональному параметру формы {0} + +OptionalFormParameterAccessCheck_description = Обращение к опциональному параметру формы + +OptionalFormParameterAccessCheck_title = Обращение к опциональному параметру формы + +QueryInLoop_Loop_has_method_with_query__0 = Цикл содержит вызов метода с запросом "{0}" + +QueryInLoop_Loop_has_query = Цикл содержит выполнение запроса + +QueryInLoop_check_query_in_infinite_loop = Проверять запрос в бесконечном цикле + +QueryInLoop_description = Проверка запрос в цикле + +QueryInLoop_title = Запрос в цикле + +ReadingAttributesFromDataBaseCheck_Description = Чтение отдельного реквизита объекта из базы данных + +ReadingAttributesFromDataBaseCheck_Issue__0 = При чтении атрибута {0} из ссылки, весь объект импортируется из базы данных + +ReadingAttributesFromDataBaseCheck_Message = Разрешить доступ к полю с составным не ссылочным типом + +ReadingAttributesFromDataBaseCheck_Title = Чтение отдельного реквизита объекта из базы данных + +RedundantExportCheck_Escess_title = Избыточное ключевое слово Экспорт + +RedundantExportCheck_Excess_description = Проверка текстов модулей конфигурации на содержание неиспользуемые экспортные процедуры и функции. Проверка выполняет поиск всех ссылок на метод, поэтому может выполняться длительное время. + +RedundantExportCheck_Exclude_title = Список исключаемых имен областей, разделенных запятой + +RedundantExportCheck_Unused_export_method__0 = Неиспользуемый экспортный метод "{0}" + +RegionEmptyCheck_Region_is_empty = Область пустая + +RegionEmptyCheck_description = Проверяет что область модуля пустая + +RegionEmptyCheck_title = Область пустая + +RollbackTransactionCheck_No_begin_transaction_for_rollback_transaction = Для вызовать "ОтменитьТранзакцию()" отсутствует парный вызов "НачатьТранзакцию()" + +RollbackTransactionCheck_No_commit_transaction_for_begin_transaction = Для вызова "НачатьТранзакцию()" отсутствует парный вызов "ЗафиксироватьТранзакцию()" + +RollbackTransactionCheck_Rollback_transaction_must_be_in_try_catch = Вызов "ОтменитьТранзакцию()" находится вне конструкции "Попытка... Исключение" + +RollbackTransactionCheck_Should_be_no_executable_code_between_exception_and_rollback = Между "Исключение" и "ОтменитьТранзакцию()" есть исполняемый код, который может вызвать исключение + +RollbackTransactionCheck_Transactions_is_broken = Нарушена схема работы с "ОтменитьТранзакцию()" + +RollbackTransactionCheck_Transactions_is_broken_des = Вызов "ОтменитьТранзакцию()" находится вне конструкции "Попытка... Исключение". Отсутствует вызов "НачатьТранзакцию()", хотя вызываются "ОтменитьТранзакцию()". Для вызова "НачатьТранзакцию()" отсутствует парный вызов "ЗафиксироватьТранзакцию()". Между "Исключение" и "ОтменитьТранзакцию()" есть исполняемый код, который может вызвать исключение. + +SelfReferenceCheck_Description = Избыточное обращение внутри модуля через псевдоним "ЭтотОбъект" (к методу, свойству или реквизиту) + +SelfReferenceCheck_Issue = Избыточное обращение внутри модуля через псевдоним "ЭтотОбъект" (к методу, свойству или реквизиту) + +SelfReferenceCheck_Title = Избыточное использование псевдонима "ЭтотОбъект" + +SelfReferenceCheck_check_object_module = Проверять модули объектов (наборов записей, менеджеров значений) + +SelfReferenceCheck_check_only_existing_form_properties = Проверять только существующие свойства в форме + +ServerExecutionSafeModeCheck_description = Отсутствует включение безопасного режима перед вызовом метода "Выполнить" или "Вычислить" + +ServerExecutionSafeModeCheck_eval_issue = Отсутствует включение безопасного режима перед вызовом метода "Вычислить" + +ServerExecutionSafeModeCheck_execute_issue = Отсутствует включение безопасного режима перед вызовом метода "Выполнить" + +ServerExecutionSafeModeCheck_title = Отсутствует включение безопасного режима перед вызовом метода "Выполнить" или "Вычислить" + +StructureCtorTooManyKeysCheck_Maximum_structure_constructor_keys = Максимальное количество ключей структуры в конструкторе + +StructureCtorTooManyKeysCheck_Structure_constructor_has_more_than__0__keys = Конструктор структуры содержит более чем {0} ключей + +StructureCtorTooManyKeysCheck_description = Проверка конструктора структуры, содержащего слишком много ключей + +StructureCtorTooManyKeysCheck_title = Конструктор структуры содержит слишком много ключей + +UseGotoOperatorCheck_Use_Goto_operator = Использован оператор Перейти + +UseGotoOperatorCheck_Use_Label_with_Goto_operator = Использована Метка вместе с оператором Перейти + +UseGotoOperatorCheck_description = Использован оператор Перейти + +UseGotoOperatorCheck_title = Использован оператор Перейти + +UnknownFormParameterAccessCheck_Unknown_form_parameter_access = Обращение к несуществующему параметру формы "{0}" + +UnknownFormParameterAccessCheck_description = Обращение к несуществующему параметру формы + +UnknownFormParameterAccessCheck_title = Обращение к несуществующему параметру формы + +UseNonRecommendedMethods_description = Использование не рекомендованных методов + +UseNonRecommendedMethods_message = Используется не рекомендуемый метод + +UseNonRecommendedMethods_parameter = Список дополнительных не рекомендуемых методов для проверки + +UseNonRecommendedMethods_title = Использование не рекомендуемых методов + +VariableNameInvalidCheck_description = Имя переменной введено некорректно + +VariableNameInvalidCheck_message_variable_length_is_less_than = длина переменной меньше, чем {0} + +VariableNameInvalidCheck_param_MIN_NAME_LENGTH_PARAM_title = Мин. длина переменной + +VariableNameInvalidCheck_title = Имя переменной введено некорректно + +VariableNameInvalidCheck_variable_name_is_invalid = Имя переменной {0} введено некорректно: {1} + +VariableNameInvalidCheck_variable_name_must_start_with_a_capital_letter = имя переменной должно начинаться с заглавной буквы + +VariableNameInvalidCheck_variable_name_starts_with_an_underline = имя переменной начинается с символа подчеркивания diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/CollectionTypeDefinitionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/CollectionTypeDefinitionCheckTest.java index 40c19370b..f793c8afc 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/CollectionTypeDefinitionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/CollectionTypeDefinitionCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.CollectionTypeDefinitionCheck; @@ -50,6 +50,6 @@ public void testCollectionTypeHasNotItemType() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/DocCommentUseMinusCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/DocCommentUseMinusCheckTest.java index 93036aaa4..967b239f4 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/DocCommentUseMinusCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/DocCommentUseMinusCheckTest.java @@ -15,11 +15,12 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.DocCommentUseMinusCheck; @@ -49,10 +50,12 @@ public void testInvalidMinusUsed() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - Marker marker = markers.get(0); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(1); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(3, 4), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ExportFunctionReturnSectionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ExportFunctionReturnSectionCheckTest.java index 505a9a6f5..adc7a8b3e 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ExportFunctionReturnSectionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ExportFunctionReturnSectionCheckTest.java @@ -15,11 +15,12 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.ExportFunctionReturnSectionCheck; @@ -49,10 +50,11 @@ public void testInvalidExportFunctionReturnSection() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - Marker marker = markers.get(0); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(1); - assertEquals("8", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(3, 8), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ExportProcedureCommentDescriptionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ExportProcedureCommentDescriptionCheckTest.java index f17bce192..2eeca1476 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ExportProcedureCommentDescriptionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ExportProcedureCommentDescriptionCheckTest.java @@ -21,8 +21,8 @@ import org.junit.Ignore; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.ExportProcedureCommentDescriptionCheck; @@ -71,7 +71,7 @@ public void testFunctionHasNoDescriptionSection() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("14", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(14), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); assertEquals(MessageFormat.format(MESSAGE, EXPORT_FUNCTION_NAME), marker.getMessage()); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionNameCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionNameCheckTest.java index 4ae67d6df..8e5c75797 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionNameCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionNameCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.FieldDefinitionNameCheck; @@ -50,7 +50,7 @@ public void testInvalidFieldName() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -66,6 +66,6 @@ public void testInvalidFieldNameUnunique() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionTypeCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionTypeCheckTest.java index ccc5126d5..af7ed4422 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionTypeCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionTypeCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.FieldDefinitionTypeCheck; @@ -50,6 +50,6 @@ public void testInvalidFieldType() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionTypeWithLinkRefCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionTypeWithLinkRefCheckTest.java index f90413247..c5035c3e2 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionTypeWithLinkRefCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FieldDefinitionTypeWithLinkRefCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.FieldDefinitionTypeWithLinkRefCheck; @@ -51,6 +51,6 @@ public void testFieldDefHasTypeAndLink() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FunctionReturnSectionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FunctionReturnSectionCheckTest.java index 5d5acbe1c..1874293bb 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FunctionReturnSectionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/FunctionReturnSectionCheckTest.java @@ -15,11 +15,12 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.FunctionReturnSectionCheck; @@ -49,12 +50,11 @@ public void testInvalidFunctionReturnTypes() throws Exception List markers = getModuleMarkers(); assertEquals(3, markers.size()); - Marker marker = markers.get(0); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(1); - assertEquals("10", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(2); - assertEquals("16", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(2, 10, 16), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionEndsOnDotCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionEndsOnDotCheckTest.java index 947fac8b8..9eb2cb856 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionEndsOnDotCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionEndsOnDotCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.MultilineDescriptionEndsOnDotCheck; @@ -50,6 +50,6 @@ public void testMiltiLineDescriptionDoesNotEndsOnDot() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionFieldSuggestionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionFieldSuggestionCheckTest.java index 6cc42b6f5..a0b4f54f3 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionFieldSuggestionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionFieldSuggestionCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.MultilineDescriptionFieldSuggestionCheck; @@ -50,6 +50,6 @@ public void testFieldDefinitionPossiblyInDescription() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionParameterSuggestionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionParameterSuggestionCheckTest.java index 993e422ef..fa33d2853 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionParameterSuggestionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/MultilineDescriptionParameterSuggestionCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.MultilineDescriptionParameterSuggestionCheck; @@ -51,7 +51,7 @@ public void testParametersInDescription() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ParametersSectionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ParametersSectionCheckTest.java index fb2d6022f..0d8e56dd8 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ParametersSectionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ParametersSectionCheckTest.java @@ -16,12 +16,13 @@ import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import org.eclipse.core.resources.IProject; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.check.settings.CheckUid; import com.e1c.g5.v8.dt.check.settings.ICheckParameterSettings; import com.e1c.g5.v8.dt.check.settings.ICheckSettings; @@ -68,12 +69,12 @@ public void testOnlyExportMethodParametersShouldCheck() throws Exception List markers = getModuleMarkers(); assertEquals(3, markers.size()); - Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(1); - assertEquals("11", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(2); - assertEquals("16", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(6, 11, 16), errorLines); } /** @@ -98,16 +99,12 @@ public void testParamSectionNotOnlyForExportMethodShouldCheck() throws Exception List markers = getModuleMarkers(); assertEquals(5, markers.size()); - Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(1); - assertEquals("11", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(2); - assertEquals("16", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(3); - assertEquals("28", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(4); - assertEquals("33", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(6, 11, 16, 28, 33), errorLines); } /** @@ -133,13 +130,11 @@ public void testAllMethodParametersShouldCheck() throws Exception List markers = getModuleMarkers(); assertEquals(4, markers.size()); - Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(1); - assertEquals("11", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(2); - assertEquals("16", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(3); - assertEquals("28", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(6, 11, 16, 28), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ProcedureReturnSectionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ProcedureReturnSectionCheckTest.java index 374c482c5..ec026b689 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ProcedureReturnSectionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/ProcedureReturnSectionCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.ProcedureReturnSectionCheck; @@ -50,6 +50,6 @@ public void testProcedureHasReturnSection() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/RedundantParametersSectionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/RedundantParametersSectionCheckTest.java index 75a82f386..eb805d9b0 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/RedundantParametersSectionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/RedundantParametersSectionCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.RedundantParametersSectionCheck; @@ -50,6 +50,6 @@ public void testAllMethodParametersShouldCheck() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(2), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/RefLinkPartCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/RefLinkPartCheckTest.java index 26753ea9f..00d8af477 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/RefLinkPartCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/RefLinkPartCheckTest.java @@ -15,14 +15,13 @@ import static org.junit.Assert.assertEquals; import java.util.List; -import java.util.Set; import java.util.stream.Collectors; import org.junit.Ignore; import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.RefLinkPartCheck; @@ -74,11 +73,11 @@ public void testInvalidLinks() throws Exception List markers = getModuleMarkers(); assertEquals(2, markers.size()); - - Set lines = markers.stream() - .map(marker -> marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)) - .collect(Collectors.toSet()); - - assertEquals(Set.of("5", "7"), lines); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(5, 7), errorLines); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/TypeDefinitionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/TypeDefinitionCheckTest.java index 47b806836..9cfa1de3e 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/TypeDefinitionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/comment/check/itests/TypeDefinitionCheckTest.java @@ -18,8 +18,8 @@ import org.junit.Test; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.v8codestyle.bsl.check.itests.AbstractSingleModuleTestBase; import com.e1c.v8codestyle.bsl.comment.check.TypeDefinitionCheck; @@ -50,6 +50,6 @@ public void testInvalidTypeName() throws Exception List markers = getModuleMarkers(); assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(3), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } } diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/strict/check/itests/CommonModuleStrictTypesTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/strict/check/itests/CommonModuleStrictTypesTest.java index 6e372bb06..05110aa85 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/strict/check/itests/CommonModuleStrictTypesTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/strict/check/itests/CommonModuleStrictTypesTest.java @@ -19,9 +19,8 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; import java.util.List; -import java.util.Set; +import java.util.stream.Collectors; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -43,8 +42,8 @@ import com._1c.g5.v8.dt.bsl.model.Variable; import com._1c.g5.v8.dt.core.platform.IDtProject; import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; -import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; +import com._1c.g5.v8.dt.validation.marker.StandardExtraInfo; import com.e1c.g5.v8.dt.testing.check.CheckTestBase; import com.e1c.v8codestyle.bsl.strict.check.DocCommentFieldTypeCheck; import com.e1c.v8codestyle.bsl.strict.check.DynamicFeatureAccessMethodNotFoundCheck; @@ -127,13 +126,13 @@ public void testStructureCtorValueTypeCheck() throws Exception Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); marker = markers.get(1); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); } @@ -159,11 +158,11 @@ public void testVariableTypeCheck() throws Exception String uriToProblem = EcoreUtil.getURI(variables.get(0)).toString(); Marker marker = markers.get(0); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(4), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); marker = markers.get(1); - assertEquals("22", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(22), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -190,8 +189,8 @@ public void testDocCommentFieldTypeCheck() throws Exception Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); } @@ -217,8 +216,8 @@ public void testFunctionReturnTypeCheck() throws Exception String uriToProblem = EcoreUtil.getURI(methods.get(0)).toString(); Marker marker = markers.get(0); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(3), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); } @@ -244,8 +243,8 @@ public void testMethodParamTypeCheckk() throws Exception String uriToProblem = EcoreUtil.getURI(methods.get(0).getFormalParams().get(0)).toString(); Marker marker = markers.get(0); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(3), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); } /** @@ -270,8 +269,8 @@ public void testDynamicFeatureAccessMethodNotFoundCheck() throws Exception String uriToProblem = EcoreUtil.getURI(dynamicMethods.get(0)).toString(); Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); } @@ -297,8 +296,8 @@ public void testDynamicFeatureAccessTypeCheck() throws Exception String uriToProblem = EcoreUtil.getURI(dynamicProperties.get(0)).toString(); Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); } /** @@ -323,8 +322,8 @@ public void testSimpleStatementTypeCheck() throws Exception String uriToProblem = EcoreUtil.getURI(statements.get(0)).toString(); Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); } @@ -347,7 +346,7 @@ public void testSimpleStatementTypeCheckWithDocComment() throws Exception assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -370,7 +369,7 @@ public void testSimpleStatementTypeCheckCommonModule() throws Exception assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(6), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -393,17 +392,12 @@ public void testFunctionCtorReturnSectionCheck() throws Exception List markers = getMarters(checkId, module); assertEquals(3, markers.size()); - - Marker marker = markers.get(0); - assertEquals("9", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - // different key - marker = markers.get(1); - assertEquals("9", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - - // missing type - marker = markers.get(2); - assertEquals("29", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(9, 9, 29), errorLines); } /** @@ -430,8 +424,8 @@ public void testInvocationParamIntersectionCheck() throws Exception String uriToProblem = EcoreUtil.getURI(statements.get(2)).toString(); Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); + assertEquals(uriToProblem, marker.getExtraInfo().get(StandardExtraInfo.TEXT_URI_TO_PROBLEM)); } @@ -453,13 +447,12 @@ public void testInvocationParamIntersectionCollectionItemCheck() throws Exceptio List markers = getMarters(checkId, module); assertEquals(3, markers.size()); - - Set lines = new HashSet<>(); - for(Marker marker: markers) - { - lines.add(marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } - assertEquals(Set.of("10", "12", "13"), lines); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(10, 12, 13), errorLines); } /** @@ -480,13 +473,12 @@ public void testInvocationParamIntersectionSelectParamSet() throws Exception List markers = getMarters(checkId, module); assertEquals(2, markers.size()); - - Set lines = new HashSet<>(); - for (Marker marker : markers) - { - lines.add(marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } - assertEquals(Set.of("9", "17"), lines); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(9, 17), errorLines); } /** @@ -509,7 +501,7 @@ public void testInvocationParamIntersectionCheckWithDefault() throws Exception assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -533,7 +525,7 @@ public void testInvocationParamIntersectionCheckLocalDocComment() throws Excepti assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(5), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } @@ -557,7 +549,7 @@ public void testInvocationParamIntersectionCheckValueListItemType() throws Excep assertEquals(1, markers.size()); Marker marker = markers.get(0); - assertEquals("9", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); + assertEquals(Integer.valueOf(9), marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)); } /** @@ -601,15 +593,12 @@ public void testTypedValueAddingToUntypedCollectionCheck() throws Exception List markers = getMarters(checkId, module); assertEquals(3, markers.size()); - - Set lines = new HashSet<>(); - - for (Marker m : markers) - { - lines.add(m.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } - - assertEquals(Set.of("19", "20", "21"), lines); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(19, 20, 21), errorLines); } /** @@ -633,15 +622,12 @@ public void testTypedValueAddingToUntypedValueListCheck() throws Exception List markers = getMarters(checkId, module); assertEquals(2, markers.size()); - - Set lines = new HashSet<>(); - - for (Marker m : markers) - { - lines.add(m.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } - - assertEquals(Set.of("18", "19"), lines); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(18, 19), errorLines); } /** @@ -662,13 +648,12 @@ public void testStructureKeyModification() throws Exception List markers = getMarters(checkId, module); assertEquals(10, markers.size()); - - Set lines = new HashSet<>(); - for (Marker marker : markers) - { - lines.add(marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } - assertEquals(Set.of("7", "8", "9", "10", "36", "38", "39", "47", "49", "50"), lines); + List errorLines = markers.stream() + .map(marker -> marker.getExtraInfo().get(StandardExtraInfo.TEXT_LINE)) + .map(Integer.class::cast) + .sorted() + .collect(Collectors.toList()); + assertEquals(List.of(7, 8, 9, 10, 36, 38, 39, 47, 49, 50), errorLines); } private IDtProject getProject() diff --git a/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF index 1a2d5bde5..11a3a9beb 100644 --- a/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: fragment Import-Package: com._1c.g5.v8.dt.bsl.ui.editor;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", - com._1c.g5.v8.dt.ui.util;version="[7.0.0,8.0.0)", + com._1c.g5.v8.dt.ui.util;version="[8.0.0,9.0.0)", org.junit;version="[4.13.0,5.0.0)" Require-Bundle: org.eclipse.ui.forms;bundle-version="[3.11.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.8.0,4.0.0)" diff --git a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/BslDocCommentViewTest.java b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/BslDocCommentViewTest.java index 5f38af771..5fac9ed47 100644 --- a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/BslDocCommentViewTest.java +++ b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/BslDocCommentViewTest.java @@ -16,8 +16,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.io.BufferedReader; import java.io.InputStream; +import java.io.InputStreamReader; import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.util.stream.Collectors; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -34,6 +38,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.intro.IIntroPart; +import org.eclipse.xtext.util.StringInputStream; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -250,7 +255,12 @@ private TreeViewer getViewer(BslDocCommentView view) throws Exception private void updateModule(String pathToResource) throws Exception { IFile file = project.getFile(COMMON_MODULE_FILE_NAME); - try (InputStream in = getClass().getResourceAsStream(pathToResource)) + + try (InputStream inputStream = getClass().getResourceAsStream(pathToResource); + InputStream in = new StringInputStream( + new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines() + .collect(Collectors.joining("\n")), + StandardCharsets.UTF_8.name())) { if (file.exists()) { diff --git a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/ModuleStructurePropertyPageTest.java b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/ModuleStructurePropertyPageTest.java index 7cd991d17..bc0481872 100644 --- a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/ModuleStructurePropertyPageTest.java +++ b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/ModuleStructurePropertyPageTest.java @@ -24,24 +24,18 @@ import java.io.Reader; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; -import java.util.LinkedList; -import java.util.List; -import java.util.Queue; import java.util.function.Supplier; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Shell; @@ -75,8 +69,7 @@ public class ModuleStructurePropertyPageTest private static final String EDTOR_TITLE = "/" + PROJECT_NAME + "/" + SETTINGS_TEMPLATES_COMMON_MODULE_BSL; - private static final String PROPERTY_PAGE_ID = - "com.e1c.v8codestyle.bsl.ui.properties.moduleStructurePropertyPage"; + private static final String PROPERTY_PAGE_ID = "com.e1c.v8codestyle.bsl.ui.properties.moduleStructurePropertyPage"; @Rule public TestingWorkspace testingWorkspace = new TestingWorkspace(true, false); @@ -88,7 +81,6 @@ public class ModuleStructurePropertyPageTest @Before public void setUp() throws CoreException { - project = testingWorkspace.getProject(PROJECT_NAME); if (!project.exists() || !project.isAccessible()) @@ -137,13 +129,14 @@ public void testOpenModuleTemplate() throws Exception { IModuleStructureProvider moduleStructureProvider = ServiceAccess.get(IModuleStructureProvider.class); - Supplier templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, - ModuleType.COMMON_MODULE, null); + Supplier templateProvider = + moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, false, null); assertNull(templateProvider); - templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, null, ScriptVariant.ENGLISH); + templateProvider = + moduleStructureProvider.getModuleStructureTemplate(project, null, false, ScriptVariant.ENGLISH); assertNull(templateProvider); - templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, - ModuleType.COMMON_MODULE, ScriptVariant.ENGLISH); + templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, false, + ScriptVariant.ENGLISH); assertNotNull(templateProvider); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); @@ -163,7 +156,7 @@ public void testOpenModuleTemplate() throws Exception applyButton.notifyListeners(SWT.Selection, new Event()); waitEventSetnd(dialog); - Button buttonOpen = getButtonByName(page, "Open template"); + Button buttonOpen = getOpenButtonControl(page); assertNotNull(buttonOpen); viewer.setSelection(new StructuredSelection(ModuleType.FORM_MODULE)); @@ -174,7 +167,6 @@ public void testOpenModuleTemplate() throws Exception waitEventSetnd(dialog); assertTrue(buttonOpen.isEnabled()); - buttonOpen.notifyListeners(SWT.Selection, new Event()); assertNull(dialog.getShell()); waitEventSetnd(); @@ -206,7 +198,7 @@ public void testOpenModuleTemplate() throws Exception file.setContents(in, true, true, new NullProgressMonitor()); } - templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, + templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, false, ScriptVariant.ENGLISH); try (InputStream template = templateProvider.get(); @@ -248,40 +240,16 @@ private CheckboxTableViewer getViewer(ModuleStructurePropertyPage page) throws E return (CheckboxTableViewer)field.get(page); } - private Button getButtonByName(ModuleStructurePropertyPage page, String name) throws Exception - { - - Composite top = getTopControl(page); - assertNotNull(top); - Queue toCheck = new LinkedList<>(); - toCheck.add(top); - - while (!toCheck.isEmpty()) - { - Control control = toCheck.poll(); - if (control instanceof Button && name.equalsIgnoreCase(((Button)control).getText())) - { - return (Button)control; - } - else if (control instanceof Composite) - { - toCheck.addAll(List.of(((Composite)control).getChildren())); - } - } - - return null; - } - - private Composite getTopControl(ModuleStructurePropertyPage page) throws Exception + private Button getApplyButtonControl(ModuleStructurePropertyPage page) throws Exception { - Field field = DialogPage.class.getDeclaredField("control"); + Field field = PreferencePage.class.getDeclaredField("applyButton"); field.setAccessible(true); - return (Composite)field.get(page); + return (Button)field.get(page); } - private Button getApplyButtonControl(ModuleStructurePropertyPage page) throws Exception + private Button getOpenButtonControl(ModuleStructurePropertyPage page) throws Exception { - Field field = PreferencePage.class.getDeclaredField("applyButton"); + Field field = page.getClass().getDeclaredField("openButton"); field.setAccessible(true); return (Button)field.get(page); } diff --git a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/handlers/FormatDocCommentModuleEditorHandlerTest.java b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/handlers/FormatDocCommentModuleEditorHandlerTest.java index e1d725099..cc4fdf472 100644 --- a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/handlers/FormatDocCommentModuleEditorHandlerTest.java +++ b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/handlers/FormatDocCommentModuleEditorHandlerTest.java @@ -143,7 +143,8 @@ public void testFormatDocComment() throws Exception command.executeWithChecks(executionEvent); expected = getResourceText(FOLDER_RESOURCE + "doc-comment-format-result.bsl"); - assertEquals(expected, bslEditor.getDocument().get()); + String actual = bslEditor.getDocument().get(); + assertEquals("Whole content:" + System.lineSeparator() + actual, expected, actual); } private String getResourceText(String pathToResource) throws Exception diff --git a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF index 47215f16c..65f22cd99 100644 --- a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.form.naming;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", com._1c.g5.v8.dt.validation.marker;version="[9.0.0,10.0.0)", com.e1c.g5.v8.dt.testing.check;version="[1.0.0,2.0.0)", diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/FormListRefUserVisibilityEnabledCheckTest.java b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/FormListRefUserVisibilityEnabledCheckTest.java index 5c467119b..638693ca8 100644 --- a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/FormListRefUserVisibilityEnabledCheckTest.java +++ b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/FormListRefUserVisibilityEnabledCheckTest.java @@ -18,8 +18,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.text.MessageFormat; - import org.eclipse.core.runtime.IProgressMonitor; import org.junit.Test; @@ -50,7 +48,6 @@ public class FormListRefUserVisibilityEnabledCheckTest private static final String PROJECT_NAME = "FormListRefUserVisibilityEnabled"; private static final String FQN_FORM_EN = "Catalog.TestCatalog.Form.TestListForm.Form"; private static final String FQN_FORM_RU = "Catalog.TestCatalog.Form.TestListFormRu.Form"; - private static final String MESSAGE = "User visibility is not disabled for the Ref field ({0}) of the {1} table"; /** * Test User Visibility is enabled for the Ref field in dynamic list (En Script variant). @@ -76,7 +73,7 @@ public void testUserVisibilityEnabledForRef() throws Exception Marker marker = getFirstNestedMarker(CHECK_ID, object.bmGetId(), dtProject); assertNotNull(marker); - assertEquals(MessageFormat.format(MESSAGE, fieldRef.getName(), table.getName()), marker.getMessage()); + assertTrue(marker.getMessage().contains(fieldRef.getName())); } /** diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/DynamicListFieldTitleGenerateFixTest.java b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/DynamicListFieldTitleGenerateFixTest.java index 4ead7b45d..36cca086f 100644 --- a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/DynamicListFieldTitleGenerateFixTest.java +++ b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/DynamicListFieldTitleGenerateFixTest.java @@ -41,16 +41,13 @@ public class DynamicListFieldTitleGenerateFixTest { private static final String CHECK_ID = "form-dynamic-list-item-title"; - private static final String FIX_DESCRIPTION_PATTERN = - "Generate default title for dynamic list field \\(8\\.3\\.19\\+\\)"; - private static final String PROJECT_NAME = "FormDynamicListItemTitle"; private static final String FQN_FORM = "Catalog.Products.Form.ListForm.Form"; public DynamicListFieldTitleGenerateFixTest() { - super(FIX_DESCRIPTION_PATTERN); + super(Messages.DynamicListFieldTitleGenerateFix_Default_title); } @Test diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/DynamicListItemTitleGenerateFixTest.java b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/DynamicListItemTitleGenerateFixTest.java index 0f9308a81..c52c0f084 100644 --- a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/DynamicListItemTitleGenerateFixTest.java +++ b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/DynamicListItemTitleGenerateFixTest.java @@ -38,15 +38,13 @@ public class DynamicListItemTitleGenerateFixTest private static final String CHECK_ID = "form-dynamic-list-item-title"; - private static final String FIX_DESCRIPTION_PATTERN = "Generate title \".+\" for dynamic list form item \".+\""; - private static final String PROJECT_NAME = "FormDynamicListItemTitle"; private static final String FQN_FORM = "Catalog.Products.Form.ListForm.Form"; public DynamicListItemTitleGenerateFixTest() { - super(FIX_DESCRIPTION_PATTERN); + super(Messages.DynamicListItemTitleGenerateFix_title); } @Test diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/FormFixTestBase.java b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/FormFixTestBase.java index a8aabfd9e..cda3c548c 100644 --- a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/FormFixTestBase.java +++ b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/FormFixTestBase.java @@ -12,6 +12,8 @@ *******************************************************************************/ package com.e1c.v8codestyle.form.fix.itests; +import static org.junit.Assert.assertNotNull; + import java.util.Collection; import org.eclipse.core.runtime.NullProgressMonitor; @@ -68,6 +70,7 @@ protected void applyFix(Marker marker, IDtProject dtProject) } } + assertNotNull("No fix variant for fix description: " + fixDescriptionPattern, variantDescr); fixManager.selectFixVariant(variantDescr, handle); fixManager.executeFix(handle, new NullProgressMonitor()); fixManager.finishFix(handle); diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/Messages.java b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/Messages.java new file mode 100644 index 000000000..8f630acb8 --- /dev/null +++ b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/Messages.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (C) 2022, 1C-Soft LLC and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * 1C-Soft LLC - initial API and implementation + *******************************************************************************/ +package com.e1c.v8codestyle.form.fix.itests; + +import org.eclipse.osgi.util.NLS; + +/** + * @author Dzyuba_M + */ +final class Messages + extends NLS +{ + private static final String BUNDLE_NAME = Messages.class.getPackageName() + ".messages"; //$NON-NLS-1$ + public static String DynamicListFieldTitleGenerateFix_Default_title; + public static String DynamicListItemTitleGenerateFix_title; + static + { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() + { + } +} diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/messages.properties b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/messages.properties new file mode 100644 index 000000000..5b65b3bad --- /dev/null +++ b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/messages.properties @@ -0,0 +1,17 @@ +#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) +############################################################################### +# Copyright (C) 2022, 1C-Soft LLC and others. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# 1C-Soft LLC - initial API and implementation +############################################################################### + +DynamicListFieldTitleGenerateFix_Default_title = Generate default title for dynamic list field \\(8\\.3\\.19\\+\\) + +DynamicListItemTitleGenerateFix_title = Generate title \".+\" for dynamic list form item \".+\" diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/messages_ru.properties b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/messages_ru.properties new file mode 100644 index 000000000..4fcb35158 --- /dev/null +++ b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/messages_ru.properties @@ -0,0 +1,18 @@ +#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) +############################################################################### +# Copyright (C) 2022, 1C-Soft LLC and others. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# 1C-Soft LLC - initial API and implementation +############################################################################### +#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) + +DynamicListFieldTitleGenerateFix_Default_title = Генерировать заголовок по умолчанию для поля динамического списка \\(8\\.3\\.19\\+\\) + +DynamicListItemTitleGenerateFix_title = Генерировать заголовок \".+\" для элемента формы \".+\" динамического списка diff --git a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdObjectNameUnallowedLetterCheckTest.java b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdObjectNameUnallowedLetterCheckTest.java index 5841a2c9b..fcb6045f9 100644 --- a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdObjectNameUnallowedLetterCheckTest.java +++ b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdObjectNameUnallowedLetterCheckTest.java @@ -12,7 +12,6 @@ *******************************************************************************/ package com.e1c.v8codestyle.md.check.itests; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -34,8 +33,6 @@ public class MdObjectNameUnallowedLetterCheckTest { private static final String CHECK_ID = "mdo-ru-name-unallowed-letter"; //$NON-NLS-1$ private static final String PROJECT_NAME = "MdObjectNameUnallowedLetter"; - private static final String MESSAGE = - "In Russian locale, name, synonym or comment of metadata object contain the unallowed letter"; /** * Test that md object name, synonym and comment do not contain unallowed letter "ё" (Ru locale) @@ -67,7 +64,6 @@ public void testMdObjectNameHasUnallowedLetter() throws Exception long id = getTopObjectIdByFqn("Catalog.ТестовыйКаталог_ё_имя", dtProject); Marker marker = getFirstMarker(CHECK_ID, id, dtProject); assertNotNull(marker); - assertEquals(marker.getMessage(), MESSAGE); } /** @@ -84,7 +80,6 @@ public void testMdObjectSynonymHasUnallowedLetter() throws Exception long id = getTopObjectIdByFqn("Catalog.ТестовыйКаталог_синоним", dtProject); Marker marker = getFirstMarker(CHECK_ID, id, dtProject); assertNotNull(marker); - assertEquals(marker.getMessage(), MESSAGE); } /** @@ -101,6 +96,5 @@ public void testMdObjectCommentHasUnallowedLetter() throws Exception long id = getTopObjectIdByFqn("Catalog.ТестовыйКаталог_комментарий", dtProject); Marker marker = getFirstMarker(CHECK_ID, id, dtProject); assertNotNull(marker); - assertEquals(marker.getMessage(), MESSAGE); } } diff --git a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF index 1e6d39da7..0af2145e5 100644 --- a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: fragment Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", - com._1c.g5.v8.dt.dcs.util;version="[14.0.0,15.0.0)", + com._1c.g5.v8.dt.dcs.util;version="[15.0.0,16.0.0)", com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.testing;version="[3.0.0,4.0.0)", diff --git a/tests/com.e1c.v8codestyle.ql.itests/src/com/e1c/v8codestyle/ql/check/itests/AbstractQueryTestBase.java b/tests/com.e1c.v8codestyle.ql.itests/src/com/e1c/v8codestyle/ql/check/itests/AbstractQueryTestBase.java index d2ac3f475..630f85118 100644 --- a/tests/com.e1c.v8codestyle.ql.itests/src/com/e1c/v8codestyle/ql/check/itests/AbstractQueryTestBase.java +++ b/tests/com.e1c.v8codestyle.ql.itests/src/com/e1c/v8codestyle/ql/check/itests/AbstractQueryTestBase.java @@ -69,7 +69,7 @@ public class AbstractQueryTestBase private Class checkClass; - private ICheck check; + private ICheck check; private ICheckDefinition definition; @@ -161,7 +161,7 @@ protected String getTestConfigurationName() * * @return the check instance, cannot return {@code null}. */ - private ICheck getCheckInstance() throws Exception + private ICheck getCheckInstance() throws Exception { if (check == null) { @@ -216,7 +216,7 @@ private void validateQuery(QuerySchema querySchema) throws Exception ICheckParameters checkParametes = getCheckParameters(); - ICheck validator = getCheckInstance(); + ICheck validator = getCheckInstance(); if (!(validator instanceof QlBasicDelegateCheck)) { throw new IllegalStateException("Check should be QlBasicDelegateCheck class, but was: " + validator); @@ -230,7 +230,7 @@ private void validateQuery(QuerySchema querySchema) throws Exception EObject child = iterator.next(); if (filter.isApplicable(child)) { - validator.check(child, resultAcceptor, checkParametes, monitor); + validator.check(child, resultAcceptor, checkParametes, null, monitor); } } } diff --git a/tests/com.e1c.v8codestyle.ql.itests/src/com/e1c/v8codestyle/ql/check/itests/TempTableHasIndexTest.java b/tests/com.e1c.v8codestyle.ql.itests/src/com/e1c/v8codestyle/ql/check/itests/TempTableHasIndexTest.java index 8f9a34a52..9ea44147e 100644 --- a/tests/com.e1c.v8codestyle.ql.itests/src/com/e1c/v8codestyle/ql/check/itests/TempTableHasIndexTest.java +++ b/tests/com.e1c.v8codestyle.ql.itests/src/com/e1c/v8codestyle/ql/check/itests/TempTableHasIndexTest.java @@ -96,13 +96,13 @@ public void testTempTableWithoutIndex() throws Exception EObject selectQuery = querySchema.getQueries().get(1); assertTrue(selectQuery instanceof QuerySchemaSelectQuery); - check.check(selectQuery, resultAcceptor, defaultParameters, new NullProgressMonitor()); + check.check(selectQuery, resultAcceptor, defaultParameters, null, new NullProgressMonitor()); assertTrue(qlResultAcceptor.getMarkers().isEmpty()); selectQuery = querySchema.getQueries().get(0); assertTrue(selectQuery instanceof QuerySchemaSelectQuery); - check.check(selectQuery, resultAcceptor, defaultParameters, new NullProgressMonitor()); + check.check(selectQuery, resultAcceptor, defaultParameters, null, new NullProgressMonitor()); assertFalse(qlResultAcceptor.getMarkers().isEmpty()); @@ -131,14 +131,14 @@ public void testTempTableWithoutIndexWithRecordCount() throws Exception selectQuery = querySchema.getQueries().get(0); assertTrue(selectQuery instanceof QuerySchemaSelectQuery); - check.check(selectQuery, resultAcceptor, defaultParameters, new NullProgressMonitor()); + check.check(selectQuery, resultAcceptor, defaultParameters, null, new NullProgressMonitor()); assertFalse(qlResultAcceptor.getMarkers().isEmpty()); qlResultAcceptor.getMarkers().clear(); TestingCheckParameters newParameters = new TestingCheckParameters(Map.of(PARAMETER_EXCLUDE_TABLE_NAME_PATTERN, "", PARAMETER_MAX_TOP, 110000)); - check.check(selectQuery, resultAcceptor, newParameters, new NullProgressMonitor()); + check.check(selectQuery, resultAcceptor, newParameters, null, new NullProgressMonitor()); assertTrue(qlResultAcceptor.getMarkers().isEmpty()); @@ -160,13 +160,13 @@ public void testTempTableWithIndex() throws Exception EObject selectQuery = querySchema.getQueries().get(1); assertTrue(selectQuery instanceof QuerySchemaSelectQuery); - check.check(selectQuery, resultAcceptor, defaultParameters, new NullProgressMonitor()); + check.check(selectQuery, resultAcceptor, defaultParameters, null, new NullProgressMonitor()); assertTrue(qlResultAcceptor.getMarkers().isEmpty()); selectQuery = querySchema.getQueries().get(0); assertTrue(selectQuery instanceof QuerySchemaSelectQuery); - check.check(selectQuery, resultAcceptor, defaultParameters, new NullProgressMonitor()); + check.check(selectQuery, resultAcceptor, defaultParameters, null, new NullProgressMonitor()); assertTrue(qlResultAcceptor.getMarkers().isEmpty()); } diff --git a/tests/pom.xml b/tests/pom.xml index 603d6e98e..eda8ea6cf 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -67,7 +67,7 @@ - -Xms80m -Xmx2g -Dosgi.module.lock.timeout=24 --add-modules=ALL-SYSTEM --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED + -Xms80m -Xmx2g -Dosgi.module.lock.timeout=24 --add-modules=ALL-SYSTEM --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED -DenvironmentChecker.disable=true @@ -150,6 +150,10 @@ + + + org.codehaus.mojo + native2ascii-maven-plugin