Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the NotSequenceEquals and EncapuslatePublicInspection logic #5212

Merged
merged 4 commits into from
Oct 19, 2019
Merged

Fix the NotSequenceEquals and EncapuslatePublicInspection logic #5212

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cb41fc
Fix the NotSequenceEquals logic
bclothier Oct 12, 2019
121f3d4
Add the missing return
bclothier Oct 12, 2019
84f3096
Handle the globals for encapuslate field inspection
bclothier Oct 12, 2019
01867d6
Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck i…
bclothier Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions Rubberduck.CodeAnalysis/Inspections/Concrete/EncapsulatePublicFieldInspection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 3 additions & 10 deletions Rubberduck.Main/ComClientLibrary/UnitTesting/AssertClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
24 changes: 15 additions & 9 deletions RubberduckTests/Inspections/EncapsulatePublicFieldInspectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,32 @@
namespace RubberduckTests.Inspections
{
[TestFixture]
[Category("EncapsulatePublicFieldInspection")]
public class EncapsulatePublicFieldInspectionTests
{
[Test]
[Category("Inspections")]
public void PublicField_ReturnsResult()
{
const string inputCode =
@"Public fizz As Boolean";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
using (var state = MockParser.CreateAndParse(vbe.Object))
{
var inspection = new EncapsulatePublicFieldInspection(state);
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);

Assert.AreEqual(1, inspectionResults.Count());
}
}

[Test]
public void GlobalField_ReturnsResult()
{
const string inputCode =
@"Global fizz As Boolean";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
using (var state = MockParser.CreateAndParse(vbe.Object))
{
var inspection = new EncapsulatePublicFieldInspection(state);
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);

Expand All @@ -27,7 +41,6 @@ public void PublicField_ReturnsResult()
}

[Test]
[Category("Inspections")]
public void MultiplePublicFields_ReturnMultipleResult()
{
const string inputCode =
Expand All @@ -46,15 +59,13 @@ public void MultiplePublicFields_ReturnMultipleResult()
}

[Test]
[Category("Inspections")]
public void PrivateField_DoesNotReturnResult()
{
const string inputCode =
@"Private fizz As Boolean";
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
using (var state = MockParser.CreateAndParse(vbe.Object))
{

var inspection = new EncapsulatePublicFieldInspection(state);
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);

Expand All @@ -63,7 +74,6 @@ public void PrivateField_DoesNotReturnResult()
}

[Test]
[Category("Inspections")]
public void PublicNonField_DoesNotReturnResult()
{
const string inputCode =
Expand All @@ -72,7 +82,6 @@ public void PublicNonField_DoesNotReturnResult()
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
using (var state = MockParser.CreateAndParse(vbe.Object))
{

var inspection = new EncapsulatePublicFieldInspection(state);
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);

Expand All @@ -81,7 +90,6 @@ public void PublicNonField_DoesNotReturnResult()
}

[Test]
[Category("Inspections")]
public void PublicField_Ignored_DoesNotReturnResult()
{
const string inputCode =
Expand All @@ -90,7 +98,6 @@ public void PublicField_Ignored_DoesNotReturnResult()
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
using (var state = MockParser.CreateAndParse(vbe.Object))
{

var inspection = new EncapsulatePublicFieldInspection(state);
var inspectionResults = inspection.GetInspectionResults(CancellationToken.None);

Expand All @@ -99,7 +106,6 @@ public void PublicField_Ignored_DoesNotReturnResult()
}

[Test]
[Category("Inspections")]
public void InspectionName()
{
const string inspectionName = "EncapsulatePublicFieldInspection";
Expand Down