fixed replace include path root

pierre3 · pierre3 · commit bab8d5db13b5 · 2025-05-17T17:52:18.000+09:00
diff --git a/src/PlantUmlClassDiagramGenerator/Generator/PlantUmlFromDirGenerator.cs b/src/PlantUmlClassDiagramGenerator/Generator/PlantUmlFromDirGenerator.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -106,8 +106,9 @@ public bool GeneratePlantUml(Dictionary<string, string> parameters)
                 }
                 else
                 {
-                    var newRoot = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? @".\" : @".";
-                    includeRefs.AppendLine("!include " + outputFile.Replace(outputRoot, newRoot));
+                    //var newRoot = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? @".\" : @".";
+                    var root = outputRoot.EndsWith(Path.DirectorySeparatorChar) ? outputRoot.TrimEnd(Path.DirectorySeparatorChar) : outputRoot;
+                    includeRefs.AppendLine("!include " + outputFile.Replace(root, "."));
                 }
             }
             catch (Exception e)
diff --git a/test/PlantUmlClassDiagramGeneratorTest/PlantUmlClassDiagramGeneratorTest.csproj b/test/PlantUmlClassDiagramGeneratorTest/PlantUmlClassDiagramGeneratorTest.csproj
@@ -40,9 +40,13 @@
 
 	<ItemGroup>
 	  <Compile Remove="uml\20250517_151031\**" />
+	  <Compile Remove="uml\20250517_165357\**" />
 	  <Content Remove="uml\20250517_151031\**" />
+	  <Content Remove="uml\20250517_165357\**" />
 	  <EmbeddedResource Remove="uml\20250517_151031\**" />
+	  <EmbeddedResource Remove="uml\20250517_165357\**" />
 	  <None Remove="uml\20250517_151031\**" />
+	  <None Remove="uml\20250517_165357\**" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/test/PlantUmlClassDiagramGeneratorTest/UnitTests/PlantUmlFromDirGeneratorTest.cs b/test/PlantUmlClassDiagramGeneratorTest/UnitTests/PlantUmlFromDirGeneratorTest.cs
@@ -52,10 +52,10 @@ public void Generate(int testNum, bool allInOne, bool createAssociation, bool ad
 
     public void Dispose()
     {
-        if (Directory.Exists(outputDir))
-        {
-            Directory.Delete(outputDir, true);
-        }
+        //if (Directory.Exists(outputDir))
+        //{
+        //    Directory.Delete(outputDir, true);
+        //}
     }
 
 
diff --git a/test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_1/include.puml b/test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_1/include.puml
@@ -1,5 +1,5 @@
 @startuml
-!include .\\Earth.puml
-!include .\\Moon.puml
-!include .\\BaseTypes\PlanetBase.puml
+!include .\Earth.puml
+!include .\Moon.puml
+!include .\BaseTypes\PlanetBase.puml
 @enduml
diff --git a/test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_2/include.puml b/test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_2/include.puml
@@ -1,5 +1,5 @@
 @startuml
-!include .\\Earth.puml
-!include .\\Moon.puml
-!include .\\BaseTypes\PlanetBase.puml
+!include .\Earth.puml
+!include .\Moon.puml
+!include .\BaseTypes\PlanetBase.puml
 @enduml
diff --git a/test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_3/include.puml b/test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_3/include.puml
@@ -1,6 +1,6 @@
 @startuml
-!include .\\Earth.puml
-!include .\\Moon.puml
-!include .\\BaseTypes\PlanetBase.puml
+!include .\Earth.puml
+!include .\Moon.puml
+!include .\BaseTypes\PlanetBase.puml
 PlanetBase <|-- Earth
 @enduml
diff --git a/test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_4/include.puml b/test/PlantUmlClassDiagramGeneratorTest/uml/Planets/case_4/include.puml
@@ -1,7 +1,7 @@
 @startuml
-!include .\\Earth.puml
-!include .\\Moon.puml
-!include .\\BaseTypes\PlanetBase.puml
+!include .\Earth.puml
+!include .\Moon.puml
+!include .\BaseTypes\PlanetBase.puml
 PlanetBase <|-- Earth
 PlanetBase o-> "Moons<Moon>" "IList`1"
 @enduml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Linq;`
`@@ -106,8 +106,9 @@ public bool GeneratePlantUml(Dictionary<string, string> parameters)`
`106`	`106`	`}`
`107`	`107`	`else`
`108`	`108`	`{`
`109`		`- var newRoot = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? @".\" : @".";`
`110`		`- includeRefs.AppendLine("!include " + outputFile.Replace(outputRoot, newRoot));`
	`109`	`+ //var newRoot = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? @".\" : @".";`
	`110`	`+ var root = outputRoot.EndsWith(Path.DirectorySeparatorChar) ? outputRoot.TrimEnd(Path.DirectorySeparatorChar) : outputRoot;`
	`111`	`+ includeRefs.AppendLine("!include " + outputFile.Replace(root, "."));`
`111`	`112`	`}`
`112`	`113`	`}`
`113`	`114`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,10 @@ public void Generate(int testNum, bool allInOne, bool createAssociation, bool ad`
`52`	`52`
`53`	`53`	`public void Dispose()`
`54`	`54`	`{`
`55`		`- if (Directory.Exists(outputDir))`
`56`		`- {`
`57`		`- Directory.Delete(outputDir, true);`
`58`		`- }`
	`55`	`+ //if (Directory.Exists(outputDir))`
	`56`	`+ //{`
	`57`	`+ // Directory.Delete(outputDir, true);`
	`58`	`+ //}`
`59`	`59`	`}`
`60`	`60`
`61`	`61`