Check for complete result, including label

Author: CharliePoole

recipe/test-reports.cake

@@ -17,12 +17,11 @@ public class PackageTestReport
 
 		if (expectedResult != null)
 		{
-			ReportMissingFiles();
-
 			if (actualResult.OverallResult == null)
 				Errors.Add("   The test-run element has no result attribute.");
 			else if (expectedResult.OverallResult != actualResult.OverallResult)
 				Errors.Add($"   Expected: Overall Result = {expectedResult.OverallResult} But was: {actualResult.OverallResult}");
+
 			CheckCounter("Test Count", expectedResult.Total, actualResult.Total);
 			CheckCounter("Passed", expectedResult.Passed, actualResult.Passed);
 			CheckCounter("Failed", expectedResult.Failed, actualResult.Failed);
@@ -121,35 +120,6 @@ public class PackageTestReport
 			writer.WriteLine("   WARNING: " + warning);
 	}
 
-	// File level errors, like missing or mal-formatted files, need to be highlighted
-	// because otherwise it's hard to detect the cause of the problem without debugging.
-	// This method finds and reports that type of error.
-	private void ReportMissingFiles()
-	{
-		// Start with all the top-level test suites. Note that files that
-		// cannot be found show up as Unknown as do unsupported file types.
-		var suites = Result.Xml.SelectNodes(
-			"//test-suite[@type='Unknown'] | //test-suite[@type='Project'] | //test-suite[@type='Assembly']");
-
-		// If there is no top-level suite, it generally means the file format could not be interpreted
-		if (suites.Count == 0)
-			Errors.Add("   No top-level suites! Possible empty command-line or misformed project.");
-
-		foreach (XmlNode suite in suites)
-		{
-			// Narrow down to the specific failures we want
-			string runState = GetAttribute(suite, "runstate");
-			string suiteResult = GetAttribute(suite, "result");
-			string label = GetAttribute(suite, "label");
-			string site = suite.Attributes["site"]?.Value ?? "Test";
-			if (runState == "NotRunnable" || suiteResult == "Failed" && site == "Test" && (label == "Invalid" || label == "Error"))
-			{
-				string message = suite.SelectSingleNode("reason/message")?.InnerText;
-				Errors.Add($"   {message}");
-			}
-		}
-	}
-
 	private void CheckCounter(string label, int expected, int actual)
 	{
 		// If expected value of counter is negative, it means no check is needed

recipe/test-results.cake

@@ -57,6 +57,9 @@ public class ActualResult : TestResultSummary
 			throw new Exception("Top-level <test-run> or <test-suite> element not found.");
 
 		OverallResult = GetAttribute(Xml, "result");
+		var label = GetAttribute(Xml, "label");
+		if (label != null)
+			OverallResult += ":" + label;
 		Total = IntAttribute(Xml, "total");
 		Passed = IntAttribute(Xml, "passed");
 		Failed = IntAttribute(Xml, "failed");
@@ -66,7 +69,7 @@ public class ActualResult : TestResultSummary
 
 		var assemblies = new List<ActualAssemblyResult>();
 
-		foreach (XmlNode node in Xml.SelectNodes("//test-suite[@type='Assembly']"))
+		foreach (XmlNode node in Xml.SelectNodes("//test-suite[@type='Assembly'] | //test-suite[@type='Unknown']"))
 			assemblies.Add(new ActualAssemblyResult(node));
 
 		Assemblies = assemblies.ToArray();

recipe/test-runners.cake

@@ -114,8 +114,6 @@ public abstract class InstallableTestRunner : TestRunner
 		Version = version;
 	}
 
-	//private bool IsChocolateyPackage => PackageId.Contains('-'); // Hack!
-
 	protected FilePath ExecutableRelativePath { get; set; }
 	protected bool IsDotNetTool { get; set; } = false;