From 031991f32f059b64374e6d257cbe573304dd577f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 13 May 2022 11:40:45 -0500 Subject: Add ability to skip tests at runtime, and skip long running cache tests 6665 --- .../WixBuildTools.TestSupport/WixAssert.cs | 142 --------------------- 1 file changed, 142 deletions(-) delete mode 100644 src/internal/WixBuildTools.TestSupport/WixAssert.cs (limited to 'src/internal/WixBuildTools.TestSupport/WixAssert.cs') diff --git a/src/internal/WixBuildTools.TestSupport/WixAssert.cs b/src/internal/WixBuildTools.TestSupport/WixAssert.cs deleted file mode 100644 index 1db842c3..00000000 --- a/src/internal/WixBuildTools.TestSupport/WixAssert.cs +++ /dev/null @@ -1,142 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. - -namespace WixBuildTools.TestSupport -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Xml.Linq; - using Xunit; - - public class WixAssert : Assert - { - public static void CompareLineByLine(string[] expectedLines, string[] actualLines) - { - var lineNumber = 0; - - for (; lineNumber < expectedLines.Length && lineNumber < actualLines.Length; ++lineNumber) - { - WixAssert.StringEqual($"{lineNumber}: {expectedLines[lineNumber]}", $"{lineNumber}: {actualLines[lineNumber]}"); - } - - var additionalExpectedLines = expectedLines.Length > lineNumber ? String.Join(Environment.NewLine, expectedLines.Skip(lineNumber).Select((s, i) => $"{lineNumber + i}: {s}")) : $"Missing {actualLines.Length - lineNumber} lines"; - var additionalActualLines = actualLines.Length > lineNumber ? String.Join(Environment.NewLine, actualLines.Skip(lineNumber).Select((s, i) => $"{lineNumber + i}: {s}")) : $"Missing {expectedLines.Length - lineNumber} lines"; - - WixAssert.StringEqual(additionalExpectedLines, additionalActualLines); - } - - public static void CompareXml(XContainer xExpected, XContainer xActual) - { - var expecteds = xExpected.Descendants().Select(x => $"{x.Name.LocalName}:{String.Join(",", x.Attributes().OrderBy(a => a.Name.LocalName).Select(a => $"{a.Name.LocalName}={a.Value}"))}"); - var actuals = xActual.Descendants().Select(x => $"{x.Name.LocalName}:{String.Join(",", x.Attributes().OrderBy(a => a.Name.LocalName).Select(a => $"{a.Name.LocalName}={a.Value}"))}"); - - CompareLineByLine(expecteds.OrderBy(s => s).ToArray(), actuals.OrderBy(s => s).ToArray()); - } - - public static void CompareXml(string expectedPath, string actualPath) - { - var expectedDoc = XDocument.Load(expectedPath, LoadOptions.PreserveWhitespace | LoadOptions.SetBaseUri | LoadOptions.SetLineInfo); - var actualDoc = XDocument.Load(actualPath, LoadOptions.PreserveWhitespace | LoadOptions.SetBaseUri | LoadOptions.SetLineInfo); - - CompareXml(expectedDoc, actualDoc); - } - - public static void Succeeded(int hr, string format, params object[] formatArgs) - { - if (0 > hr) - { - throw new SucceededException(hr, String.Format(format, formatArgs)); - } - } - - public static void StringCollectionEmpty(IList collection) - { - if (collection.Count > 0) - { - Assert.True(false, $"The collection was expected to be empty, but instead was [{Environment.NewLine}\"{String.Join($"\", {Environment.NewLine}\"", collection)}\"{Environment.NewLine}]"); - } - } - - public static void StringEqual(string expected, string actual, bool ignoreCase = false) - { - var comparer = ignoreCase ? StringObjectEqualityComparer.InvariantCultureIgnoreCase : StringObjectEqualityComparer.InvariantCulture; - Assert.Equal(expected, actual, comparer); - } - - public static void NotStringEqual(string expected, string actual, bool ignoreCase = false) - { - var comparer = ignoreCase ? StringObjectEqualityComparer.InvariantCultureIgnoreCase : StringObjectEqualityComparer.InvariantCulture; - Assert.NotEqual(expected, actual, comparer); - } - - private class StringObjectEqualityComparer : IEqualityComparer - { - public static readonly StringObjectEqualityComparer InvariantCultureIgnoreCase = new StringObjectEqualityComparer(true); - public static readonly StringObjectEqualityComparer InvariantCulture = new StringObjectEqualityComparer(false); - - private readonly StringComparer stringComparer; - - public StringObjectEqualityComparer(bool ignoreCase) - { - this.stringComparer = ignoreCase ? StringComparer.InvariantCultureIgnoreCase : StringComparer.InvariantCulture; - } - - public new bool Equals(object x, object y) - { - return this.stringComparer.Equals((string)x,(string)y); - } - - public int GetHashCode(object obj) - { - return this.stringComparer.GetHashCode((string)obj); - } - } - - // There appears to have been a bug in VC++, which might or might not have been partially - // or completely corrected. It was unable to disambiguate a call to: - // Xunit::Assert::Throws(System::Type^, System::Action^) - // from a call to: - // Xunit::Assert::Throws(System::Type^, System::Func^) - // that implicitly ignores its return value. - // - // The ambiguity may have been reported by some versions of the compiler and not by others. - // Some versions of the compiler may not have emitted any code in this situation, making it - // appear that the test has passed when, in fact, it hasn't been run. - // - // This situation is not an issue for C#. - // - // The following method is used to isolate DUtilTests in order to overcome the above problem. - - /// - /// This shim allows C++/CLR code to call the Xunit method with the same signature - /// without getting an ambiguous overload error. If the specified test code - /// fails to generate an exception of the exact specified type, an assertion - /// exception is thrown. Otherwise, execution flow proceeds as normal. - /// - /// The type name of the expected exception. - /// An Action delegate to run the test code. - public static new void Throws(System.Action testCode) - where T : System.Exception - { - Xunit.Assert.Throws(testCode); - } - - // This shim has been tested, but is not currently used anywhere. It was provided - // at the same time as the preceding shim because it involved the same overload - // resolution conflict. - - /// - /// This shim allows C++/CLR code to call the Xunit method with the same signature - /// without getting an ambiguous overload error. If the specified test code - /// fails to generate an exception of the exact specified type, an assertion - /// exception is thrown. Otherwise, execution flow proceeds as normal. - /// - /// The type object associated with exceptions of the expected type. - /// An Action delegate to run the test code. - /// An exception of a type other than the type specified, is such an exception is thrown. - public static new System.Exception Throws(System.Type exceptionType, System.Action testCode) - { - return Xunit.Assert.Throws(exceptionType, testCode); - } - } -} -- cgit v1.2.3-55-g6feb