A previous check-in made today lost generation of 'N.0' test section directories for

tests covering a given chapter, N, without delving into subsections.  This in turn
broken the Results page which was by default displaying individual results for chapters
13(.0) and 14(.0).  Fixed.

3 files changed, 9 insertions, 20 deletions

diff --git a/tools/SputnikConverter/SputnikTestCase.cs b/tools/SputnikConverter/SputnikTestCase.cs
index af9621bc3..4f0f2e4c2 100644
--- a/tools/SputnikConverter/SputnikTestCase.cs
+++ b/tools/SputnikConverter/SputnikTestCase.cs
@@ -251,7 +251,13 @@ namespace Microsoft.Sputnik.Interop.ParserEngine
             int indexOfRoot = this.FullPath.IndexOf(root, StringComparison.InvariantCulture) + root.Length + 1;

             this.pathFromRoot = this.FullPath.Substring(indexOfRoot, this.FullPath.Length - indexOfRoot);

 

-

+            Regex regx = new Regex("\\\\S([0-9]+)_([^\\\\]+)\\.js$");

+            if (regx.IsMatch(this.pathFromRoot))

+            {

+                Match tempMatch = regx.Match(this.pathFromRoot);

+                String tempDir = "\\" + tempMatch.Groups[1].Value + ".0_Chapter";

+                this.pathFromRoot = regx.Replace(this.pathFromRoot, tempDir + "\\S$1.0_$2.js");

+            }

             ReadSimpleTestCase(fullFile);

         }

 

@@ -290,11 +296,11 @@ namespace Microsoft.Sputnik.Interop.ParserEngine
                 if (commentKey.Contains(ResourceClass.LookFor_Name))

                 {

                     this.id = this.pathFromRoot.Substring(this.pathFromRoot.LastIndexOf("\\") + 1);

-                    this.id = GetRealId(this.id.Remove(this.id.Length - 3));

+                    this.id = this.id.Remove(this.id.Length - 3);

                 }

                 if (commentKey.Contains(ResourceClass.LookFor_Section))

                 {

-                    this.path = GetRealSectionName(this.pathFromRoot);

+                    this.path = this.pathFromRoot;

                 }

                 if (commentKey.Contains(ResourceClass.LookFor_Assertion))

                 {

@@ -317,22 +323,5 @@ namespace Microsoft.Sputnik.Interop.ParserEngine
 

             this.PossibleChecksCount = 1;

         }

-

-        

-

-        private static string GetRealId(string id)

-        {

-            Regex regx = new Regex("^ S([0-9]+)_");

-            return regx.Replace(id, " S$1.0_", 1);

-        }

-        private static string GetRealSectionName(string sectionName)

-        {

-            Regex regx = new Regex("^ ([0-9]+)$");

-            if (! regx.IsMatch(sectionName)) {

-                return sectionName;

-            }

-

-            return regx.Replace(sectionName, " $1.0", 1);

-        }

     }

 }

diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe
index cf1ac1444..bd47f0985 100644
--- a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe
+++ b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.exe
diff --git a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb
index a1b1a7266..002465ffe 100644
--- a/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb
+++ b/tools/SputnikConverter/bin/Debug/Microsoft.Sputnik.Interop.ParserEngine.pdb