#192, #209: Parsing of invalid Cobertura files

danielpalme · Feb 13, 2019 · 1f4fb6a · 1f4fb6a
1 parent c1fa888
commit 1f4fb6a
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 10 deletions.
diff --git a/src/Readme.txt b/src/Readme.txt
@@ -60,7 +60,7 @@ CHANGELOG
 
 4.0.12.0
 
-    * Fix: Issue #209: Added warning if Cobertura file is invalid
+    * Fix: Issue #192, #209: Parsing of invalid Cobertura files
 
 4.0.11.0
 

diff --git a/src/ReportGenerator.Core/Parser/CoberturaParser.cs b/src/ReportGenerator.Core/Parser/CoberturaParser.cs
@@ -70,14 +70,6 @@ public override ParserResult Parse(XContainer report)
             var modules = report.Descendants("package")
               .ToArray();
 
-            if (modules.Length == 0)
-            {
-                if (report.Descendants("packages").Elements("class").Any())
-                {
-                    Logger.Error("  " + Resources.ErrorInvalidCoberturaReport);
-                }
-            }
-
             var assemblyNames = modules
                 .Select(m => m.Attribute("name").Value)
                 .Distinct()

diff --git a/src/ReportGenerator.Core/Parser/Preprocessing/CoberturaReportPreprocessor.cs b/src/ReportGenerator.Core/Parser/Preprocessing/CoberturaReportPreprocessor.cs
@@ -1,6 +1,8 @@
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
+using Palmmedia.ReportGenerator.Core.Logging;
+using Palmmedia.ReportGenerator.Core.Properties;
 
 namespace Palmmedia.ReportGenerator.Core.Parser.Preprocessing
 {
@@ -9,12 +11,39 @@ namespace Palmmedia.ReportGenerator.Core.Parser.Preprocessing
     /// </summary>
     internal class CoberturaReportPreprocessor
     {
+        /// <summary>
+        /// The Logger.
+        /// </summary>
+        private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(CoberturaReportPreprocessor));
+
         /// <summary>
         /// Executes the preprocessing of the report.
         /// </summary>
         /// <param name="report">The report.</param>
         internal void Execute(XContainer report)
         {
+            var modules = report.Descendants("package")
+                .ToArray();
+
+            if (modules.Length == 0)
+            {
+                if (report.Descendants("packages").Elements("class").Any())
+                {
+                    Logger.Error("  " + Resources.ErrorInvalidCoberturaReport);
+
+                    // Fix malformed report files (See issues: #192, #209)
+                    foreach (var packagesElement in report.Descendants("packages").ToArray())
+                    {
+                        packagesElement.Name = "classes";
+
+                        var parent = packagesElement.Parent;
+
+                        packagesElement.Remove();
+                        parent.Add(new XElement("packages", new XElement("package", new XAttribute("name", "AutoGenerated"), packagesElement)));
+                    }
+                }
+            }
+
             var sources = report.Descendants("sources")
                 .Elements("source")
                 .Select(s => s.Value)

diff --git a/src/ReportGenerator.Core/Reporting/Builders/Rendering/HtmlRenderer.cs b/src/ReportGenerator.Core/Reporting/Builders/Rendering/HtmlRenderer.cs
@@ -1206,7 +1206,17 @@ private static string GetClassReportFilename(string assemblyName, string classNa
 
             if (!FileNameByClass.TryGetValue(key, out fileName))
             {
-                string shortClassName = className.Substring(className.LastIndexOf('.') + 1);
+                string shortClassName = null;
+
+                if (className.EndsWith(".js", StringComparison.OrdinalIgnoreCase))
+                {
+                    shortClassName = className.Substring(0, className.LastIndexOf('.'));
+                }
+                else
+                {
+                    shortClassName = className.Substring(className.LastIndexOf('.') + 1);
+                }
+
                 fileName = RendererBase.ReplaceInvalidPathChars(assemblyName + "_" + shortClassName) + ".htm";
 
                 if (fileName.Length > 100)