From c00516901e6b67e398396b14fe7682d0376f8643 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 22 Apr 2021 05:46:03 -0700 Subject: Move balutil into API/burn --- .../BaseBootstrapperApplicationFactoryFixture.cs | 132 --------------------- src/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs | 93 --------------- .../WixToolsetTest.Mba.Core.csproj | 21 ---- .../WixToolsetTest.Mba.Core.v3.ncrunchproject | 5 - 4 files changed, 251 deletions(-) delete mode 100644 src/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs delete mode 100644 src/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs delete mode 100644 src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj delete mode 100644 src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.v3.ncrunchproject (limited to 'src/test/WixToolsetTest.Mba.Core') diff --git a/src/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs b/src/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs deleted file mode 100644 index aaf5ee29..00000000 --- a/src/test/WixToolsetTest.Mba.Core/BaseBootstrapperApplicationFactoryFixture.cs +++ /dev/null @@ -1,132 +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 WixToolsetTest.Mba.Core -{ - using System; - using System.Runtime.InteropServices; - using WixToolset.Mba.Core; - using Xunit; - - public class BaseBootstrapperApplicationFactoryFixture - { - [Fact] - public void CanCreateBA() - { - var command = new TestCommand - { - action = LaunchAction.Install, - cbSize = Marshal.SizeOf(typeof(TestCommand)), - display = Display.Full, - wzCommandLine = "this \"is a\" test", - }; - var pCommand = Marshal.AllocHGlobal(command.cbSize); - try - { - Marshal.StructureToPtr(command, pCommand, false); - var createArgs = new BootstrapperCreateArgs(0, IntPtr.Zero, IntPtr.Zero, pCommand); - var pArgs = Marshal.AllocHGlobal(createArgs.cbSize); - try - { - Marshal.StructureToPtr(createArgs, pArgs, false); - var createResults = new TestCreateResults - { - cbSize = Marshal.SizeOf(), - }; - var pResults = Marshal.AllocHGlobal(createResults.cbSize); - try - { - var baFactory = new TestBAFactory(); - baFactory.Create(pArgs, pResults); - - createResults = Marshal.PtrToStructure(pResults); - Assert.Equal(baFactory.BA, createResults.pBA); - Assert.Equal(baFactory.BA.Command.Action, command.action); - Assert.Equal(baFactory.BA.Command.Display, command.display); - Assert.Equal(baFactory.BA.Command.CommandLineArgs, new string[] { "this", "is a", "test" }); - } - finally - { - Marshal.FreeHGlobal(pResults); - } - } - finally - { - Marshal.FreeHGlobal(pArgs); - } - } - finally - { - Marshal.FreeHGlobal(pCommand); - } - } - - internal class TestBAFactory : BaseBootstrapperApplicationFactory - { - public TestBA BA { get; private set; } - - protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) - { - this.BA = new TestBA(engine, bootstrapperCommand); - return this.BA; - } - } - - internal class TestBA : BootstrapperApplication - { - public IBootstrapperCommand Command { get; } - - public TestBA(IEngine engine, IBootstrapperCommand command) - : base(engine) - { - this.Command = command; - } - - protected override void Run() - { - } - } - - [StructLayout(LayoutKind.Sequential)] - public struct TestCommand - { - public int cbSize; - public LaunchAction action; - public Display display; - public Restart restart; - [MarshalAs(UnmanagedType.LPWStr)] public string wzCommandLine; - public int nCmdShow; - public ResumeType resume; - public IntPtr hwndSplashScreen; - public RelationType relation; - [MarshalAs(UnmanagedType.Bool)] public bool passthrough; - [MarshalAs(UnmanagedType.LPWStr)] public string wzLayoutDirectory; - } - - [StructLayout(LayoutKind.Sequential)] - public struct BootstrapperCreateArgs - { - [MarshalAs(UnmanagedType.I4)] public readonly int cbSize; - [MarshalAs(UnmanagedType.I8)] public readonly long qwEngineAPIVersion; - public readonly IntPtr pfnBootstrapperEngineProc; - public readonly IntPtr pvBootstrapperEngineProcContext; - public readonly IntPtr pCommand; - - public BootstrapperCreateArgs(long version, IntPtr pEngineProc, IntPtr pEngineContext, IntPtr pCommand) - { - this.cbSize = Marshal.SizeOf(typeof(BootstrapperCreateArgs)); - this.qwEngineAPIVersion = version; - this.pfnBootstrapperEngineProc = pEngineProc; - this.pvBootstrapperEngineProcContext = pEngineContext; - this.pCommand = pCommand; - } - } - - [StructLayout(LayoutKind.Sequential)] - public struct TestCreateResults - { - public int cbSize; - public IntPtr pBAProc; - [MarshalAs(UnmanagedType.Interface)] public IBootstrapperApplication pBA; - } - } -} diff --git a/src/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs b/src/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs deleted file mode 100644 index 44142e3d..00000000 --- a/src/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs +++ /dev/null @@ -1,93 +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 WixToolsetTest.Mba.Core -{ - using System; - using WixToolset.Mba.Core; - using Xunit; - - public class VerUtilFixture - { - [Fact] - public void CanCompareStringVersions() - { - var version1 = "1.2.3.4+abcd"; - var version2 = "1.2.3.4+zyxw"; - - Assert.Equal(0, VerUtil.CompareStringVersions(version1, version2, strict: false)); - } - - [Fact] - public void CanCopyVersion() - { - var version = "1.2.3.4-5.6.7.8.9.0"; - - VerUtilVersion copiedVersion = null; - try - { - using (var parsedVersion = VerUtil.ParseVersion(version, strict: true)) - { - copiedVersion = VerUtil.CopyVersion(parsedVersion); - } - - using (var secondVersion = VerUtil.ParseVersion(version, strict: true)) - { - Assert.Equal(0, VerUtil.CompareParsedVersions(copiedVersion, secondVersion)); - } - } - finally - { - copiedVersion?.Dispose(); - } - } - - [Fact] - public void CanCreateFromQword() - { - var version = new Version(100, 200, 300, 400); - var qwVersion = Engine.VersionToLong(version); - - using var parsedVersion = VerUtil.VersionFromQword(qwVersion); - Assert.Equal("100.200.300.400", parsedVersion.Version); - Assert.Equal(100u, parsedVersion.Major); - Assert.Equal(200u, parsedVersion.Minor); - Assert.Equal(300u, parsedVersion.Patch); - Assert.Equal(400u, parsedVersion.Revision); - Assert.Empty(parsedVersion.ReleaseLabels); - Assert.Equal("", parsedVersion.Metadata); - Assert.False(parsedVersion.IsInvalid); - } - - [Fact] - public void CanParseVersion() - { - var version = "1.2.3.4-a.b.c.d.5.+abc123"; - - using var parsedVersion = VerUtil.ParseVersion(version, strict: false); - Assert.Equal(version, parsedVersion.Version); - Assert.Equal(1u, parsedVersion.Major); - Assert.Equal(2u, parsedVersion.Minor); - Assert.Equal(3u, parsedVersion.Patch); - Assert.Equal(4u, parsedVersion.Revision); - Assert.Equal(5, parsedVersion.ReleaseLabels.Length); - Assert.Equal("+abc123", parsedVersion.Metadata); - Assert.True(parsedVersion.IsInvalid); - - Assert.Equal("a", parsedVersion.ReleaseLabels[0].Label); - Assert.False(parsedVersion.ReleaseLabels[0].IsNumeric); - - Assert.Equal("b", parsedVersion.ReleaseLabels[1].Label); - Assert.False(parsedVersion.ReleaseLabels[1].IsNumeric); - - Assert.Equal("c", parsedVersion.ReleaseLabels[2].Label); - Assert.False(parsedVersion.ReleaseLabels[2].IsNumeric); - - Assert.Equal("d", parsedVersion.ReleaseLabels[3].Label); - Assert.False(parsedVersion.ReleaseLabels[3].IsNumeric); - - Assert.Equal("5", parsedVersion.ReleaseLabels[4].Label); - Assert.True(parsedVersion.ReleaseLabels[4].IsNumeric); - Assert.Equal(5u, parsedVersion.ReleaseLabels[4].Value); - } - } -} diff --git a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj deleted file mode 100644 index 53d82f7e..00000000 --- a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - netcoreapp3.1 - false - win-x86 - false - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.v3.ncrunchproject b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.v3.ncrunchproject deleted file mode 100644 index 7b5b2139..00000000 --- a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - True - - \ No newline at end of file -- cgit v1.2.3-55-g6feb