diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 15:05:10 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 15:47:43 -0600 |
commit | 7f128f4639b6a14217780d69a0615b44d36f2f1b (patch) | |
tree | bb124985a687040524cea1f6347737399cfdb948 /src/test | |
parent | 227518090282bba4d973d4efe910623879218a62 (diff) | |
download | wix-7f128f4639b6a14217780d69a0615b44d36f2f1b.tar.gz wix-7f128f4639b6a14217780d69a0615b44d36f2f1b.tar.bz2 wix-7f128f4639b6a14217780d69a0615b44d36f2f1b.zip |
Use SHA512 instead of SHA1.
#3992
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/BurnUnitTest/BurnUnitTest.vcxproj | 1 | ||||
-rw-r--r-- | src/test/BurnUnitTest/CacheTest.cpp | 8 | ||||
-rw-r--r-- | src/test/BurnUnitTest/TestData/CacheTest/CacheSignatureTest.File | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/test/BurnUnitTest/BurnUnitTest.vcxproj index 869ba7a2..2ca7219e 100644 --- a/src/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/test/BurnUnitTest/BurnUnitTest.vcxproj | |||
@@ -69,6 +69,7 @@ | |||
69 | <ResourceCompile Include="BurnUnitTest.rc" /> | 69 | <ResourceCompile Include="BurnUnitTest.rc" /> |
70 | </ItemGroup> | 70 | </ItemGroup> |
71 | <ItemGroup> | 71 | <ItemGroup> |
72 | <None Include="TestData\CacheTest\CacheSignatureTest.File" CopyToOutputDirectory="PreserveNewest" /> | ||
72 | <None Include="TestData\PlanTest\BasicFunctionality_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> | 73 | <None Include="TestData\PlanTest\BasicFunctionality_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> |
73 | <None Include="TestData\PlanTest\MsiTransaction_BundleAv1_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> | 74 | <None Include="TestData\PlanTest\MsiTransaction_BundleAv1_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> |
74 | <None Include="TestData\PlanTest\Slipstream_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> | 75 | <None Include="TestData\PlanTest\Slipstream_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" /> |
diff --git a/src/test/BurnUnitTest/CacheTest.cpp b/src/test/BurnUnitTest/CacheTest.cpp index 6d261842..fc0b4531 100644 --- a/src/test/BurnUnitTest/CacheTest.cpp +++ b/src/test/BurnUnitTest/CacheTest.cpp | |||
@@ -24,7 +24,7 @@ namespace Bootstrapper | |||
24 | { | 24 | { |
25 | } | 25 | } |
26 | 26 | ||
27 | [Fact(Skip = "Currently fails")] | 27 | [Fact] |
28 | void CacheSignatureTest() | 28 | void CacheSignatureTest() |
29 | { | 29 | { |
30 | HRESULT hr = S_OK; | 30 | HRESULT hr = S_OK; |
@@ -36,12 +36,12 @@ namespace Bootstrapper | |||
36 | 36 | ||
37 | try | 37 | try |
38 | { | 38 | { |
39 | pin_ptr<const wchar_t> dataDirectory = PtrToStringChars(this->TestContext->DataDirectory); | 39 | pin_ptr<const wchar_t> dataDirectory = PtrToStringChars(this->TestContext->TestDirectory); |
40 | hr = PathConcat(dataDirectory, L"BurnTestPayloads\\Products\\TestExe\\TestExe.exe", &sczPayloadPath); | 40 | hr = PathConcat(dataDirectory, L"TestData\\CacheTest\\CacheSignatureTest.File", &sczPayloadPath); |
41 | Assert::True(S_OK == hr, "Failed to get path to test file."); | 41 | Assert::True(S_OK == hr, "Failed to get path to test file."); |
42 | Assert::True(FileExistsEx(sczPayloadPath, NULL), "Test file does not exist."); | 42 | Assert::True(FileExistsEx(sczPayloadPath, NULL), "Test file does not exist."); |
43 | 43 | ||
44 | hr = StrAllocHexDecode(L"232BD16B78C1926F95D637731E1EE5379A3C4222", &pb, &cb); | 44 | hr = StrAllocHexDecode(L"25e61cd83485062b70713aebddd3fe4992826cb121466fddc8de3eacb1e42f39d4bdd8455d95eec8c9529ced4c0296ab861931fe2c86df2f2b4e8d259a6d9223", &pb, &cb); |
45 | Assert::Equal(S_OK, hr); | 45 | Assert::Equal(S_OK, hr); |
46 | 46 | ||
47 | package.fPerMachine = FALSE; | 47 | package.fPerMachine = FALSE; |
diff --git a/src/test/BurnUnitTest/TestData/CacheTest/CacheSignatureTest.File b/src/test/BurnUnitTest/TestData/CacheTest/CacheSignatureTest.File new file mode 100644 index 00000000..896ac017 --- /dev/null +++ b/src/test/BurnUnitTest/TestData/CacheTest/CacheSignatureTest.File | |||
@@ -0,0 +1 @@ | |||
This file has a known hash. \ No newline at end of file | |||