Merge pull request #67 from 1C-Company/G5V8DT-24042

G5V8DT-24042 Починить все тесты, падающие в публичных плагинах
1C-Company · Mar 12, 2024 · dffe73f · dffe73f
2 parents fd4c200 + a5bc221
commit dffe73f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/...com.e1c.dt.check.form.itests/src/com/e1c/dt/check/form/itests/InvalidItemIdCheckTest.java b/...com.e1c.dt.check.form.itests/src/com/e1c/dt/check/form/itests/InvalidItemIdCheckTest.java
@@ -29,6 +29,7 @@
 import java.util.stream.StreamSupport;
 
 import org.eclipse.core.resources.IProject;
+import org.junit.ClassRule;
 import org.junit.Test;
 
 import com._1c.g5.v8.bm.core.IBmObject;
@@ -37,6 +38,8 @@
 import com._1c.g5.v8.dt.form.model.FormField;
 import com._1c.g5.v8.dt.form.model.FormPackage;
 import com._1c.g5.v8.dt.mcore.NamedElement;
+import com._1c.g5.v8.dt.platform.version.Version;
+import com._1c.g5.v8.dt.testing.TestingPlatformSupport;
 import com._1c.g5.v8.dt.validation.marker.BmObjectMarker;
 import com._1c.g5.v8.dt.validation.marker.Marker;
 import com._1c.g5.v8.dt.validation.marker.MarkerFilter;
@@ -53,6 +56,8 @@
 public class InvalidItemIdCheckTest
     extends SingleProjectReadOnlyCheckTestBase
 {
+    @ClassRule
+    public static TestingPlatformSupport testingPlatformSupport = new TestingPlatformSupport(Version.V8_3_19);
 
     /**
      * Test that correct form does not cause markers.

diff --git a/....e1c.dt.check.form.itests/src/com/e1c/dt/check/form/itests/NamedElementNameCheckTest.java b/....e1c.dt.check.form.itests/src/com/e1c/dt/check/form/itests/NamedElementNameCheckTest.java
@@ -17,12 +17,15 @@
 import static org.junit.Assert.assertTrue;
 
 import org.eclipse.emf.ecore.EObject;
+import org.junit.ClassRule;
 import org.junit.Test;
 
 import com._1c.g5.v8.bm.core.IBmObject;
 import com._1c.g5.v8.dt.core.platform.IDtProject;
 import com._1c.g5.v8.dt.form.model.Form;
 import com._1c.g5.v8.dt.form.model.FormField;
+import com._1c.g5.v8.dt.platform.version.Version;
+import com._1c.g5.v8.dt.testing.TestingPlatformSupport;
 import com._1c.g5.v8.dt.validation.marker.Marker;
 import com.e1c.dt.check.form.NamedElementNameCheck;
 import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase;
@@ -35,6 +38,9 @@
 public class NamedElementNameCheckTest
     extends SingleProjectReadOnlyCheckTestBase
 {
+    @ClassRule
+    public static TestingPlatformSupport testingPlatformSupport = new TestingPlatformSupport(Version.V8_3_19);
+
     private static final String CHECK_ID = "form-named-element-name";
 
     private static final String PROJECT_NAME = "NamedElementName";

diff --git a/.../src/com/e1c/dt/internal/check/form/itests/SingleProjectWithExtReadOnlyCheckTestBase.java b/.../src/com/e1c/dt/internal/check/form/itests/SingleProjectWithExtReadOnlyCheckTestBase.java
@@ -15,8 +15,11 @@
 import org.eclipse.core.runtime.CoreException;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.ClassRule;
 
 import com._1c.g5.v8.dt.core.platform.IDtProject;
+import com._1c.g5.v8.dt.platform.version.Version;
+import com._1c.g5.v8.dt.testing.TestingPlatformSupport;
 import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase;
 
 /**
@@ -27,6 +30,12 @@
 public abstract class SingleProjectWithExtReadOnlyCheckTestBase
     extends SingleProjectReadOnlyCheckTestBase
 {
+    @ClassRule
+    public static TestingPlatformSupport testingPlatformSupport =
+        new TestingPlatformSupport(Version.V8_3_8, Version.V8_3_9, Version.V8_3_10, Version.V8_3_11, Version.V8_3_12,
+            Version.V8_3_13, Version.V8_3_14, Version.V8_3_15, Version.V8_3_16, Version.V8_3_17, Version.V8_3_18,
+            Version.V8_3_19, Version.V8_3_20, Version.V8_3_21, Version.V8_3_22, Version.V8_3_23, Version.V8_3_24);
+
     private static final ThreadLocal<IDtProject> dtProjectExtHolder = new ThreadLocal<>();
     private static Object lock = new Object();
 
@@ -71,4 +80,3 @@ public static void cleanUp() throws CoreException
      */
     protected abstract String getTestConfigurationExtName();
 }
-
diff --git a/tests/com.e1c.dt.check.md.itests/src/com/e1c/dt/check/md/itests/AbstractMdCheckTest.java b/tests/com.e1c.dt.check.md.itests/src/com/e1c/dt/check/md/itests/AbstractMdCheckTest.java
@@ -20,6 +20,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.junit.ClassRule;
 
 import com._1c.g5.v8.bm.core.IBmObject;
 import com._1c.g5.v8.bm.core.IBmTransaction;
@@ -28,7 +29,9 @@
 import com._1c.g5.v8.dt.core.platform.IDtProject;
 import com._1c.g5.v8.dt.core.platform.IV8Project;
 import com._1c.g5.v8.dt.core.platform.IV8ProjectManager;
+import com._1c.g5.v8.dt.platform.version.Version;
 import com._1c.g5.v8.dt.testing.GuiceModules;
+import com._1c.g5.v8.dt.testing.TestingPlatformSupport;
 import com._1c.g5.v8.dt.validation.marker.Marker;
 import com.e1c.dt.check.internal.md.itests.ExternalDependenciesModule;
 import com.e1c.g5.v8.dt.check.ICheckScheduler;
@@ -44,6 +47,12 @@
 public abstract class AbstractMdCheckTest
     extends CheckTestBase
 {
+    @ClassRule
+    public static TestingPlatformSupport testingPlatformSupport =
+        new TestingPlatformSupport(Version.V8_3_8, Version.V8_3_9, Version.V8_3_10, Version.V8_3_11, Version.V8_3_12,
+            Version.V8_3_13, Version.V8_3_14, Version.V8_3_15, Version.V8_3_16, Version.V8_3_17, Version.V8_3_18,
+            Version.V8_3_19, Version.V8_3_20, Version.V8_3_21, Version.V8_3_22, Version.V8_3_23, Version.V8_3_24);
+
     @Inject
     protected ICheckScheduler checker;
     @Inject