Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added WinGetUtil E2E tests #2542

Merged
merged 7 commits into from
Sep 29, 2022
Merged

Added WinGetUtil E2E tests #2542

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c8977fb
Init WinGetUtil tests
AmelBawa-msft Sep 22, 2022
6618a64
Split wigetutil tests into files
AmelBawa-msft Sep 22, 2022
5fc631f
Added -i option in IndexCreationTool
AmelBawa-msft Sep 23, 2022
3d9c592
Use consistent prefix for new tests
AmelBawa-msft Sep 23, 2022
bb0b476
Addressed comments
AmelBawa-msft Sep 27, 2022
3853034
Addressed comments
AmelBawa-msft Sep 28, 2022
5c94c60
Addressed comments
AmelBawa-msft Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/AppInstallerCLIE2ETests/WinGetUtil/WinGetUtilCompareVersions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

namespace AppInstallerCLIE2ETests.WinGetUtil
{
using System;
using NUnit.Framework;

public class WinGetUtilCompareVersions
Expand All @@ -27,9 +26,7 @@ public class WinGetUtilCompareVersions
public void WinGetUtil_CompareVersions(string version1, string version2, int expectedResult)
{
// Compare versions
IntPtr hresult = WinGetUtilWrapper.WinGetCompareVersions(version1, version2, out int result);

Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetCompareVersions(version1, version2, out int result);
Assert.AreEqual(expectedResult, result);
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/AppInstallerCLIE2ETests/WinGetUtil/WinGetUtilDownload.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

namespace AppInstallerCLIE2ETests.WinGetUtil
{
using System;
using System.IO;
using System.Linq;
using NUnit.Framework;
Expand All @@ -19,9 +18,8 @@ public void WinGetUtil_Download()
string filePath = TestCommon.GetRandomTestFile(".exe");

// Download
IntPtr hresult = WinGetUtilWrapper.WinGetDownload(installerUrl, filePath, sha256Hash, hashSize);
WinGetUtilWrapper.WinGetDownload(installerUrl, filePath, sha256Hash, hashSize);

Assert.AreEqual(IntPtr.Zero, hresult);
Assert.True(File.Exists(filePath));
Assert.False(sha256Hash.All(byteVal => byteVal == 0));
}
Expand Down
10 changes: 2 additions & 8 deletions src/AppInstallerCLIE2ETests/WinGetUtil/WinGetUtilLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

namespace AppInstallerCLIE2ETests.WinGetUtil
{
using System;
using System.IO;
using NUnit.Framework;

Expand All @@ -12,19 +11,14 @@ public class WinGetUtilLog
[Test]
public void WinGetUtil_Logging()
{
IntPtr hresult;
string filePath = TestCommon.GetRandomTestFile(".log");

// Init logging
hresult = WinGetUtilWrapper.WinGetLoggingInit(filePath);

Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetLoggingInit(filePath);
Assert.True(File.Exists(filePath));

// Terminate logging
hresult = WinGetUtilWrapper.WinGetLoggingTerm(filePath);

Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetLoggingTerm(filePath);
}
}
}
35 changes: 23 additions & 12 deletions src/AppInstallerCLIE2ETests/WinGetUtil/WinGetUtilManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,57 +14,68 @@ public class WinGetUtilManifest
[SetUp]
public void SetUp()
{
this.indexHandle = IntPtr.Zero;
var sqliteFile = TestCommon.GetRandomTestFile(".db");
uint majorVersion = 1;
uint minorVersion = 2;
WinGetUtilWrapper.WinGetSQLiteIndexCreate(sqliteFile, majorVersion, minorVersion, out this.indexHandle); ;
}

[TearDown]
AmelBawa-msft marked this conversation as resolved.
Show resolved Hide resolved
public void TearDown()
[Test]
public void WinGetUtil_ValidateManifest_Fail_SchemaAndSemanticValidation()
{
WinGetUtilWrapper.WinGetSQLiteIndexClose(this.indexHandle);
string manifestsDir = TestCommon.GetTestDataFile(@"WinGetUtil\Manifests\Unmerged\ValidateManifest");
AmelBawa-msft marked this conversation as resolved.
Show resolved Hide resolved
string mergedManifestPath = TestCommon.GetRandomTestFile(".yaml");

// Create manifest
WinGetUtilWrapper.WinGetCreateManifest(
manifestsDir,
out bool succeeded,
out IntPtr manifestHandle,
out string createFailureMessage,
mergedManifestPath,
WinGetUtilWrapper.CreateManifestOption.SchemaAndSemanticValidation);

Assert.False(succeeded);
Assert.AreEqual(IntPtr.Zero, manifestHandle);
Assert.IsNotEmpty(createFailureMessage);
Assert.True(File.Exists(mergedManifestPath));
}

AmelBawa-msft marked this conversation as resolved.
Show resolved Hide resolved
[Test]
public void WinGetUtil_ValidateManifest()
public void WinGetUtil_ValidateManifest_Success_NoValidation()
{
string manifestsDir = TestCommon.GetTestDataFile(@"WinGetUtil\Manifests\Unmerged\ValidateManifest");
string mergedManifestPath = TestCommon.GetRandomTestFile(".yaml");
IntPtr hresult;

// Create manifest
hresult = WinGetUtilWrapper.WinGetCreateManifest(
WinGetUtilWrapper.WinGetCreateManifest(
manifestsDir,
out bool succeeded,
out IntPtr manifestHandle,
out string createFailureMessage,
mergedManifestPath,
WinGetUtilWrapper.CreateManifestOption.NoValidation);

Assert.AreEqual(IntPtr.Zero, hresult);
Assert.True(succeeded);
Assert.AreNotEqual(IntPtr.Zero, manifestHandle);
Assert.IsNull(createFailureMessage);
Assert.True(File.Exists(mergedManifestPath));

// Validate manifest
hresult = WinGetUtilWrapper.WinGetValidateManifestV3(
WinGetUtilWrapper.WinGetValidateManifestV3(
manifestHandle,
indexHandle,
out WinGetUtilWrapper.ValidateManifestResultCode resultCode,
out string validateFailureMessage,
WinGetUtilWrapper.ValidateManifestOptionV2.ArpVersionValidation,
WinGetUtilWrapper.ValidateManifestOperationType.Add);

Assert.AreEqual(IntPtr.Zero, hresult);
Assert.AreEqual(WinGetUtilWrapper.ValidateManifestResultCode.Success, resultCode);
Assert.IsEmpty(validateFailureMessage);

// Close manifest
hresult = WinGetUtilWrapper.WinGetCloseManifest(manifestHandle);

Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetCloseManifest(manifestHandle);
}
}
}
31 changes: 9 additions & 22 deletions src/AppInstallerCLIE2ETests/WinGetUtil/WinGetUtilSQLiteIndex.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ public void WinGetUtil_SQLiteIndex_AddManifest()
SQLiteIndex((indexHandle) =>
{
// Add manifest
IntPtr hresult = WinGetUtilWrapper.WinGetSQLiteIndexAddManifest(indexHandle, addManifestsFile_1, relativePath_1);
Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetSQLiteIndexAddManifest(indexHandle, addManifestsFile_1, relativePath_1);
});
}

Expand All @@ -45,8 +44,7 @@ public void WinGetUtil_SQLiteIndex_UpdateManifest_Success()
WinGetUtilWrapper.WinGetSQLiteIndexAddManifest(indexHandle, addManifestsFile_1, relativePath_1);

// Update manifest
IntPtr hresult = WinGetUtilWrapper.WinGetSQLiteIndexUpdateManifest(indexHandle, updateManifestsFile_1, relativePath_1, out bool indexModified);
Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetSQLiteIndexUpdateManifest(indexHandle, updateManifestsFile_1, relativePath_1, out bool indexModified);
Assert.True(indexModified);
});
}
Expand All @@ -73,8 +71,7 @@ public void WinGetUtil_SQLiteIndex_RemoveManifest_Success()
WinGetUtilWrapper.WinGetSQLiteIndexAddManifest(indexHandle, addManifestsFile_1, relativePath_1);

// Remove manifest
IntPtr hresult = WinGetUtilWrapper.WinGetSQLiteIndexRemoveManifest(indexHandle, addManifestsFile_1, relativePath_1);
Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetSQLiteIndexRemoveManifest(indexHandle, addManifestsFile_1, relativePath_1);
});
}

Expand All @@ -97,15 +94,13 @@ public void WinGetUtil_SQLiteIndex_OpenClose()
SQLiteIndex((_) =>
{
// Open
IntPtr hresult = WinGetUtilWrapper.WinGetSQLiteIndexOpen(sqlitePath, out IntPtr indexHandle);
Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetSQLiteIndexOpen(sqlitePath, out IntPtr indexHandle);

// Add manifest
WinGetUtilWrapper.WinGetSQLiteIndexAddManifest(indexHandle, addManifestsFile_1, relativePath_1);

// Close
hresult = WinGetUtilWrapper.WinGetSQLiteIndexClose(indexHandle);
Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetSQLiteIndexClose(indexHandle);
});
}

