diff --git a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/internal/md/itests/CheckMd.java b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/internal/md/itests/CheckMd.java new file mode 100644 index 000000000..768bf1d46 --- /dev/null +++ b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/internal/md/itests/CheckMd.java @@ -0,0 +1,82 @@ +/******************************************************************************* + * 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: + * Aleksandr Kapralov - initial API and implementation + *******************************************************************************/ +package com.e1c.v8codestyle.internal.md.itests; + +import java.util.Map; +import java.util.Map.Entry; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.emf.ecore.EStructuralFeature; + +import com._1c.g5.v8.bm.core.IBmObject; +import com._1c.g5.v8.bm.core.IBmTransaction; +import com._1c.g5.v8.bm.integration.AbstractBmTask; +import com._1c.g5.v8.bm.integration.IBmModel; +import com._1c.g5.v8.dt.core.platform.IDtProject; +import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; +import com._1c.g5.v8.dt.metadata.mdclass.ReturnValuesReuse; +import com.e1c.g5.v8.dt.testing.check.CheckTestBase; + +/** + * @author Aleksandr Kapralov + * + */ +public abstract class CheckMd + extends CheckTestBase +{ + + protected void updateCommonModule(IDtProject dtProject, String fqn, Map types, + ReturnValuesReuse returnValueReuse, String newFqn) + { + IBmModel model = bmModelManager.getModel(dtProject); + model.execute(new AbstractBmTask("change type") + { + @Override + public Void execute(IBmTransaction transaction, IProgressMonitor monitor) + { + IBmObject object = transaction.getTopObjectByFqn(fqn); + + for (Entry entry : types.entrySet()) + { + object.eSet(entry.getKey(), entry.getValue()); + } + + if (!(object instanceof CommonModule)) + { + return null; + } + + CommonModule module = (CommonModule)object; + + if (returnValueReuse != null) + { + module.setReturnValuesReuse(returnValueReuse); + } + + if (newFqn != null) + { + String[] fqnArray = newFqn.split("[.]"); + if (fqnArray.length == 2) + { + module.setName(fqnArray[1]); + transaction.updateTopObjectFqn(object, newFqn); + } + } + + return null; + } + }); + waitForDD(dtProject); + } + +} diff --git a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleNameClientServerTest.java b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleNameClientServerTest.java similarity index 68% rename from tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleNameClientServerTest.java rename to tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleNameClientServerTest.java index 3731324ad..47a308552 100644 --- a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleNameClientServerTest.java +++ b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleNameClientServerTest.java @@ -11,27 +11,17 @@ * 1C-Soft LLC - initial API and implementation * Aleksandr Kapralov - issue #14 *******************************************************************************/ -package com.e1c.v8codestyle.md.itests; +package com.e1c.v8codestyle.md.check.itests; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import java.util.Map; -import java.util.Map.Entry; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.emf.ecore.EStructuralFeature; import org.junit.Test; -import com._1c.g5.v8.bm.core.IBmObject; -import com._1c.g5.v8.bm.core.IBmTransaction; -import com._1c.g5.v8.bm.integration.AbstractBmTask; -import com._1c.g5.v8.bm.integration.IBmModel; import com._1c.g5.v8.dt.core.platform.IDtProject; -import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; import com._1c.g5.v8.dt.metadata.mdclass.ReturnValuesReuse; import com._1c.g5.v8.dt.validation.marker.Marker; -import com.e1c.g5.v8.dt.testing.check.CheckTestBase; +import com.e1c.v8codestyle.internal.md.itests.CheckMd; import com.e1c.v8codestyle.md.check.CommonModuleNameClientServer; import com.e1c.v8codestyle.md.check.CommonModuleType; @@ -42,7 +32,7 @@ * */ public class CommonModuleNameClientServerTest - extends CheckTestBase + extends CheckMd { private static final String CHECK_ID = "common-module-name-client-server"; @@ -127,45 +117,4 @@ public void testCommonModuleNameClientServerReturnValueReuseCorrect() throws Exc assertNull(marker); } - private void updateCommonModule(IDtProject dtProject, String fqn, Map types, - ReturnValuesReuse returnValueReuse, String newFqn) - { - IBmModel model = bmModelManager.getModel(dtProject); - model.execute(new AbstractBmTask("change type") - { - @Override - public Void execute(IBmTransaction transaction, IProgressMonitor monitor) - { - IBmObject object = transaction.getTopObjectByFqn(fqn); - - for (Entry entry : types.entrySet()) - { - object.eSet(entry.getKey(), entry.getValue()); - } - - if (!(object instanceof CommonModule)) - { - return null; - } - - CommonModule module = (CommonModule)object; - - module.setReturnValuesReuse(returnValueReuse); - - if (newFqn != null) - { - String[] fqnArray = newFqn.split("[.]"); - if (fqnArray.length == 2) - { - module.setName(fqnArray[1]); - transaction.updateTopObjectFqn(object, newFqn); - } - } - - return null; - } - }); - waitForDD(dtProject); - } - } diff --git a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleNameClientTest.java b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleNameClientTest.java similarity index 68% rename from tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleNameClientTest.java rename to tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleNameClientTest.java index 6e0fef206..a6be55d10 100644 --- a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleNameClientTest.java +++ b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleNameClientTest.java @@ -11,27 +11,17 @@ * 1C-Soft LLC - initial API and implementation * Aleksandr Kapralov - issue #14 *******************************************************************************/ -package com.e1c.v8codestyle.md.itests; +package com.e1c.v8codestyle.md.check.itests; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import java.util.Map; -import java.util.Map.Entry; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.emf.ecore.EStructuralFeature; import org.junit.Test; -import com._1c.g5.v8.bm.core.IBmObject; -import com._1c.g5.v8.bm.core.IBmTransaction; -import com._1c.g5.v8.bm.integration.AbstractBmTask; -import com._1c.g5.v8.bm.integration.IBmModel; import com._1c.g5.v8.dt.core.platform.IDtProject; -import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; import com._1c.g5.v8.dt.metadata.mdclass.ReturnValuesReuse; import com._1c.g5.v8.dt.validation.marker.Marker; -import com.e1c.g5.v8.dt.testing.check.CheckTestBase; +import com.e1c.v8codestyle.internal.md.itests.CheckMd; import com.e1c.v8codestyle.md.check.CommonModuleNameClient; import com.e1c.v8codestyle.md.check.CommonModuleType; @@ -42,7 +32,7 @@ * */ public class CommonModuleNameClientTest - extends CheckTestBase + extends CheckMd { private static final String CHECK_ID = "common-module-name-client"; @@ -127,45 +117,4 @@ public void testCommonModuleNameClientReturnValueReuseCorrect() throws Exception assertNull(marker); } - private void updateCommonModule(IDtProject dtProject, String fqn, Map types, - ReturnValuesReuse returnValueReuse, String newFqn) - { - IBmModel model = bmModelManager.getModel(dtProject); - model.execute(new AbstractBmTask("change type") - { - @Override - public Void execute(IBmTransaction transaction, IProgressMonitor monitor) - { - IBmObject object = transaction.getTopObjectByFqn(fqn); - - for (Entry entry : types.entrySet()) - { - object.eSet(entry.getKey(), entry.getValue()); - } - - if (!(object instanceof CommonModule)) - { - return null; - } - - CommonModule module = (CommonModule)object; - - module.setReturnValuesReuse(returnValueReuse); - - if (newFqn != null) - { - String[] fqnArray = newFqn.split("[.]"); - if (fqnArray.length == 2) - { - module.setName(fqnArray[1]); - transaction.updateTopObjectFqn(object, newFqn); - } - } - - return null; - } - }); - waitForDD(dtProject); - } - } diff --git a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleNameGlobalTest.java b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleNameGlobalTest.java similarity index 78% rename from tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleNameGlobalTest.java rename to tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleNameGlobalTest.java index 804234427..b1fcea319 100644 --- a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleNameGlobalTest.java +++ b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleNameGlobalTest.java @@ -11,27 +11,17 @@ * 1C-Soft LLC - initial API and implementation * Aleksandr Kapralov - issue #14 *******************************************************************************/ -package com.e1c.v8codestyle.md.itests; +package com.e1c.v8codestyle.md.check.itests; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import java.util.Map; -import java.util.Map.Entry; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.emf.ecore.EStructuralFeature; import org.junit.Test; -import com._1c.g5.v8.bm.core.IBmObject; -import com._1c.g5.v8.bm.core.IBmTransaction; -import com._1c.g5.v8.bm.integration.AbstractBmTask; -import com._1c.g5.v8.bm.integration.IBmModel; import com._1c.g5.v8.dt.core.platform.IDtProject; -import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; import com._1c.g5.v8.dt.metadata.mdclass.ReturnValuesReuse; import com._1c.g5.v8.dt.validation.marker.Marker; -import com.e1c.g5.v8.dt.testing.check.CheckTestBase; +import com.e1c.v8codestyle.internal.md.itests.CheckMd; import com.e1c.v8codestyle.md.check.CommonModuleNameGlobal; import com.e1c.v8codestyle.md.check.CommonModuleType; @@ -42,7 +32,7 @@ * */ public class CommonModuleNameGlobalTest - extends CheckTestBase + extends CheckMd { private static final String CHECK_ID = "common-module-name-global"; @@ -203,45 +193,4 @@ public void testCommonModuleNameServerGlobalReturnValueReuseCorrect() throws Exc assertNull(marker); } - private void updateCommonModule(IDtProject dtProject, String fqn, Map types, - ReturnValuesReuse returnValueReuse, String newFqn) - { - IBmModel model = bmModelManager.getModel(dtProject); - model.execute(new AbstractBmTask("change type") - { - @Override - public Void execute(IBmTransaction transaction, IProgressMonitor monitor) - { - IBmObject object = transaction.getTopObjectByFqn(fqn); - - for (Entry entry : types.entrySet()) - { - object.eSet(entry.getKey(), entry.getValue()); - } - - if (!(object instanceof CommonModule)) - { - return null; - } - - CommonModule module = (CommonModule)object; - - module.setReturnValuesReuse(returnValueReuse); - - if (newFqn != null) - { - String[] fqnArray = newFqn.split("[.]"); - if (fqnArray.length == 2) - { - module.setName(fqnArray[1]); - transaction.updateTopObjectFqn(object, newFqn); - } - } - - return null; - } - }); - waitForDD(dtProject); - } - } diff --git a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleTypeTest.java b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleTypeTest.java similarity index 85% rename from tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleTypeTest.java rename to tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleTypeTest.java index a6ef2171c..9b6d60244 100644 --- a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/CommonModuleTypeTest.java +++ b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/CommonModuleTypeTest.java @@ -11,25 +11,16 @@ * 1C-Soft LLC - initial API and implementation * Aleksandr Kapralov - issue #15 *******************************************************************************/ -package com.e1c.v8codestyle.md.itests; +package com.e1c.v8codestyle.md.check.itests; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import java.util.Map; -import java.util.Map.Entry; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.emf.ecore.EStructuralFeature; import org.junit.Test; -import com._1c.g5.v8.bm.core.IBmObject; -import com._1c.g5.v8.bm.core.IBmTransaction; -import com._1c.g5.v8.bm.integration.AbstractBmTask; -import com._1c.g5.v8.bm.integration.IBmModel; import com._1c.g5.v8.dt.core.platform.IDtProject; import com._1c.g5.v8.dt.validation.marker.Marker; -import com.e1c.g5.v8.dt.testing.check.CheckTestBase; +import com.e1c.v8codestyle.internal.md.itests.CheckMd; import com.e1c.v8codestyle.md.check.CommonModuleType; /** @@ -39,7 +30,7 @@ * */ public class CommonModuleTypeTest - extends CheckTestBase + extends CheckMd { private static final String CHECK_ID = "common-module-type"; @@ -75,7 +66,7 @@ public void testTypeServerCorrect() throws Exception String fqn = "CommonModule.Common"; - updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_SERVER); + updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_SERVER, null, null); long id = getTopObjectIdByFqn(fqn, dtProject); Marker marker = getFirstMarker(CHECK_ID, id, dtProject); assertNull(marker); @@ -110,7 +101,7 @@ public void testTypeServerCallCorrect() throws Exception String fqn = "CommonModule.CommonServerCall"; - updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_SERVER_CALL); + updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_SERVER_CALL, null, null); long id = getTopObjectIdByFqn(fqn, dtProject); Marker marker = getFirstMarker(CHECK_ID, id, dtProject); assertNull(marker); @@ -145,7 +136,7 @@ public void testTypeClientCorrect() throws Exception String fqn = "CommonModule.CommonClient"; - updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_CLIENT); + updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_CLIENT, null, null); long id = getTopObjectIdByFqn(fqn, dtProject); Marker marker = getFirstMarker(CHECK_ID, id, dtProject); assertNull(marker); @@ -180,7 +171,7 @@ public void testTypeServerClientCorrect() throws Exception String fqn = "CommonModule.CommonServerClient"; - updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_CLIENT_SERVER); + updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_CLIENT_SERVER, null, null); long id = getTopObjectIdByFqn(fqn, dtProject); Marker marker = getFirstMarker(CHECK_ID, id, dtProject); assertNull(marker); @@ -215,7 +206,7 @@ public void testTypeServerGlobalCorrect() throws Exception String fqn = "CommonModule.CommonServerGlobal"; - updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_SERVER_GLOBAL); + updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_SERVER_GLOBAL, null, null); long id = getTopObjectIdByFqn(fqn, dtProject); Marker marker = getFirstMarker(CHECK_ID, id, dtProject); assertNull(marker); @@ -250,28 +241,10 @@ public void testTypeClientGlobalCorrect() throws Exception String fqn = "CommonModule.CommonClientGlobal"; - updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_CLIENT_GLOBAL); + updateCommonModule(dtProject, fqn, CommonModuleType.TYPE_CLIENT_GLOBAL, null, null); long id = getTopObjectIdByFqn(fqn, dtProject); Marker marker = getFirstMarker(CHECK_ID, id, dtProject); assertNull(marker); } - private void updateCommonModule(IDtProject dtProject, String fqn, Map types) - { - IBmModel model = bmModelManager.getModel(dtProject); - model.execute(new AbstractBmTask("change type") - { - @Override - public Void execute(IBmTransaction transaction, IProgressMonitor monitor) - { - IBmObject object = transaction.getTopObjectByFqn(fqn); - for (Entry entry : types.entrySet()) - { - object.eSet(entry.getKey(), entry.getValue()); - } - return null; - } - }); - waitForDD(dtProject); - } } diff --git a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/ConfigurationDataLockTest.java b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/ConfigurationDataLockTest.java similarity index 98% rename from tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/ConfigurationDataLockTest.java rename to tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/ConfigurationDataLockTest.java index 6630cc4a1..69cd37f08 100644 --- a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/ConfigurationDataLockTest.java +++ b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/ConfigurationDataLockTest.java @@ -10,7 +10,7 @@ * Contributors: * 1C-Soft LLC - initial API and implementation *******************************************************************************/ -package com.e1c.v8codestyle.md.itests; +package com.e1c.v8codestyle.md.check.itests; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/MdListObjectPresentationCheckTest.java b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdListObjectPresentationCheckTest.java similarity index 97% rename from tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/MdListObjectPresentationCheckTest.java rename to tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdListObjectPresentationCheckTest.java index 5cbbbe330..44ec2e004 100644 --- a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/MdListObjectPresentationCheckTest.java +++ b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdListObjectPresentationCheckTest.java @@ -10,7 +10,7 @@ * Contributors: * 1C-Soft LLC - initial API and implementation *******************************************************************************/ -package com.e1c.v8codestyle.md.itests; +package com.e1c.v8codestyle.md.check.itests; import static org.junit.Assert.assertNotNull; diff --git a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/MdObjectNameLengthTest.java b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdObjectNameLengthTest.java similarity index 97% rename from tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/MdObjectNameLengthTest.java rename to tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdObjectNameLengthTest.java index 8b1acc474..ab6e176c0 100644 --- a/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/itests/MdObjectNameLengthTest.java +++ b/tests/com.e1c.v8codestyle.md.itests/src/com/e1c/v8codestyle/md/check/itests/MdObjectNameLengthTest.java @@ -10,7 +10,7 @@ * Contributors: * 1C-Soft LLC - initial API and implementation *******************************************************************************/ -package com.e1c.v8codestyle.md.itests; +package com.e1c.v8codestyle.md.check.itests; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull;