Merge pull request #5212 from bclothier/FixAsserts

Fix the NotSequenceEquals and EncapuslatePublicInspection logic

Author: retailcoder

Rubberduck.CodeAnalysis/Inspections/Concrete/EncapsulatePublicFieldInspection.cs

@@ -40,8 +40,9 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
             // we're creating a public field for every control on a form, needs to be ignored.
             var fields = State.DeclarationFinder.UserDeclarations(DeclarationType.Variable)
-                .Where(item => item.Accessibility == Accessibility.Public
-                               && (item.DeclarationType != DeclarationType.Control))
+                .Where(item => item.DeclarationType != DeclarationType.Control
+                               && (item.Accessibility == Accessibility.Public ||
+                                   item.Accessibility == Accessibility.Global))
                 .ToList();
 
             return fields

Rubberduck.Main/ComClientLibrary/UnitTesting/AssertClass.cs

@@ -305,19 +305,12 @@ protected void TestArraySequenceEquity(Array expected, Array actual, string mess
 
             var flattenedExpected = expected.Cast<object>().ToList();
             var flattenedActual = actual.Cast<object>().ToList();
-            if (!flattenedActual.SequenceEqual(flattenedExpected, comparer))
-            {
-                if (equals)
-                {
-                    AssertHandler.OnAssertFailed(message, methodName);
-                }
-                AssertHandler.OnAssertSucceeded();
-            }
-
-            if (!equals)
+            if (equals ^ flattenedActual.SequenceEqual(flattenedExpected, comparer))
             {
                 AssertHandler.OnAssertFailed(message, methodName);
+                return;
             }
+
             AssertHandler.OnAssertSucceeded();
         }
 

RubberduckTests/Inspections/EncapsulatePublicFieldInspectionTests.cs

@@ -7,20 +7,28 @@
 namespace RubberduckTests.Inspections
 {
     [TestFixture]
+    [Category("EncapsulatePublicFieldInspection")]
     public class EncapsulatePublicFieldInspectionTests : InspectionTestsBase
     {
         [Test]
-        [Category("Inspections")]
         public void PublicField_ReturnsResult()
         {
             const string inputCode =
                 @"Public fizz As Boolean";
+            
+            Assert.AreEqual(1, InspectionResultsForStandardModule(inputCode).Count());
+        }
 
+        [Test]
+        public void GlobalField_ReturnsResult()
+        {
+            const string inputCode =
+                @"Global fizz As Boolean";
+            
             Assert.AreEqual(1, InspectionResultsForStandardModule(inputCode).Count());
         }
 
         [Test]
-        [Category("Inspections")]
         public void MultiplePublicFields_ReturnMultipleResult()
         {
             const string inputCode =
@@ -32,39 +40,41 @@ public void MultiplePublicFields_ReturnMultipleResult()
         }
 
         [Test]
-        [Category("Inspections")]
         public void PrivateField_DoesNotReturnResult()
         {
             const string inputCode =
                 @"Private fizz As Boolean";
-
             Assert.AreEqual(0, InspectionResultsForStandardModule(inputCode).Count());
         }
 
         [Test]
-        [Category("Inspections")]
         public void PublicNonField_DoesNotReturnResult()
         {
             const string inputCode =
                 @"Public Sub Foo(ByRef arg1 As String)
 End Sub";
-
             Assert.AreEqual(0, InspectionResultsForStandardModule(inputCode).Count());
         }
 
         [Test]
-        [Category("Inspections")]
         public void PublicField_Ignored_DoesNotReturnResult()
         {
             const string inputCode =
                 @"'@Ignore EncapsulatePublicField
 Public fizz As Boolean";
+            Assert.AreEqual(0, InspectionResultsForStandardModule(inputCode).Count());
+        }
 
+        [Test]
+        public void GlobalField_Ignored_DoesNotReturnResult()
+        {
+            const string inputCode =
+                @"'@Ignore EncapsulatePublicField
+Global fizz As Boolean";
             Assert.AreEqual(0, InspectionResultsForStandardModule(inputCode).Count());
         }
 
         [Test]
-        [Category("Inspections")]
         public void InspectionName()
         {
             var inspection = new EncapsulatePublicFieldInspection(null);