Expand All @@ -118,12 +113,10 @@ public void WinGetUtil_SQLiteIndex_CheckConsistency()
WinGetUtilWrapper.WinGetSQLiteIndexAddManifest(indexHandle, addManifestsFile_1, relativePath_1);

// Prepare for packaging
IntPtr hresult = WinGetUtilWrapper.WinGetSQLiteIndexPrepareForPackaging(indexHandle);
Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetSQLiteIndexPrepareForPackaging(indexHandle);

// Check consistency
hresult = WinGetUtilWrapper.WinGetSQLiteIndexCheckConsistency(indexHandle, out bool succeeded);
Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetSQLiteIndexCheckConsistency(indexHandle, out bool succeeded);
Assert.True(succeeded);
});
}
Expand All @@ -134,22 +127,16 @@ public void WinGetUtil_SQLiteIndex_CheckConsistency()
/// <param name="Execute">Function to execute.</param>
private void SQLiteIndex(Action<IntPtr> Execute)
{
IntPtr hresult;

// Create
hresult = WinGetUtilWrapper.WinGetSQLiteIndexCreate(sqlitePath, majorVersion, minorVersion, out IntPtr indexHandle);

Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetSQLiteIndexCreate(sqlitePath, majorVersion, minorVersion, out IntPtr indexHandle);
Assert.True(File.Exists(sqlitePath));
Assert.AreNotEqual(IntPtr.Zero, indexHandle);

// Execute provided function
Execute(indexHandle);

// Close
hresult = WinGetUtilWrapper.WinGetSQLiteIndexClose(indexHandle);

Assert.AreEqual(IntPtr.Zero, hresult);
WinGetUtilWrapper.WinGetSQLiteIndexClose(indexHandle);
}
}
}
44 changes: 29 additions & 15 deletions src/AppInstallerCLIE2ETests/WinGetUtil/WinGetUtilWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,24 @@ internal class WinGetUtilWrapper
public enum CreateManifestOption
AmelBawa-msft marked this conversation as resolved.
Show resolved Hide resolved
{
NoValidation = 0,
SchemaValidation = 0x1,
SchemaAndSemanticValidation = 0x2,
ReturnErrorOnVerifiedPublisherFields = 0x1000,
}

[Flags]
public enum ValidateManifestResultCode
{
Success = 0,
DependenciesValidationFailure = 0x1,
ArpVersionValidationFailure = 0x2,
InstallerValidationFailure = 0x4,
SingleManifestPackageHasDependencies = 0x10000,
MultiManifestPackageHasDependencies = 0x20000,
MissingManifestDependenciesNode = 0x40000,
NoSuitableMinVersionDependency = 0x80000,
FoundDependencyLoop = 0x100000,
InternalError = 0x1000,
}

