From bab8d5db13b5def5690cf4b4b8fc1dd8a047a77b Mon Sep 17 00:00:00 2001
From: Hirotada Kobayashi <pierre3@outlook.com>
Date: Sat, 17 May 2025 17:52:18 +0900
Subject: [PATCH] fixed replace include path root

---
 .../Generator/PlantUmlFromDirGenerator.cs                 | 7 ++++---
 .../PlantUmlClassDiagramGeneratorTest.csproj              | 4 ++++
 .../UnitTests/PlantUmlFromDirGeneratorTest.cs             | 8 ++++----
 .../uml/Planets/case_1/include.puml                       | 6 +++---
 .../uml/Planets/case_2/include.puml                       | 6 +++---
 .../uml/Planets/case_3/include.puml                       | 6 +++---
 .../uml/Planets/case_4/include.puml                       | 6 +++---
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/PlantUmlClassDiagramGenerator/Generator/PlantUmlFromDirGenerator.cs b/src/PlantUmlClassDiagramGenerator/Generator/PlantUmlFromDirGenerator.cs
index b5223a4..b06ff49 100644
--- 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
index 67de550..c001579 100644
--- 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
index b21d723..437eaed 100644
--- 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
index 775e6ac..dc7948d 100644
--- 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
index 775e6ac..dc7948d 100644
--- 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
index 11e0497..8b5595d 100644
--- 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
index 1ad83c8..f1574b0 100644
--- 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