Fixed ordering of folders

Ellerbach · Dec 18, 2024 · f9739ca · f9739ca
1 parent 329b7f4
commit f9739ca
Showing 1 changed file with 61 additions and 25 deletions.
diff --git a/src/DocFxTocGenerator/DocFxTocGenerator.Test/GenerateTocActionTests.cs b/src/DocFxTocGenerator/DocFxTocGenerator.Test/GenerateTocActionTests.cs
@@ -417,8 +417,12 @@ public async Task Run_Issue_86_OrderingAll()
     href: FilesOnly/C.md
   - name: B Document
     href: FilesOnly/B.md
-  - name: A document
+  - name: A Document
     href: FilesOnly/A.md
+  - name: A1 Document
+    href: FilesOnly/A1.md
+  - name: A2 Document
+    href: FilesOnly/A2.md
 - name: FoldersAndFiles
   items:
   - name: BB
@@ -431,14 +435,18 @@ public async Task Run_Issue_86_OrderingAll()
     items:
     - name: AA Document
       href: FoldersAndFiles/AA/README.md
-  - name: A document
+  - name: A Document
     href: FoldersAndFiles/A.md
+  - name: C Document
+    href: FoldersAndFiles/C.md
   - name: CC
     items:
     - name: CC Document
       href: FoldersAndFiles/CC/README.md
-  - name: C Document
-    href: FoldersAndFiles/C.md
+  - name: A1 Document
+    href: FoldersAndFiles/A1.md
+  - name: A2 Document
+    href: FoldersAndFiles/A2.md
 - name: FoldersOnly
   items:
   - name: CC
@@ -497,28 +505,36 @@ public async Task Run_Issue_86_OrderingFilesFirst()
     href: FilesOnly/C.md
   - name: B Document
     href: FilesOnly/B.md
-  - name: A document
+  - name: A Document
     href: FilesOnly/A.md
+  - name: A1 Document
+    href: FilesOnly/A1.md
+  - name: A2 Document
+    href: FilesOnly/A2.md
 - name: FoldersAndFiles
   items:
+  - name: B Document
+    href: FoldersAndFiles/B.md
+  - name: A Document
+    href: FoldersAndFiles/A.md
+  - name: C Document
+    href: FoldersAndFiles/C.md
+  - name: A1 Document
+    href: FoldersAndFiles/A1.md
+  - name: A2 Document
+    href: FoldersAndFiles/A2.md
   - name: BB
     items:
     - name: BB Document
       href: FoldersAndFiles/BB/README.md
-  - name: B Document
-    href: FoldersAndFiles/B.md
   - name: AA
     items:
     - name: AA Document
       href: FoldersAndFiles/AA/README.md
-  - name: A document
-    href: FoldersAndFiles/A.md
   - name: CC
     items:
     - name: CC Document
       href: FoldersAndFiles/CC/README.md
-  - name: C Document
-    href: FoldersAndFiles/C.md
 - name: FoldersOnly
   items:
   - name: CC
@@ -577,28 +593,36 @@ public async Task Run_Issue_86_OrderingFoldersFirst()
     href: FilesOnly/C.md
   - name: B Document
     href: FilesOnly/B.md
-  - name: A document
+  - name: A Document
     href: FilesOnly/A.md
+  - name: A1 Document
+    href: FilesOnly/A1.md
+  - name: A2 Document
+    href: FilesOnly/A2.md
 - name: FoldersAndFiles
   items:
   - name: BB
     items:
     - name: BB Document
       href: FoldersAndFiles/BB/README.md
-  - name: B Document
-    href: FoldersAndFiles/B.md
   - name: AA
     items:
     - name: AA Document
       href: FoldersAndFiles/AA/README.md
-  - name: A document
-    href: FoldersAndFiles/A.md
   - name: CC
     items:
     - name: CC Document
       href: FoldersAndFiles/CC/README.md
+  - name: B Document
+    href: FoldersAndFiles/B.md
+  - name: A Document
+    href: FoldersAndFiles/A.md
   - name: C Document
     href: FoldersAndFiles/C.md
+  - name: A1 Document
+    href: FoldersAndFiles/A1.md
+  - name: A2 Document
+    href: FoldersAndFiles/A2.md
 - name: FoldersOnly
   items:
   - name: CC
@@ -634,15 +658,21 @@ private void Issue_86_Setup()
 @"C
 B
 A");
-        _fileService.AddFile(folder, "A", string.Empty
+        _fileService.AddFile(folder, "A.md", string.Empty
             .AddHeading("A Document", 1)
             .AddParagraphs(1));
-        _fileService.AddFile(folder, "B", string.Empty
+        _fileService.AddFile(folder, "B.md", string.Empty
             .AddHeading("B Document", 1)
             .AddParagraphs(1));
-        _fileService.AddFile(folder, "C", string.Empty
+        _fileService.AddFile(folder, "C.md", string.Empty
             .AddHeading("C Document", 1)
             .AddParagraphs(1));
+        _fileService.AddFile(folder, "A1.md", string.Empty
+            .AddHeading("A1 Document", 1)
+            .AddParagraphs(1));
+        _fileService.AddFile(folder, "A2.md", string.Empty
+            .AddHeading("A2 Document", 1)
+            .AddParagraphs(1));
 
         folder = _fileService.AddFolder("FoldersOnly");
         _fileService.AddFile(folder, ".order",
@@ -670,24 +700,30 @@ private void Issue_86_Setup()
 A
 C
 CC");
-        _fileService.AddFile(folder, "A", string.Empty
+        _fileService.AddFile(folder, "A.md", string.Empty
             .AddHeading("A Document", 1)
             .AddParagraphs(1));
-        _fileService.AddFile(folder, "B", string.Empty
+        _fileService.AddFile(folder, "B.md", string.Empty
             .AddHeading("B Document", 1)
             .AddParagraphs(1));
-        _fileService.AddFile(folder, "C", string.Empty
+        _fileService.AddFile(folder, "C.md", string.Empty
             .AddHeading("C Document", 1)
             .AddParagraphs(1));
-        folder = _fileService.AddFolder("FoldersOnly/AA");
+        _fileService.AddFile(folder, "A1.md", string.Empty
+            .AddHeading("A1 Document", 1)
+            .AddParagraphs(1));
+        _fileService.AddFile(folder, "A2.md", string.Empty
+            .AddHeading("A2 Document", 1)
+            .AddParagraphs(1));
+        folder = _fileService.AddFolder("FoldersAndFiles/AA");
         _fileService.AddFile(folder, "README.md", string.Empty
             .AddHeading("AA Document", 1)
             .AddParagraphs(1));
-        folder = _fileService.AddFolder("FoldersOnly/BB");
+        folder = _fileService.AddFolder("FoldersAndFiles/BB");
         _fileService.AddFile(folder, "README.md", string.Empty
             .AddHeading("BB Document", 1)
             .AddParagraphs(1));
-        folder = _fileService.AddFolder("FoldersOnly/CC");
+        folder = _fileService.AddFolder("FoldersAndFiles/CC");
         _fileService.AddFile(folder, "README.md", string.Empty
             .AddHeading("CC Document", 1)
             .AddParagraphs(1));