sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated tests based on Shell32 syntax changes

pull/180/head
dahall 2020-11-02 07:51:09 -07:00
parent c14d9708b9
commit 6e19a4be23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UnitTests/PInvoke/Shell32/IShellFolderTests.cs
View File

@ -25,7 +25,7 @@ namespace Vanara.PInvoke.Tests
// List all property keys
for (uint i = 0; i < uint.MaxValue; i++)
{
try { TestContext.WriteLine($"{i}) Key={pFolder.Item.MapColumnToSCID(i)}; State={pFolder.Item.GetDefaultColumnState(i)}"); }
try { TestContext.WriteLine($"{i}) Key={(pFolder.Item.MapColumnToSCID(i, out var pk).Succeeded ? pk : default)}; State={(pFolder.Item.GetDefaultColumnState(i, out var st).Succeeded ? st : default)}"); }
catch { break; }
}
}
@ -39,8 +39,8 @@ namespace Vanara.PInvoke.Tests
using var pFolder = ComReleaserFactory.Create(new Printers() as IShellFolder2);
try
{
var defGuid = pFolder.Item.GetDefaultSearchGUID();
var exSrc = pFolder.Item.EnumSearches();
pFolder.Item.GetDefaultSearchGUID(out var defGuid).ThrowIfFailed();
pFolder.Item.EnumSearches(out var exSrc).ThrowIfFailed();
using var pExSrc = ComReleaserFactory.Create(exSrc);
var cenum = new IEnumFromCom<EXTRASEARCH>(exSrc.Next, exSrc.Reset);
//TestContext.WriteLine(kf);

4
UnitTests/PInvoke/Shell32/IconTests.cs
View File

@ -104,9 +104,9 @@ namespace Vanara.PInvoke.Tests
public void SHCreateFileExtractIconWTest()
{
const string icoFile = @"notepad.exe";
Assert.That(SHCreateFileExtractIconW(icoFile, FileFlagsAndAttributes.FILE_ATTRIBUTE_NORMAL, typeof(IExtractIcon).GUID, out var ppv), Is.EqualTo((HRESULT)0));
Assert.That(SHCreateFileExtractIconW(icoFile, FileFlagsAndAttributes.FILE_ATTRIBUTE_NORMAL, typeof(IExtractIconW).GUID, out var ppv), Is.EqualTo((HRESULT)0));
Assert.That(ppv, Is.Not.Null);
((IExtractIcon)ppv).Extract(icoFile, 0, out var lg, out var sm, Macros.MAKELONG(48, 16)).ThrowIfFailed();
((IExtractIconW)ppv).Extract(icoFile, 0, out var lg, out var sm, Macros.MAKELONG(48, 16)).ThrowIfFailed();
Assert.That(sm.IsInvalid, Is.False);
Assert.That(sm.ToIcon().Height, Is.EqualTo(16));
Marshal.FinalReleaseComObject(ppv);

4
UnitTests/Windows.Shell/ShellItemTests.cs
View File

@ -77,8 +77,8 @@ namespace Vanara.Windows.Shell.Tests
ps = i.GetHandler<PropSys.IPropertyStore>();
Assert.That(ps, Is.Not.Null.And.InstanceOf<PropSys.IPropertyStore>());
System.Runtime.InteropServices.Marshal.ReleaseComObject(ps);
var ei = i.GetHandler<IExtractIcon>();
Assert.That(ei, Is.Not.Null.And.InstanceOf<IExtractIcon>());
var ei = i.GetHandler<IExtractIconW>();
Assert.That(ei, Is.Not.Null.And.InstanceOf<IExtractIconW>());
//Assert.That(() => i.GetHandler<IExtractIcon>(), Throws.TypeOf<ArgumentOutOfRangeException>());
}