Consolidate all of the cryptography tests onto one copy of ByteUtils.

Author: bartonjs

src/Common/tests/Cryptography/AlgorithmImplementations/RSA/TestData.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Text;
+using Test.Cryptography;
 
 namespace System.Security.Cryptography.Rsa.Tests
 {

src/System.Security.Cryptography.Algorithms/tests/ByteUtils.cs renamed to src/Common/tests/Cryptography/ByteUtils.cs

@@ -3,9 +3,7 @@
 
 using System.Globalization;
 
-// Temporarily placing ByteUtils in System.Security.Cryptography so that all of the merged tests
-// see it as within their implicit resolution scope.
-namespace System.Security.Cryptography
+namespace Test.Cryptography
 {
     internal static class ByteUtils
     {
@@ -21,7 +19,7 @@ internal static byte[] AsciiBytes(string s)
             return bytes;
         }
 
-        internal static byte[] HexToByteArray(string hexString)
+        internal static byte[] HexToByteArray(this string hexString)
         {
             byte[] bytes = new byte[hexString.Length / 2];
 

src/System.Security.Cryptography.Algorithms/tests/HashAlgorithmTest.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.IO;
+using Test.Cryptography;
 using Xunit;
 
 namespace System.Security.Cryptography.Hashing.Algorithms.Tests

src/System.Security.Cryptography.Algorithms/tests/HmacTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Test.Cryptography;
 using Xunit;
 
 namespace System.Security.Cryptography.Hashing.Algorithms.Tests
@@ -57,4 +58,4 @@ protected void VerifyHmac(
             Assert.Equal(digestBytes, computedDigest);
         }
     }
-}
+}

src/System.Security.Cryptography.Algorithms/tests/Rfc2202HmacTests.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Test.Cryptography;
+
 namespace System.Security.Cryptography.Hashing.Algorithms.Tests
 {
     public abstract class Rfc2202HmacTests : HmacTests
@@ -34,4 +36,4 @@ protected Rfc2202HmacTests() :
         {
         }
     }
-}
+}

src/System.Security.Cryptography.Algorithms/tests/Rfc4231HmacTests.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Test.Cryptography;
+
 namespace System.Security.Cryptography.Hashing.Algorithms.Tests
 {
     public abstract class Rfc4231HmacTests : HmacTests
@@ -34,4 +36,4 @@ protected Rfc4231HmacTests() :
         {
         }
     }
-}
+}

src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj

@@ -24,7 +24,6 @@
     <Compile Include="AesCipherTests.cs" />
     <Compile Include="AesContractTests.cs" />
     <Compile Include="AesModeTests.cs" />
-    <Compile Include="ByteUtils.cs" />
     <Compile Include="DecryptorReusability.cs" />
     <Compile Include="HashAlgorithmTest.cs" />
     <Compile Include="InvalidUsageTests.cs" />
@@ -43,6 +42,9 @@
     <Compile Include="Sha256Tests.cs" />
     <Compile Include="Sha384Tests.cs" />
     <Compile Include="Sha512Tests.cs" />
+    <Compile Include="$(CommonTestPath)\Cryptography\ByteUtils.cs">
+      <Link>CommonTest\Cryptography\ByteUtils.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />

src/System.Security.Cryptography.Csp/tests/ByteUtils.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Test.Cryptography;
 using Xunit;
 
 namespace System.Security.Cryptography.Rsa.Tests

src/System.Security.Cryptography.Csp/tests/ImportExportCspBlob.cs

@@ -25,14 +25,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ByteUtils.cs" />
     <Compile Include="ImportExportCspBlob.cs" />
     <Compile Include="$(CommonTestPath)\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
     <Compile Include="$(CommonTestPath)\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs" />
     <Compile Include="$(CommonTestPath)\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs" />
     <Compile Include="$(CommonTestPath)\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs" />
     <Compile Include="$(CommonTestPath)\Cryptography\AlgorithmImplementations\RSA\TestData.cs" />
     <Compile Include="$(CommonTestPath)\Streams\PositionValueStream.cs" />
+    <Compile Include="$(CommonTestPath)\Cryptography\ByteUtils.cs">
+      <Link>CommonTest\Cryptography\ByteUtils.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />