Фикс uri для других OS (#42)

Фикс URI

Author: otymko

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

@@ -97,7 +97,7 @@ public static Map<URI, ModuleType> getModuleTypesByPath(Path rootPath) {
       };
 
       ModuleType moduleType = getModuleTypeByFileName(partsFileName);
-      modulesByType.put(file.toURI(), moduleType);
+      modulesByType.put(getAbsoluteUri(file), moduleType);
     });
 
     return modulesByType;
@@ -129,8 +129,7 @@ public static Map<URI, Map<SupportConfiguration, SupportVariant>> getModuleSuppo
       files.stream().forEach(file -> {
 
         // FIXME: неправильное поведение, считается от каталога внутри scr
-        var path = file.toPath();
-        URI uri = path.toAbsolutePath().toUri();
+        URI uri = getAbsoluteUri(file);
         String[] elementsPath = file.toPath().toString().replace(rootPathString, "").split(FILE_SEPARATOR);
 
         Map<SupportConfiguration, SupportVariant> moduleSupport = null;
@@ -274,4 +273,12 @@ private static String[] getPartsByPath(Path path) {
     return array;
   }
 
+  public static Path getAbsolutePath(File file) {
+    return file.toPath().toAbsolutePath();
+  }
+
+  public static URI getAbsoluteUri(File file) {
+    return getAbsolutePath(file).toUri();
+  }
+
 }

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

@@ -7,6 +7,7 @@
 import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ScriptVariant;
+import com.github._1c_syntax.mdclasses.metadata.utils.Common;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -28,13 +29,13 @@ void testBuilder() {
     assertThat(configuration.getModulesByType().size() > 0).isTrue();
 
     File file = new File("src/test/resources/metadata/edt/src/Constants/Константа1/ManagerModule.bsl");
-    assertThat(configuration.getModuleType(file.toURI())).isEqualTo(ModuleType.ManagerModule);
+    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.ManagerModule);
 
     file = new File("src/test/resources/metadata/edt/src/CommonModules/ПростойОбщийМодуль/Module.bsl");
-    assertThat(configuration.getModuleType(file.toURI())).isEqualTo(ModuleType.CommonModule);
+    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(file.toURI())).isEqualTo(ModuleType.FormModule);
+    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.FormModule);
 
     CommonModule commonModule = (CommonModule) configuration.getChild(MDOType.COMMON_MODULE, "ПростойОбщийМодуль");
     assertThat(commonModule).isNotNull();
@@ -53,7 +54,7 @@ void testErrorBuild() {
     assertThat(configuration).isNotNull();
 
     File file = new File("src/test/resources/metadata/Module.os");
-    assertThat(configuration.getModuleType(file.toURI())).isEqualTo(ModuleType.Unknown);
+    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.Unknown);
   }
 
   @Test
@@ -68,7 +69,7 @@ void testBuilderEn() {
     assertThat(configuration.getModulesByType().size() > 0).isTrue();
 
     File file = new File("src/test/resources/metadata/edt_en/src/CommonModules/CommonModule/Module.bsl");
-    assertThat(configuration.getModuleType(file.toURI())).isEqualTo(ModuleType.CommonModule);
+    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);
 
   }
 

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

@@ -4,6 +4,7 @@
 import com.github._1c_syntax.mdclasses.metadata.additional.ConfigurationSource;
 import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import com.github._1c_syntax.mdclasses.metadata.utils.Common;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -20,7 +21,7 @@ void testBuilder() {
         assertThat(configuration.getConfigurationSource()).isEqualTo(ConfigurationSource.EMPTY);
 
         File file = new File("src/test/resources/metadata/edt/src/Constants/Константа1/ManagerModule.bsl");
-        assertThat(configuration.getModuleType(file.toURI())).isEqualTo(ModuleType.Unknown);
+        assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.Unknown);
 
         Configuration configuration2 = Configuration.newBuilder().build();
 

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

@@ -7,6 +7,7 @@
 import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ScriptVariant;
+import com.github._1c_syntax.mdclasses.metadata.utils.Common;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -31,10 +32,10 @@ void testBuilder() {
     assertThat(configuration.getModulesByType().size() > 0).isTrue();
 
     File file = new File("src/test/resources/metadata/original/Documents/ПоступлениеТоваровУслуг/Ext/ManagerModule.bsl");
-    assertThat(configuration.getModuleType(file.toURI())).isEqualTo(ModuleType.ManagerModule);
+    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.ManagerModule);
 
     file = new File("src/test/resources/metadata/original/CommonModules/ПростойОбщийМодуль/Ext/Module.bsl");
-    assertThat(configuration.getModuleType(file.toURI())).isEqualTo(ModuleType.CommonModule);
+    assertThat(configuration.getModuleType(Common.getAbsoluteUri(file))).isEqualTo(ModuleType.CommonModule);
 
     CommonModule commonModule = (CommonModule) configuration.getChild(MDOType.COMMON_MODULE, "ПростойОбщийМодуль");
     assertThat(commonModule).isNotNull();