Make newly enabled file-load tests more robust.

Changed literal \\ path separators to use Path.Combine, and fixed the NotBefore/NotAfter verification to use a DateTime built from UTC, rather than require everyone to set their clocks to Redmond-time.

Author: bartonjs

src/System.Security.Cryptography.X509Certificates/tests/CertTests.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.IO;
-using System.Text;
 using Xunit;
 
 namespace System.Security.Cryptography.X509Certificates.Tests
@@ -16,7 +15,7 @@ public static void X509CertTest()
             const string CertSubject =
                 @"CN=Microsoft Corporate Root Authority, OU=ITG, O=Microsoft, L=Redmond, S=WA, C=US, [email protected]";
 
-            using (X509Certificate cert = new X509Certificate("TestData\\microsoft.cer"))
+            using (X509Certificate cert = new X509Certificate(Path.Combine("TestData", "microsoft.cer")))
             {
                 Assert.Equal(CertSubject, cert.Subject);
                 Assert.Equal(CertSubject, cert.Issuer);
@@ -56,7 +55,10 @@ public static void X509Cert2Test()
             const string CertName =
                 @"[email protected], CN=ABA.ECOM Root CA, O=""ABA.ECOM, INC."", L=Washington, S=DC, C=US";
 
-            using (X509Certificate2 cert2 = new X509Certificate2("TestData\\test.cer"))
+            DateTime notBefore = new DateTime(1999, 7, 12, 17, 33, 53, DateTimeKind.Utc).ToLocalTime();
+            DateTime notAfter = new DateTime(2009, 7, 9, 17, 33, 53, DateTimeKind.Utc).ToLocalTime();
+
+            using (X509Certificate2 cert2 = new X509Certificate2(Path.Combine("TestData", "test.cer")))
             {
                 Assert.Equal(CertName, cert2.IssuerName.Name);
                 Assert.Equal(CertName, cert2.SubjectName.Name);
@@ -67,8 +69,8 @@ public static void X509Cert2Test()
                 Assert.True(pubKey.Key is RSACryptoServiceProvider);
                 Assert.Equal("RSA", pubKey.Oid.FriendlyName);
 
-                Assert.Equal(new DateTime(2009, 7, 9, 10, 33, 53), cert2.NotAfter);
-                Assert.Equal(new DateTime(1999, 7, 12, 10, 33, 53), cert2.NotBefore);
+                Assert.Equal(notAfter, cert2.NotAfter);
+                Assert.Equal(notBefore, cert2.NotBefore);
 
                 Assert.Equal("00D01E4090000046520000000100000004", cert2.SerialNumber);
                 Assert.Equal("1.2.840.113549.1.1.5", cert2.SignatureAlgorithm.Value);
@@ -121,7 +123,7 @@ public static void X509Cert2ToStringVerbose()
         [ActiveIssue(1993, PlatformID.AnyUnix)]
         public static void X509Cert2CreateFromPfxFile()
         {
-            using (X509Certificate2 cert2 = new X509Certificate2("TestData\\DummyTcpServer.pfx"))
+            using (X509Certificate2 cert2 = new X509Certificate2(Path.Combine("TestData", "DummyTcpServer.pfx")))
             {
                 // OID=RSA Encryption
                 Assert.Equal("1.2.840.113549.1.1.1", cert2.GetKeyAlgorithm());
@@ -132,7 +134,7 @@ public static void X509Cert2CreateFromPfxFile()
         [ActiveIssue(1993, PlatformID.AnyUnix)]
         public static void X509Cert2CreateFromPfxWithPassword()
         {
-            using (X509Certificate2 cert2 = new X509Certificate2("TestData\\test.pfx", "test"))
+            using (X509Certificate2 cert2 = new X509Certificate2(Path.Combine("TestData", "test.pfx"), "test"))
             {
                 // OID=RSA Encryption
                 Assert.Equal("1.2.840.113549.1.1.1", cert2.GetKeyAlgorithm());

src/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs

@@ -3,7 +3,7 @@
 
 using System.Linq;
 using System.Collections;
-
+using System.IO;
 using Xunit;
 
 namespace System.Security.Cryptography.X509Certificates.Tests
@@ -274,7 +274,7 @@ public static void ImportFromFileTests()
             using (var pfxCer = new X509Certificate2(TestData.PfxData, TestData.PfxDataPassword))
             {
                 X509Certificate2Collection cc2 = new X509Certificate2Collection();
-                cc2.Import(@"TestData\My.pfx", TestData.PfxDataPassword, X509KeyStorageFlags.DefaultKeySet);
+                cc2.Import(Path.Combine("TestData" ,"My.pfx"), TestData.PfxDataPassword, X509KeyStorageFlags.DefaultKeySet);
                 int count = cc2.Count;
                 Assert.Equal(1, count);
 

src/System.Security.Cryptography.X509Certificates/tests/LoadFromFileTests.cs

@@ -128,7 +128,7 @@ public static void TestLoadSignedFile()
         {
             // X509Certificate2 can also extract the certificate from a signed file.
 
-            string path = @"TestData\Windows6.1-KB3004361-x64.msu";
+            string path = Path.Combine("TestData", "Windows6.1-KB3004361-x64.msu");
             if (!File.Exists(path))
                 throw new Exception(string.Format("Test infrastructure failure: Expected to find file \"{0}\".", path));
 
@@ -152,9 +152,9 @@ public static void TestLoadSignedFile()
 
         private static X509Certificate2 LoadCertificateFromFile()
         {
-            string path = @"TestData\Ms.cer";
+            string path = Path.Combine("TestData", "Ms.cer");
             if (!File.Exists(path))
-                throw new Exception(String.Format("Test infrastructure failure: Expected to find file \"{0}\".", path));
+                throw new Exception(string.Format("Test infrastructure failure: Expected to find file \"{0}\".", path));
             byte[] data = File.ReadAllBytes(path);
             Assert.Equal(TestData.MsCertificate, data);
 

src/System.Security.Cryptography.X509Certificates/tests/PfxTests.cs

@@ -121,7 +121,7 @@ public static void TestSetPrivateKey()
         [ActiveIssue(1993, PlatformID.AnyUnix)]
         public static void TestContentType()
         {
-            String fileName = @"TestData\My.pfx";
+            string fileName = Path.Combine("TestData", "My.pfx");
             if (!File.Exists(fileName))
                 throw new Exception("Test infrastructure failure: Expected to find file: \"" + fileName + "\".");
             X509ContentType ct = X509Certificate2.GetCertContentType(fileName);