From d086778902c1bac6a4f8ba48be250a7ddfd9aa6f Mon Sep 17 00:00:00 2001 From: David Hall Date: Tue, 17 Sep 2019 10:36:00 -0600 Subject: [PATCH] Consolidated test file reference to TestCaseSources --- UnitTests/CSharpRunner/TestCaseSources.cs | 41 ++++++++++++++++----- UnitTests/PInvoke/Kernel32/FileApiTests.cs | 8 ++--- UnitTests/PInvoke/Kernel32/Kernel32Tests.cs | 2 +- UnitTests/PInvoke/Kernel32/LibLoaderApiTests.cs | 2 +- UnitTests/PInvoke/Kernel32/PathCchTests.cs | 42 +++++++++++----------- UnitTests/PInvoke/Kernel32/ProcessEnvTests.cs | 4 +-- .../PInvoke/Kernel32/ThreadPoolApiSetTests.cs | 2 +- UnitTests/PInvoke/Kernel32/WinBase.FileTests.cs | 24 ++++++------- .../PInvoke/Kernel32/WinBase.ResourceTests.cs | 2 +- UnitTests/PInvoke/NTDSApi/NTDSApi.csproj | 7 +++- UnitTests/PInvoke/NTDSApi/NTDSApiTests.cs | 29 +++------------ UnitTests/PInvoke/Ole/Ole.csproj | 7 +++- UnitTests/PInvoke/Ole/Ole32/PROPVARIANTTests.cs | 4 +-- UnitTests/PInvoke/Security/AdvApi32/AclApiTests.cs | 4 +-- .../PInvoke/Security/AdvApi32/AdvApi32Tests.cs | 25 +------------ .../PInvoke/Security/AdvApi32/EvnTraceTests.cs | 2 +- UnitTests/PInvoke/Security/AdvApi32/SddlTests.cs | 2 +- .../Security/AdvApi32/SecurityBaseApiTests.cs | 2 +- .../PInvoke/Security/AdvApi32/WinBaseTests.cs | 10 +++--- .../Security/AdvApi32/WinBase_EventLogTests.cs | 2 +- UnitTests/PInvoke/Security/AdvApi32/WinEfsTests.cs | 2 +- UnitTests/PInvoke/Security/Authz/AuthzTests.cs | 4 +-- UnitTests/PInvoke/Security/Secur32/SspiTests.cs | 2 +- UnitTests/PInvoke/Shell32/IconTests.cs | 4 +-- UnitTests/PInvoke/Shell32/Shell32.csproj | 7 +++- UnitTests/PInvoke/User32/User32.csproj | 7 +++- UnitTests/PInvoke/User32/User32Tests.cs | 2 +- UnitTests/System/System.csproj | 7 +++- UnitTests/System/VirtualDiskTests.cs | 8 ++--- .../Dialogs/AccessControlEditorTests.cs | 4 +-- .../Windows.Forms/Extensions/ImageListTests.cs | 12 +++---- UnitTests/Windows.Forms/Windows.Forms.csproj | 7 +++- UnitTests/Windows.Shell/ShellAssocTests.cs | 6 ++-- UnitTests/Windows.Shell/ShellItemTests.cs | 8 ++--- UnitTests/Windows.Shell/Windows.Shell.csproj | 6 +++- 35 files changed, 160 insertions(+), 147 deletions(-) diff --git a/UnitTests/CSharpRunner/TestCaseSources.cs b/UnitTests/CSharpRunner/TestCaseSources.cs index d0b255cd..0d46aa0f 100644 --- a/UnitTests/CSharpRunner/TestCaseSources.cs +++ b/UnitTests/CSharpRunner/TestCaseSources.cs @@ -10,6 +10,38 @@ namespace Vanara.PInvoke.Tests { public static class TestCaseSources { + public const string BmpFile = @"C:\Temp\Vanara.bmp"; + + public const string EventFile = @"C:\Temp\TestLogFile.etl"; + + public const string IcoFile = @"C:\Temp\Vanara.ico"; + + public const string ImageFile = @"C:\Temp\Vanara.png"; + + public const string Image2File = @"C:\Temp\X.png"; + + public const string LargeFile = @"C:\Temp\Holes.mp4"; + + public const string LogFile = @"C:\Temp\Test.log"; + + public const string ResourceFile = @"C:\Temp\DummyResourceExe.exe"; + + public const string SmallFile = IcoFile; + + public const string TempChildDir = @"C:\Temp\Temp"; + + public const string TempChildDirWhack = TempChildDir + "\\"; + + public const string TempDir = @"C:\Temp"; + + public const string TempDirWhack = TempDir + "\\"; + + public const string VirtualDisk = @"D:\VirtualBox VMs\Windows Client\Windows XP Pro\Windows XP Pro.vhd"; + + public const string WordDoc = @"C:\Temp\Test.docx"; + + public const string WordDocLink = @"C:\Temp\Test.lnk"; + // Header: ValidUser ValidCred URN DN DC Domain Username Password Notes private const string authfn = @"C:\Temp\AuthTestCases.txt"; @@ -37,15 +69,6 @@ namespace Vanara.PInvoke.Tests return ret; } } - - public static string LargeFile => @"C:\Temp\Holes.mp4"; - public static string LogFile => @"C:\Temp\TestLogFile.etl"; - public static string ResourceFile => @"C:\Temp\DummyResourceExe.exe"; - public static string SmallFile => @"C:\Temp\Help.ico"; - public static string TempChildDir => @"C:\Temp\Temp"; - public static string TempDir => @"C:\Temp"; - public static string WordDoc => @"C:\Temp\Test.docx"; - public static object[] GetAuthCasesFromFile(bool validUser, bool validCred) => AuthCasesFromFile.Where(objs => ((object[])objs)[0].Equals(validUser) && ((object[])objs)[1].Equals(validCred)).ToArray(); public static IEnumerable RemoteConnections(bool? named) diff --git a/UnitTests/PInvoke/Kernel32/FileApiTests.cs b/UnitTests/PInvoke/Kernel32/FileApiTests.cs index 8003e187..1cd811ee 100644 --- a/UnitTests/PInvoke/Kernel32/FileApiTests.cs +++ b/UnitTests/PInvoke/Kernel32/FileApiTests.cs @@ -56,7 +56,7 @@ namespace Vanara.PInvoke.Tests [Test] public void CreateDirectoryTest() { - const string dir = @"C:\Temp\Temp"; + const string dir = TestCaseSources.TempChildDir; Assert.That(CreateDirectory(dir), Is.True); Assert.That(System.IO.Directory.Exists(dir), Is.True); Assert.That(RemoveDirectory(dir), Is.True); @@ -113,7 +113,7 @@ namespace Vanara.PInvoke.Tests public void DefineDosDeviceTest() { const string src = "M:"; - const string target = @"C:\Temp"; + const string target = TestCaseSources.TempDir; var c = QueryDosDevice(src).ToArray().Length; Assert.That(DefineDosDevice(DDD.DDD_NO_BROADCAST_SYSTEM, src, target), Is.True); @@ -159,7 +159,7 @@ namespace Vanara.PInvoke.Tests var thread = new Thread(FileMaker); try { - using (var h = FindFirstChangeNotification(@"C:\Temp", false, FILE_NOTIFY_CHANGE.FILE_NOTIFY_CHANGE_FILE_NAME)) + using (var h = FindFirstChangeNotification(TestCaseSources.TempDir, false, FILE_NOTIFY_CHANGE.FILE_NOTIFY_CHANGE_FILE_NAME)) { Assert.That(h.IsInvalid, Is.False); thread.Start(); @@ -176,7 +176,7 @@ namespace Vanara.PInvoke.Tests void FileMaker() { - const string fn = @"C:\Temp\_tempFile.txt"; + const string fn = TestCaseSources.TempDir + @"\_tempFile.txt"; while (keepGoing) { Thread.Sleep(200); diff --git a/UnitTests/PInvoke/Kernel32/Kernel32Tests.cs b/UnitTests/PInvoke/Kernel32/Kernel32Tests.cs index c836a95a..6d15073e 100644 --- a/UnitTests/PInvoke/Kernel32/Kernel32Tests.cs +++ b/UnitTests/PInvoke/Kernel32/Kernel32Tests.cs @@ -11,7 +11,7 @@ namespace Vanara.PInvoke.Tests [TestFixture] public class Kernel32Tests { - internal const string fn = @"C:\Temp\help.ico"; + internal const string fn = TestCaseSources.SmallFile; internal const string tmpstr = @"Temporary"; public static string CreateTempFile(bool markAsTemp = true) diff --git a/UnitTests/PInvoke/Kernel32/LibLoaderApiTests.cs b/UnitTests/PInvoke/Kernel32/LibLoaderApiTests.cs index 8afad305..9446df08 100644 --- a/UnitTests/PInvoke/Kernel32/LibLoaderApiTests.cs +++ b/UnitTests/PInvoke/Kernel32/LibLoaderApiTests.cs @@ -20,7 +20,7 @@ namespace Vanara.PInvoke.Tests [Test] public void AddRemoveDllDirectoryTest() { - var ptr = AddDllDirectory(@"C:\Temp"); + var ptr = AddDllDirectory(TestCaseSources.TempDir); Assert.That(ptr, Is.Not.EqualTo(IntPtr.Zero)); Assert.That(RemoveDllDirectory(ptr), Is.True); } diff --git a/UnitTests/PInvoke/Kernel32/PathCchTests.cs b/UnitTests/PInvoke/Kernel32/PathCchTests.cs index 5ea89a0a..b032c182 100644 --- a/UnitTests/PInvoke/Kernel32/PathCchTests.cs +++ b/UnitTests/PInvoke/Kernel32/PathCchTests.cs @@ -45,41 +45,41 @@ namespace Vanara.PInvoke.Tests [Test] public void PathCchAddBackslashTest() { - var sb = new StringBuilder(@"C:\Temp\", 100); + var sb = new StringBuilder(TestCaseSources.TempDirWhack, 100); Assert.That(PathCchAddBackslash(sb, sb.Capacity), Is.EqualTo((HRESULT)HRESULT.S_FALSE)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp\")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDirWhack)); - sb = new StringBuilder(@"C:\Temp", 100); + sb = new StringBuilder(TestCaseSources.TempDir, 100); Assert.That(PathCchAddBackslash(sb, sb.Capacity), Is.EqualTo((HRESULT)0)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp\")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDirWhack)); } [Test] public void PathCchAddBackslashExTest() { - var sb = new StringBuilder(@"C:\Temp\", 64); + var sb = new StringBuilder(TestCaseSources.TempDirWhack, 64); Assert.That(PathCchAddBackslashEx(sb, sb.Capacity, out var end, out var rem), Is.EqualTo((HRESULT)HRESULT.S_FALSE)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp\")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDirWhack)); Assert.That(end, Is.Not.EqualTo(IntPtr.Zero)); Assert.That(rem, Is.LessThan(60)); - sb = new StringBuilder(@"C:\Temp", 64); + sb = new StringBuilder(TestCaseSources.TempDir, 64); Assert.That(PathCchAddBackslashEx(sb, sb.Capacity, out end, out rem), Is.EqualTo((HRESULT)0)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp\")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDirWhack)); Assert.That(rem, Is.LessThan(60)); } [Test] public void PathCchAddBackslashExTest2() { - var sb = new SafeCoTaskMemString(@"C:\Temp\", 64); + var sb = new SafeCoTaskMemString(TestCaseSources.TempDirWhack, 64); Assert.That(PathCchAddBackslashEx((IntPtr)sb, sb.Capacity, out var end, out var rem), Is.EqualTo((HRESULT)HRESULT.S_FALSE)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp\")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDirWhack)); Assert.That(end, Is.EqualTo(sb.DangerousGetHandle().Offset(sb.Length * 2))); - sb = new SafeCoTaskMemString(@"C:\Temp", 64); + sb = new SafeCoTaskMemString(TestCaseSources.TempDir, 64); Assert.That(PathCchAddBackslashEx((IntPtr)sb, sb.Size, out end, out rem), Is.EqualTo((HRESULT)0)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp\")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDirWhack)); Assert.That(end, Is.EqualTo(sb.DangerousGetHandle().Offset(sb.Length * 2))); } @@ -156,26 +156,26 @@ namespace Vanara.PInvoke.Tests [Test] public void PathCchRemoveBackslashTest() { - var sb = new StringBuilder(@"C:\Temp\", 64); + var sb = new StringBuilder(TestCaseSources.TempDirWhack, 64); Assert.That(PathCchRemoveBackslash(sb, sb.Capacity), Is.EqualTo((HRESULT)0)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDir)); - sb = new StringBuilder(@"C:\Temp", 64); + sb = new StringBuilder(TestCaseSources.TempDir, 64); Assert.That(PathCchRemoveBackslash(sb, sb.Capacity), Is.EqualTo((HRESULT)HRESULT.S_FALSE)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDir)); } [Test] public void PathCchRemoveBackslashExTest() { - var sb = new SafeCoTaskMemString(@"C:\Temp\", 64); + var sb = new SafeCoTaskMemString(TestCaseSources.TempDirWhack, 64); Assert.That(PathCchRemoveBackslashEx((IntPtr)sb, sb.Capacity, out var end, out var rem), Is.EqualTo((HRESULT)0)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDir)); Assert.That(end, Is.EqualTo(sb.DangerousGetHandle().Offset(14))); - sb = new SafeCoTaskMemString(@"C:\Temp", 64); + sb = new SafeCoTaskMemString(TestCaseSources.TempDir, 64); Assert.That(PathCchRemoveBackslashEx((IntPtr)sb, sb.Capacity, out end, out rem), Is.EqualTo((HRESULT)HRESULT.S_FALSE)); - Assert.That(sb.ToString(), Is.EqualTo(@"C:\Temp")); + Assert.That(sb.ToString(), Is.EqualTo(TestCaseSources.TempDir)); Assert.That(end, Is.EqualTo(sb.DangerousGetHandle().Offset(14))); } @@ -214,7 +214,7 @@ namespace Vanara.PInvoke.Tests [Test] public void PathCchSkipRootTest() { - var sb = new SafeCoTaskMemString(@"C:\Temp\", 64); + var sb = new SafeCoTaskMemString(TestCaseSources.TempDirWhack, 64); Assert.That(PathCchSkipRoot((IntPtr)sb, out var end), Is.EqualTo((HRESULT)0)); Assert.That(end, Is.EqualTo(sb.DangerousGetHandle().Offset(6))); } diff --git a/UnitTests/PInvoke/Kernel32/ProcessEnvTests.cs b/UnitTests/PInvoke/Kernel32/ProcessEnvTests.cs index 4ae1d0ae..1a0ea7a2 100644 --- a/UnitTests/PInvoke/Kernel32/ProcessEnvTests.cs +++ b/UnitTests/PInvoke/Kernel32/ProcessEnvTests.cs @@ -40,11 +40,11 @@ namespace Vanara.PInvoke.Tests Assert.That(sb.ToString().StartsWith("C:")); TestContext.WriteLine(sb); - Assert.That(SetCurrentDirectory(@"C:\Temp"), Is.True); + Assert.That(SetCurrentDirectory(TestCaseSources.TempDir), Is.True); var sb2 = new StringBuilder(MAX_PATH); Assert.That(GetCurrentDirectory((uint)sb2.Capacity, sb2), Is.GreaterThan(0)); - Assert.That(sb2.ToString(), Is.EqualTo(@"C:\Temp")); + Assert.That(sb2.ToString(), Is.EqualTo(TestCaseSources.TempDir)); Assert.That(SetCurrentDirectory(sb.ToString())); } diff --git a/UnitTests/PInvoke/Kernel32/ThreadPoolApiSetTests.cs b/UnitTests/PInvoke/Kernel32/ThreadPoolApiSetTests.cs index b4da02ce..bd1252b6 100644 --- a/UnitTests/PInvoke/Kernel32/ThreadPoolApiSetTests.cs +++ b/UnitTests/PInvoke/Kernel32/ThreadPoolApiSetTests.cs @@ -65,7 +65,7 @@ namespace Vanara.PInvoke.Tests Assert.That(SetThreadpoolTimerEx(timer, FileDueTime, 0, 0), Is.False); Assert.That(IsThreadpoolTimerSet(timer), Is.True); - using (var hFile = CreateFile(@"C:\Temp\help.ico", FileAccess.FILE_GENERIC_READ, System.IO.FileShare.Read, null, System.IO.FileMode.Open, FileFlagsAndAttributes.FILE_FLAG_OVERLAPPED)) + using (var hFile = CreateFile(TestCaseSources.SmallFile, FileAccess.FILE_GENERIC_READ, System.IO.FileShare.Read, null, System.IO.FileMode.Open, FileFlagsAndAttributes.FILE_FLAG_OVERLAPPED)) using (var io = CreateThreadpoolIo(hFile, MyIoCallback, default, CallBackEnviron)) { Assert.That(io, ResultIs.ValidHandle); diff --git a/UnitTests/PInvoke/Kernel32/WinBase.FileTests.cs b/UnitTests/PInvoke/Kernel32/WinBase.FileTests.cs index 4504463e..e5592b99 100644 --- a/UnitTests/PInvoke/Kernel32/WinBase.FileTests.cs +++ b/UnitTests/PInvoke/Kernel32/WinBase.FileTests.cs @@ -16,8 +16,8 @@ namespace Vanara.PInvoke.Tests [TestFixture] public partial class WinBaseTests_File { - private const string bigfn = @"C:\Temp\Holes.mp4"; - private const string fn = @"C:\Temp\help.ico"; + private const string bigfn = TestCaseSources.LargeFile; + private const string fn = TestCaseSources.SmallFile; private const string newfn = @"C:\Temp\help2.ico"; [Test] @@ -68,8 +68,8 @@ namespace Vanara.PInvoke.Tests [Test] public void CreateDirectoryExTest() { - Assert.That(CreateDirectoryEx(@"C:\Temp", @"C:\Temp\NewDir"), ResultIs.Successful); - Assert.That(RemoveDirectory(@"C:\Temp\NewDir"), ResultIs.Successful); + Assert.That(CreateDirectoryEx(TestCaseSources.TempDir, TestCaseSources.TempChildDir), ResultIs.Successful); + Assert.That(RemoveDirectory(TestCaseSources.TempChildDir), ResultIs.Successful); } [Test] @@ -105,7 +105,7 @@ namespace Vanara.PInvoke.Tests public void EnumVolumeMountPointsTest() { // Setup a new mount on C: - const string mntDir = @"C:\Temp\Mounted\"; + const string mntDir = TestCaseSources.TempDirWhack + @"Mounted\"; var sb = new StringBuilder(100); Assert.That(GetVolumeNameForVolumeMountPoint(@"C:\", sb, (uint)sb.Capacity), ResultIs.Successful); var cvol = sb.ToString(); @@ -140,7 +140,7 @@ namespace Vanara.PInvoke.Tests public void GetFileInformationByHandleExTest() { using (var tmp = new TempFile(FileAccess.GENERIC_READ, FileShare.Read)) - using (var hDir = CreateFile(@"C:\Temp\", FileAccess.GENERIC_READ, FileShare.Read, null, FileMode.Open, FileFlagsAndAttributes.FILE_FLAG_BACKUP_SEMANTICS)) + using (var hDir = CreateFile(TestCaseSources.TempDirWhack, FileAccess.GENERIC_READ, FileShare.Read, null, FileMode.Open, FileFlagsAndAttributes.FILE_FLAG_BACKUP_SEMANTICS)) { var exes = new List(); TestHelper.RunForEach(typeof(Kernel32), "GetFileInformationByHandleEx", e => new object[] { IsDir(e) ? (HFILE)hDir : (HFILE)tmp.hFile, e }, @@ -167,7 +167,7 @@ namespace Vanara.PInvoke.Tests [Test] public void MoveFileExTest() { - const string newFld = @"C:\Temp\Temp\"; + const string newFld = TestCaseSources.TempChildDir; Assert.That(MoveFileEx(fn, Path.Combine(newFld, Path.GetFileName(fn)), MOVEFILE.MOVEFILE_REPLACE_EXISTING), ResultIs.Successful); Assert.That(MoveFileEx(Path.Combine(newFld, Path.GetFileName(fn)), fn, MOVEFILE.MOVEFILE_REPLACE_EXISTING), ResultIs.Successful); } @@ -175,7 +175,7 @@ namespace Vanara.PInvoke.Tests [Test] public void MoveFileTest() { - const string newFld = @"C:\Temp\Temp\"; + const string newFld = TestCaseSources.TempChildDir; Assert.That(MoveFile(fn, Path.Combine(newFld, Path.GetFileName(fn))), ResultIs.Successful); Assert.That(MoveFile(Path.Combine(newFld, Path.GetFileName(fn)), fn), ResultIs.Successful); } @@ -183,7 +183,7 @@ namespace Vanara.PInvoke.Tests [Test] public void MoveFileWithProgressTest() { - const string newFld = @"C:\Temp\Temp\"; + const string newFld = TestCaseSources.TempChildDir; var qtr = 0; Assert.That(MoveFileWithProgress(bigfn, Path.Combine(newFld, Path.GetFileName(bigfn)), fProgress, default, MOVEFILE.MOVEFILE_REPLACE_EXISTING), ResultIs.Successful); Assert.That(MoveFileWithProgress(Path.Combine(newFld, Path.GetFileName(bigfn)), bigfn, fProgress, default, MOVEFILE.MOVEFILE_REPLACE_EXISTING), ResultIs.Successful); @@ -209,7 +209,7 @@ namespace Vanara.PInvoke.Tests public unsafe void ReadDirectoryChangesExWTest() { var newFile = Path.Combine(Path.GetDirectoryName(fn), "X.ico"); - using (var hDir = CreateFile(@"C:\Temp\", FileAccess.GENERIC_READ, FileShare.Read, null, FileMode.Open, FileFlagsAndAttributes.FILE_FLAG_BACKUP_SEMANTICS)) + using (var hDir = CreateFile(TestCaseSources.TempDirWhack, FileAccess.GENERIC_READ, FileShare.Read, null, FileMode.Open, FileFlagsAndAttributes.FILE_FLAG_BACKUP_SEMANTICS)) using (var mem = new SafeHGlobalHandle(4096)) { new Thread(() => { Sleep(100); DeleteFile(newFile); CopyFile(fn, newFile, false); DeleteFile(newFile); }).Start(); @@ -237,7 +237,7 @@ namespace Vanara.PInvoke.Tests public void ReadDirectoryChangesTest() { var newFile = Path.Combine(Path.GetDirectoryName(fn), "X.ico"); - using (var hDir = CreateFile(@"C:\Temp\", FileAccess.GENERIC_READ, FileShare.Read, null, FileMode.Open, FileFlagsAndAttributes.FILE_FLAG_BACKUP_SEMANTICS)) + using (var hDir = CreateFile(TestCaseSources.TempDirWhack, FileAccess.GENERIC_READ, FileShare.Read, null, FileMode.Open, FileFlagsAndAttributes.FILE_FLAG_BACKUP_SEMANTICS)) using (var mem = new SafeHGlobalHandle(4096)) { new Thread(() => { Sleep(100); DeleteFile(newFile); CopyFile(fn, newFile, false); DeleteFile(newFile); }).Start(); @@ -276,7 +276,7 @@ namespace Vanara.PInvoke.Tests public void ReplaceFileTest() { Assert.That(CopyFile(fn, newfn, false), ResultIs.Successful); - Assert.That(ReplaceFile(newfn, @"C:\Temp\tsnew.ico"), ResultIs.Successful); + Assert.That(ReplaceFile(newfn, TestCaseSources.BmpFile), ResultIs.Successful); Assert.That(DeleteFile(newfn), ResultIs.Successful); } diff --git a/UnitTests/PInvoke/Kernel32/WinBase.ResourceTests.cs b/UnitTests/PInvoke/Kernel32/WinBase.ResourceTests.cs index 841a26b7..3dc95023 100644 --- a/UnitTests/PInvoke/Kernel32/WinBase.ResourceTests.cs +++ b/UnitTests/PInvoke/Kernel32/WinBase.ResourceTests.cs @@ -6,7 +6,7 @@ namespace Vanara.PInvoke.Tests [TestFixture] public partial class WinBaseTests_Resource { - private const string ResExe = @"C:\Temp\DummyResourceExe.exe"; + private const string ResExe = TestCaseSources.ResourceFile; private const int ResId1 = 103; private const int ResId2 = 129; private const int ResType = (int)ResourceType.RT_DIALOG; diff --git a/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj b/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj index a5dcc940..1a4ede67 100644 --- a/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj +++ b/UnitTests/PInvoke/NTDSApi/NTDSApi.csproj @@ -9,9 +9,10 @@ Properties Vanara.PInvoke.Tests UnitTest.PInvoke.NTDSApi - v4.5 + v4.7.2 512 latest + true @@ -62,6 +63,10 @@ {a5e519e9-feba-4fe3-93a5-b8269bef72f4} Vanara.PInvoke.Shared + + {a96cff10-0967-429a-8700-4a86c97c5603} + Shared +