Исправлены тесты, скорректировано хранение модулей и применение поставки

Author: theshadowco

src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/Common.java

@@ -51,6 +51,14 @@ public static Map<URI, Map<SupportConfiguration, SupportVariant>> getModuleSuppo
             if (!mdoModuleSupport.isEmpty()) {
               modulesBySupport.putAll(mdoModuleSupport);
             }
+            if (mdObject.getForms() != null) {
+              mdObject.getForms().forEach(form -> {
+                var formSupport = getMDObjectSupport(supportMap, form);
+                if (!formSupport.isEmpty()) {
+                  modulesBySupport.putAll(formSupport);
+                }
+              });
+            }
           })
         );
     }

src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/MDOUtils.java

@@ -352,10 +352,6 @@ public static Map<URI, ModuleType> getModuleTypesByMDOPath(ConfigurationSource c
         }
       });
 
-      if (mdoType.isMayHaveForm()) {
-        modulesByType.putAll(getFormsMDOModuleTypes(configurationSource, folder, mdoName));
-      }
-
       if (mdoType.isMayHaveCommand()) {
         modulesByType.putAll(getCommandsMDOModuleTypes(configurationSource, folder, mdoName));
       }
@@ -385,8 +381,15 @@ public static Map<URI, ModuleType> getModuleTypesByPath(ConfigurationSource conf
       }
 
       getMDOFilesInFolder(configurationSource, folder)
-        .forEach(mdoPath -> modulesByType.putAll(
-          getModuleTypesByMDOPath(configurationSource, mdoPath, folder, mdoType)));
+        .forEach(mdoPath -> {
+            modulesByType.putAll(
+              getModuleTypesByMDOPath(configurationSource, mdoPath, folder, mdoType));
+            modulesByType.putAll(
+              getFormsMDOModuleTypes(configurationSource,
+                folder,
+                FilenameUtils.getBaseName(mdoPath.toString())));
+          }
+        );
     }
 
     return modulesByType;

src/test/java/com/github/_1c_syntax/mdclasses/ConfigurationEDTTest.java

@@ -30,15 +30,14 @@ void testBuilder() {
     assertThat(configuration.getSynchronousExtensionAndAddInCallUseMode()).isEqualTo(UseMode.USE_WITH_WARNINGS);
     assertThat(configuration.getSynchronousPlatformExtensionAndAddInCallUseMode()).isEqualTo(UseMode.DONT_USE);
     assertThat(CompatibilityMode.compareTo(configuration.getCompatibilityMode(), new CompatibilityMode(3, 10))).isEqualTo(0);
-    assertThat(configuration.getModulesByType().size() > 0).isTrue();
+    assertThat(configuration.getModulesByType()).hasSize(34);
 
     File file = new File("src/test/resources/metadata/edt/src/Constants/Константа1/ValueManagerModule.bsl");
     assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.ValueManagerModule);
 
     file = new File("src/test/resources/metadata/edt/src/CommonModules/ПростойОбщийМодуль/Module.bsl");
     assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);
 
-
     file = new File("src/test/resources/metadata/edt/src/Catalogs/Справочник1/Forms/ФормаЭлемента/Module.bsl");
     assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.FormModule);
 
@@ -77,7 +76,7 @@ void testBuilderEn() {
     assertThat(configuration.getSynchronousExtensionAndAddInCallUseMode()).isEqualTo(UseMode.USE);
     assertThat(configuration.getSynchronousPlatformExtensionAndAddInCallUseMode()).isEqualTo(UseMode.DONT_USE);
     assertThat(CompatibilityMode.compareTo(configuration.getCompatibilityMode(), new CompatibilityMode(3, 14))).isEqualTo(0);
-    assertThat(configuration.getModulesByType().size() > 0).isTrue();
+    assertThat(configuration.getModulesByType()).hasSize(2);
 
     File file = new File("src/test/resources/metadata/edt_en/src/CommonModules/CommonModule/Module.bsl");
     assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);

src/test/java/com/github/_1c_syntax/mdclasses/ConfigurationOriginTest.java

