From 781ac0e5446d63393b8150696bb327631a75cd2b Mon Sep 17 00:00:00 2001 From: Dmitry Savenko Date: Wed, 21 Feb 2024 10:51:27 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BD=D1=8F=D1=82=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9=20dt.validation.m?= =?UTF-8?q?arker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../META-INF/MANIFEST.MF | 2 +- .../com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF | 2 +- .../com.e1c.v8codestyle.form/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +--- .../fix/itests/ConsecutiveEmptyLinesFixTest.java | 14 +------------- .../META-INF/MANIFEST.MF | 4 +--- .../form/fix/itests/FormFixTestBase.java | 14 +------------- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- 10 files changed, 10 insertions(+), 38 deletions(-) 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 028cc4d0..475c7a6a 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF @@ -47,7 +47,7 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.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.g5.v8.dt.bsl.check.qfix;version="[3.0.0,4.0.0)", - com.e1c.g5.v8.dt.check.qfix;version="[2.0.0,3.0.0)", + com.e1c.g5.v8.dt.check.qfix;version="[3.0.0,4.0.0)", com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)", com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)", com.e1c.v8codestyle.bsl;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF index 9285a13c..a1cec788 100644 --- a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF @@ -51,7 +51,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)", com.e1c.g5.v8.dt.bsl.check.qfix;version="[3.0.0,4.0.0)", com.e1c.g5.v8.dt.check;version="[2.0.0,3.0.0)", com.e1c.g5.v8.dt.check.components;version="[2.0.0,3.0.0)", - com.e1c.g5.v8.dt.check.qfix;version="[2.0.0,3.0.0)", + com.e1c.g5.v8.dt.check.qfix;version="[3.0.0,4.0.0)", com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)", com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)", com.e1c.v8codestyle;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF index 39f6e067..ba96e8fe 100644 --- a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF @@ -40,7 +40,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)", com.e1c.g5.v8.dt.check.components;version="[2.0.0,3.0.0)", com.e1c.g5.v8.dt.check.context;version="[2.0.0,3.0.0)", com.e1c.g5.v8.dt.check.ext;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.qfix;version="[2.0.0,3.0.0)", + com.e1c.g5.v8.dt.check.qfix;version="[3.0.0,4.0.0)", com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)", com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)", com.e1c.v8codestyle.check;version="[0.7.0,0.8.0)", 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 0dcc6c0a..8d0b3cc5 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF @@ -13,8 +13,6 @@ Import-Package: com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.md.naming;version="[5.1.0,6.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.validation;version="[5.0.0,6.0.0)", - com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)", org.junit;version="[4.13.0,5.0.0)" diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/fix/itests/ConsecutiveEmptyLinesFixTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/fix/itests/ConsecutiveEmptyLinesFixTest.java index 78528cdf..e9b5e0da 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/fix/itests/ConsecutiveEmptyLinesFixTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/fix/itests/ConsecutiveEmptyLinesFixTest.java @@ -16,14 +16,8 @@ import org.junit.Ignore; import org.junit.Test; import com._1c.g5.v8.bm.core.IBmObject; -import com._1c.g5.v8.dt.core.naming.ISymbolicLinkLocalizer; import com._1c.g5.v8.dt.core.platform.IDtProject; -import com._1c.g5.v8.dt.core.platform.IV8ProjectManager; -import com._1c.g5.v8.dt.md.naming.MdSymbolicLinkLocalizer; import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; -import com._1c.g5.v8.dt.ui.util.OpenHelper; -import com._1c.g5.v8.dt.ui.validation.BmMarkerWrapper; -import com._1c.g5.v8.dt.validation.marker.IMarkerWrapper; import com._1c.g5.v8.dt.validation.marker.Marker; import com._1c.g5.wiring.ServiceAccess; import com.e1c.g5.v8.dt.check.qfix.FixProcessHandle; @@ -47,9 +41,6 @@ public class ConsecutiveEmptyLinesFixTest private static final String DESCRIPTION = "Clear extra empty lines"; private static final String COMMON_MODULE_FILE_NAME = "/src/CommonModules/CommonModule/Module.bsl"; private IFixManager fixManager = ServiceAccess.get(IFixManager.class); - private IV8ProjectManager projectManager = ServiceAccess.get(IV8ProjectManager.class); - private ISymbolicLinkLocalizer symbolicLinkLocalizer = new MdSymbolicLinkLocalizer(); - private final OpenHelper openHelper = new OpenHelper(); //after fixing the problem in EDT - delete it @Ignore @@ -96,10 +87,7 @@ public class ConsecutiveEmptyLinesFixTest */ private void applyFix(Marker marker, IDtProject dtProject) { - IMarkerWrapper markerWrapper = new BmMarkerWrapper(marker, dtProject.getWorkspaceProject(), bmModelManager, - projectManager, symbolicLinkLocalizer, openHelper); - - FixProcessHandle handle = fixManager.prepareFix(markerWrapper, dtProject); + FixProcessHandle handle = fixManager.prepareFix(marker, dtProject); FixVariantDescriptor variantDescr = null; 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 0ab12ef1..9d2e2e2b 100644 --- a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF @@ -16,9 +16,7 @@ Import-Package: com._1c.g5.v8.bm.integration;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.mdclass;version="[9.0.0,10.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.validation;version="[5.0.0,6.0.0)", - com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)", org.junit;version="[4.13.0,5.0.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)" 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 56253936..a8aabfd9 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 @@ -16,13 +16,7 @@ import java.util.Collection; import org.eclipse.core.runtime.NullProgressMonitor; -import com._1c.g5.v8.dt.core.naming.ISymbolicLinkLocalizer; import com._1c.g5.v8.dt.core.platform.IDtProject; -import com._1c.g5.v8.dt.core.platform.IV8ProjectManager; -import com._1c.g5.v8.dt.form.naming.FormSymbolicLinkLocalizer; -import com._1c.g5.v8.dt.ui.util.OpenHelper; -import com._1c.g5.v8.dt.ui.validation.BmMarkerWrapper; -import com._1c.g5.v8.dt.validation.marker.IMarkerWrapper; import com._1c.g5.v8.dt.validation.marker.Marker; import com._1c.g5.wiring.ServiceAccess; import com.e1c.g5.v8.dt.check.qfix.FixProcessHandle; @@ -41,9 +35,6 @@ public abstract class FormFixTestBase private final String fixDescriptionPattern; private IFixManager fixManager = ServiceAccess.get(IFixManager.class); - private IV8ProjectManager projectManager = ServiceAccess.get(IV8ProjectManager.class); - private ISymbolicLinkLocalizer symbolicLinkLocalizer = new FormSymbolicLinkLocalizer(); - private final OpenHelper openHelper = new OpenHelper(); /** * Instantiates a new form fix test base. @@ -64,10 +55,7 @@ public abstract class FormFixTestBase */ protected void applyFix(Marker marker, IDtProject dtProject) { - IMarkerWrapper markerWrapper = new BmMarkerWrapper(marker, dtProject.getWorkspaceProject(), bmModelManager, - projectManager, symbolicLinkLocalizer, openHelper); - - FixProcessHandle handle = fixManager.prepareFix(markerWrapper, dtProject); + FixProcessHandle handle = fixManager.prepareFix(marker, dtProject); FixVariantDescriptor variantDescr = null; diff --git a/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF index 9e6944c4..96dbce90 100644 --- a/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ 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.testing;version="[3.1.0,4.0.0)", - com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)", org.junit;version="[4.13.0,5.0.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)" 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 357dc34b..9d04f3dc 100644 --- a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.ql.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="[11.0.0,12.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)", - com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)", org.junit;version="[4.13.0,5.0.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.900,4.0.0)", diff --git a/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF index 779b7900..4dfdef85 100644 --- a/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Import-Package: com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.13.0,3.0.0)", com._1c.g5.v8.dt.refactoring.core;version="[4.0.0,5.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", - com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)", org.junit;version="[4.13.0,5.0.0)"