[Flags]
Expand All @@ -38,22 +50,24 @@ public enum ValidateManifestOptionV2
public enum ValidateManifestOperationType
{
Add = 0,
Update = 1,
Delete = 2,
}

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetCompareVersions(string version1, string version2, [MarshalAs(UnmanagedType.U4)] out int comparisonResult);
public static extern void WinGetCompareVersions(string version1, string version2, [MarshalAs(UnmanagedType.U4)] out int comparisonResult);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetDownload(string url, string filePath, [MarshalAs(UnmanagedType.LPArray)] byte[] sha26Hash, uint sha256HashLength);
public static extern void WinGetDownload(string url, string filePath, [MarshalAs(UnmanagedType.LPArray)] byte[] sha26Hash, uint sha256HashLength);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetLoggingInit(string logPath);
public static extern void WinGetLoggingInit(string logPath);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetLoggingTerm(string logPath);
public static extern void WinGetLoggingTerm(string logPath);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetCreateManifest(
public static extern void WinGetCreateManifest(
string inputPath,
[MarshalAs(UnmanagedType.U1)] out bool succeeded,
out IntPtr manifestHandle,
Expand All @@ -62,10 +76,10 @@ public static extern IntPtr WinGetCreateManifest(
CreateManifestOption option);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetCloseManifest(IntPtr manifest);
public static extern void WinGetCloseManifest(IntPtr manifest);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetValidateManifestV3(
public static extern void WinGetValidateManifestV3(
IntPtr manifestHandle,
IntPtr indexHandle,
out ValidateManifestResultCode result,
Expand All @@ -74,31 +88,31 @@ public static extern IntPtr WinGetValidateManifestV3(
ValidateManifestOperationType operationType);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetSQLiteIndexCreate(string filePath, uint majorVersion, uint minorVersion, out IntPtr index);
public static extern void WinGetSQLiteIndexCreate(string filePath, uint majorVersion, uint minorVersion, out IntPtr index);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetSQLiteIndexOpen(string filePath, out IntPtr index);
public static extern void WinGetSQLiteIndexOpen(string filePath, out IntPtr index);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetSQLiteIndexClose(IntPtr index);
public static extern void WinGetSQLiteIndexClose(IntPtr index);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetSQLiteIndexAddManifest(IntPtr index, string manifestPath, string relativePath);
public static extern void WinGetSQLiteIndexAddManifest(IntPtr index, string manifestPath, string relativePath);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetSQLiteIndexUpdateManifest(
public static extern void WinGetSQLiteIndexUpdateManifest(
IntPtr index,
string manifestPath,
string relativePath,
[MarshalAs(UnmanagedType.U1)] out bool indexModified);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetSQLiteIndexRemoveManifest(IntPtr index, string manifestPath, string relativePath);
public static extern void WinGetSQLiteIndexRemoveManifest(IntPtr index, string manifestPath, string relativePath);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetSQLiteIndexPrepareForPackaging(IntPtr index);
public static extern void WinGetSQLiteIndexPrepareForPackaging(IntPtr index);

[DllImport(DllName, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, PreserveSig = false)]
public static extern IntPtr WinGetSQLiteIndexCheckConsistency(IntPtr index, [MarshalAs(UnmanagedType.U1)] out bool succeeded);
public static extern void WinGetSQLiteIndexCheckConsistency(IntPtr index, [MarshalAs(UnmanagedType.U1)] out bool succeeded);
}
}
2 changes: 1 addition & 1 deletion src/IndexCreationTool/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ static void Main(string[] args)
string certPath = string.Empty;

// List of directories to include. By default, include all directories.
List<string> includeDirList = new() { "" };
List<string> includeDirList = new() { string.Empty };

for (int i = 0; i < args.Length; i++)
{
Expand Down