JUnit output report

unickq · Sep 29, 2017 · 8f6ea7a · 8f6ea7a
1 parent 2c09637
commit 8f6ea7a
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/CNUnit/Commands/RunCommand.cs b/CNUnit/Commands/RunCommand.cs
@@ -231,7 +231,7 @@ private void RunTests()
             });
             allProcesses.Wait();
             Utils.WriteLine("Test execution finished", ConsoleColor.Cyan);
-            if (CNUnit_ReportType == ReportType.NUnit3) NUnitXmlUpdate(xmlList);
+            NUnitXmlUpdate(xmlList);
         }
 
         /// <summary>
@@ -286,14 +286,30 @@ private void NUnitXmlUpdate(List<string> xmls)
             {
                 foreach (var xml in xmls)
                 {
+                    Console.WriteLine("!!!!");
                     var doc = new XmlDocument();
                     doc.LoadXml(File.ReadAllText(xml));
-                    var attributeCollection = doc.DocumentElement?.SelectNodes("//test-suite")?[0].Attributes;
-                    if (attributeCollection != null)
+                    if (CNUnit_ReportType == ReportType.JUnit)
                     {
-                        var xmlAttributeCollection = attributeCollection?["name"];
-                        xmlAttributeCollection.Value = Path.GetFileNameWithoutExtension(xml);
+                        var testSuiteNodeList = doc.DocumentElement?.SelectNodes("//testsuite");
+                        if (testSuiteNodeList != null)
+                            foreach (XmlNode testSuiteNode in testSuiteNodeList)
+                            {
+                                if (testSuiteNode.Attributes != null)
+                                    testSuiteNode.Attributes["name"].Value =
+                                        Path.GetFileNameWithoutExtension(xml)+ "."+ Path.GetRandomFileName();
+                            } 
                     }
+                    else
+                    {
+                        var attributeCollection = doc.DocumentElement?.SelectNodes("//test-suite")?[0].Attributes;
+                        if (attributeCollection != null)
+                        {
+                            var xmlAttributeCollection = attributeCollection?["name"];
+                            xmlAttributeCollection.Value = Path.GetFileNameWithoutExtension(xml);
+                        }
+                    }
+
                     doc.Save(xml);
                 }
             }