Fix failing tests.

Author: vcsjones

AuthenticodeLintTests/Rules/PublisherInformationPresentRuleTests.cs

@@ -21,7 +21,7 @@ public void ShouldFailWhenNoPublisherInformation()
 
             var result = rule.Validate(signature, logger, Configuration);
             Assert.Equal(RuleResult.Fail, result);
-            Assert.Collection(logger.Messages, s => s.EndsWith("Signature does not have an accompanying description."), s => s.EndsWith("Signature does not have an accompanying URL."));
+            Assert.Collection(logger.Messages, s => s.EndsWith("Signature does not have any publisher information."));
         }
 
         [Fact]

AuthenticodeLintTests/Rules/Sha1PrimarySignatureRuleTests.cs

@@ -47,25 +47,5 @@ public void ShouldPassOnSha1Algorithm()
             Assert.Equal(RuleResult.Pass, result);
             Assert.Empty(logger.Messages);
         }
-
-
-        [Fact]
-        public void ShouldFailOnMultiplePrimarySignatures()
-        {
-            var signature1 = new FakeSignature
-            {
-                DigestAlgorithm = new Oid(KnownOids.SHA1)
-            };
-            var signature2 = new FakeSignature
-            {
-                DigestAlgorithm = new Oid(KnownOids.SHA256)
-            };
-            var check = new Sha1PrimarySignatureRule();
-            var logger = new MemorySignatureLogger();
-            var result = check.Validate(new List<ICmsSignature> { signature1, signature2 }, logger, Configuration);
-            Assert.Equal(RuleResult.Fail, result);
-            Assert.Contains("Multiple primary signatures exist.", logger.Messages);
-
-        }
     }
 }

AuthenticodeLintTests/Rules/SinglePrimarySignatureRuleTest.cs

@@ -0,0 +1,33 @@
+using AuthenticodeExaminer;
+using AuthenticodeLint;
+using AuthenticodeLint.Rules;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using Xunit;
+
+namespace AuthenticodeLintTests.Rules
+{
+    public class SinglePrimarySignatureRuleTest
+    {
+        private static CheckConfiguration Configuration => new CheckConfiguration(new List<string>(), null, false, new HashSet<int>(), false, RevocationChecking.None, null, RuleSet.Compat);
+
+        [Fact]
+        public void ShouldFailOnMultiplePrimarySignatures()
+        {
+            var signature1 = new FakeSignature
+            {
+                DigestAlgorithm = new Oid(KnownOids.SHA1)
+            };
+            var signature2 = new FakeSignature
+            {
+                DigestAlgorithm = new Oid(KnownOids.SHA256)
+            };
+            var check = new SinglePrimarySignatureRule();
+            var logger = new MemorySignatureLogger();
+            var result = check.Validate(new List<ICmsSignature> { signature1, signature2 }, logger, Configuration);
+            Assert.Equal(RuleResult.Fail, result);
+            Assert.Contains("Multiple primary signatures exist.", logger.Messages);
+
+        }
+    }
+}