From 501939e9fa61f0c65fb466d6367f6d5000b86fec Mon Sep 17 00:00:00 2001 From: nohwnd Date: Mon, 8 Jun 2020 13:07:06 +0200 Subject: [PATCH] Trim version --- test/vstest.console.UnitTests/ExecutorUnitTests.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/vstest.console.UnitTests/ExecutorUnitTests.cs b/test/vstest.console.UnitTests/ExecutorUnitTests.cs index 73987b13d8..f5748b8c49 100644 --- a/test/vstest.console.UnitTests/ExecutorUnitTests.cs +++ b/test/vstest.console.UnitTests/ExecutorUnitTests.cs @@ -21,6 +21,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests using Utilities; using CommandLineResources = Microsoft.VisualStudio.TestPlatform.CommandLine.Resources.Resources; + using System; [TestClass] public class ExecutorUnitTests @@ -51,10 +52,13 @@ public void ExecutorPrintsSplashScreenTest() // Just check first 20 characters - don't need to check whole thing as assembly version is variable // "First Printed message must be Microsoft Copyright"); - StringAssert.Contains(mockOutput.Messages.First() - .Message, CommandLineResources.MicrosoftCommandLineTitle.Substring(0, 20)); - - Assert.IsTrue(mockOutput.Messages.First().Message.EndsWith(assemblyVersion)); + StringAssert.Contains(mockOutput.Messages.First().Message, + CommandLineResources.MicrosoftCommandLineTitle.Substring(0, 20)); + + var suffixIndex = assemblyVersion.IndexOf("-"); + var version = suffixIndex == -1 ? assemblyVersion : assemblyVersion.Substring(0, suffixIndex); + StringAssert.Contains(mockOutput.Messages.First().Message, + version); } [TestMethod]