@@ -33,7 +33,7 @@ void testBuilder() {
     assertThat(configuration.getSynchronousExtensionAndAddInCallUseMode()).isEqualTo(UseMode.USE);
     assertThat(configuration.getSynchronousPlatformExtensionAndAddInCallUseMode()).isEqualTo(UseMode.DONT_USE);
     assertThat(CompatibilityMode.compareTo(configuration.getCompatibilityMode(), new CompatibilityMode(3, 10))).isEqualTo(0);
-    assertThat(configuration.getModulesByType().size() > 0).isTrue();
+    assertThat(configuration.getModulesByType()).hasSize(22);
 
     File file = new File("src/test/resources/metadata/original/Documents/ПоступлениеТоваровУслуг/Ext/ManagerModule.bsl");
     assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.ManagerModule);

src/test/java/com/github/_1c_syntax/mdclasses/ParseSupportDataTest.java

@@ -1,8 +1,8 @@
 package com.github._1c_syntax.mdclasses;
 
 import com.github._1c_syntax.mdclasses.metadata.Configuration;
-import com.github._1c_syntax.mdclasses.metadata.utils.ParseSupportData;
 import com.github._1c_syntax.mdclasses.metadata.additional.SupportVariant;
+import com.github._1c_syntax.mdclasses.metadata.utils.ParseSupportData;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -38,6 +38,9 @@ void testConfigurationSupportEDT() {
     path = Paths.get(PATH_TO_SUPPORT, "src/Documents/ПервыйДокумент/ObjectModule.bsl").toAbsolutePath();
     assertThat(configuration.getModuleSupport(path.toUri()).containsValue(SupportVariant.NOT_SUPPORTED)).isTrue();
 
+    path = Paths.get(PATH_TO_SUPPORT, "src/Catalogs/ПервыйСправочник/Forms/ФормаЭлемента/Module.bsl").toAbsolutePath();
+    assertThat(configuration.getModuleSupport(path.toUri()).containsValue(SupportVariant.NOT_EDITABLE)).isTrue();
+
   }
 
   @Test
@@ -58,7 +61,8 @@ void testConfigurationSupportDesigner() {
 
     path = Paths.get(PATH_TO_SUPPORT, "Documents/ПервыйДокумент/Ext/ObjectModule.bsl").toAbsolutePath();
     assertThat(configuration.getModuleSupport(path.toUri()).containsValue(SupportVariant.NOT_SUPPORTED)).isTrue();
-
+    path = Paths.get(PATH_TO_SUPPORT, "Catalogs/ПервыйСправочник/Forms/ФормаЭлемента/Ext/Form/Module.bsl").toAbsolutePath();
+    assertThat(configuration.getModuleSupport(path.toUri()).containsValue(SupportVariant.NOT_EDITABLE)).isTrue();
   }
 
 }

src/test/java/com/github/_1c_syntax/mdclasses/metadata/utils/MDOUtilsTest.java

@@ -66,6 +66,7 @@ private static Map<URI, ModuleType> correctFilesAndTypesDESIGNER(String srcPath)
     correct.put(Paths.get(srcPath, "Documents", "ПоступлениеТоваровУслуг", "Commands", "ДокументыПоступления", "Ext", "CommandModule.bsl").toUri(), ModuleType.CommandModule);
     correct.put(Paths.get(srcPath, "CommonCommands", "ОбщаяКоманда1", "Ext", "CommandModule.bsl").toUri(), ModuleType.CommandModule);
     correct.put(Paths.get(srcPath, "Catalogs", "Справочник1", "Commands", "Команда1", "Ext", "CommandModule.bsl").toUri(), ModuleType.CommandModule);
+    correct.put(Paths.get(srcPath, "Catalogs", "Справочник1", "Forms", "ФормаВыбора", "Ext", "Form", "Module.bsl").toUri(), ModuleType.FormModule);
     correct.put(Paths.get(srcPath, "Documents", "ПоступлениеТоваровУслуг", "Ext", "ManagerModule.bsl").toUri(), ModuleType.ManagerModule);
     correct.put(Paths.get(srcPath, "Documents", "ПоступлениеТоваровУслуг", "Forms", "ФормаСпискаДокументов", "Ext", "Form", "Module.bsl").toUri(), ModuleType.FormModule);
     correct.put(Paths.get(srcPath, "Documents", "ПоступлениеТоваровУслуг", "Forms", "ФормаСписка", "Ext", "Form", "Module.bsl").toUri(), ModuleType.FormModule);