Skip to content

Commit fcf252d

Browse files
BZngrBZngr
committed
Naming changes
1 parent 184b8fa commit fcf252d

File tree

3 files changed

+47
-49
lines changed

3 files changed

+47
-49
lines changed

‎Rubberduck.Inspections/Concrete/UnreachableCaseInspection/UCIRangeClauseFilter.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public interface IUCIRangeClauseFilter
1111
bool FiltersAllValues { get; }
1212
string TypeName { set; get; }
1313
IUCIRangeClauseFilter FilterUnreachableClauses(IUCIRangeClauseFilter filter);
14-
void Add(IUCIRangeClauseFilter newSummary);
14+
void Add(IUCIRangeClauseFilter filter);
1515
void AddValueRange(IUCIValue startVal, IUCIValue endVal);
1616
void AddIsClause(IUCIValue value, string opSymbol);
1717
void AddSingleValue(IUCIValue value);
@@ -44,10 +44,10 @@ public class UCIRangeClauseFilter<T> : IUCIRangeClauseFilter, IUCIRangeClauseFil
4444
private T _minExtent;
4545
private T _maxExtent;
4646

47-
public UCIRangeClauseFilter(string typeName, IUCIValueFactory valueFactory, IUCIRangeClauseFilterFactory summaryFactory, Func<IUCIValue, T> tConverter)
47+
public UCIRangeClauseFilter(string typeName, IUCIValueFactory valueFactory, IUCIRangeClauseFilterFactory filterFactory, Func<IUCIValue, T> tConverter)
4848
{
4949
_valueFactory = valueFactory;
50-
_filterFactory = summaryFactory;
50+
_filterFactory = filterFactory;
5151
_tConverter = tConverter;
5252

5353
_ranges = new List<Tuple<T, T>>();
@@ -110,9 +110,9 @@ public bool ContainsFilters
110110
}
111111

112112
//IUCIRangeClauseFilter
113-
public void Add(IUCIRangeClauseFilter newSummary)
113+
public void Add(IUCIRangeClauseFilter filterToAdd)
114114
{
115-
var itf = (UCIRangeClauseFilter<T>)newSummary;
115+
var itf = (UCIRangeClauseFilter<T>)filterToAdd;
116116
if (itf.TryGetIsLTValue(out T isLT))
117117
{
118118
AddIsClauseImpl(isLT, CompareTokens.LT);
@@ -212,7 +212,7 @@ public IUCIRangeClauseFilter FilterUnreachableClauses(IUCIRangeClauseFilter filt
212212

213213
if (!(filter is UCIRangeClauseFilter<T>))
214214
{
215-
throw new ArgumentException($"Argument is not of type SummaryCoverage<{typeof(T).ToString()}>", "summary");
215+
throw new ArgumentException($"Argument is not of type UCIRangeClauseFilter<{typeof(T).ToString()}>", "filter");
216216
}
217217

218218
var filteredCoverage = _filterFactory.Create(TypeName, _valueFactory);
@@ -417,11 +417,11 @@ private void RemoveRangeValues(List<Tuple<T, T>> toRemove)
417417

418418
private IUCIRangeClauseFilter RemoveClausesCoveredBy(UCIRangeClauseFilter<T> removeFrom, UCIRangeClauseFilter<T> removalSpec)
419419
{
420-
var newSummary = RemoveIsClausesCoveredBy(removeFrom, removalSpec);
421-
newSummary = RemoveRangesCoveredBy(removeFrom, removalSpec);
422-
newSummary = RemoveSingleValuesCoveredBy(removeFrom, removalSpec);
423-
newSummary = RemoveRelationalOpsCoveredBy(removeFrom, removalSpec);
424-
return newSummary;
420+
var newFilter = RemoveIsClausesCoveredBy(removeFrom, removalSpec);
421+
newFilter = RemoveRangesCoveredBy(removeFrom, removalSpec);
422+
newFilter = RemoveSingleValuesCoveredBy(removeFrom, removalSpec);
423+
newFilter = RemoveRelationalOpsCoveredBy(removeFrom, removalSpec);
424+
return newFilter;
425425
}
426426

427427
private static UCIRangeClauseFilter<T> RemoveIsClausesCoveredBy(UCIRangeClauseFilter<T> removeFrom, UCIRangeClauseFilter<T> removalSpec)

‎Rubberduck.Inspections/Concrete/UnreachableCaseInspection/UnreachableCaseInspection.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,12 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
5252
var qualifiedSelectCaseStmts = Listener.Contexts
5353
.Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line));
5454

55-
_parseTreeValueVisitor.OnValueResultCreated += ValueResults.OnNewValueResult;
56-
foreach (var qualifiedSelectCaseStmt in qualifiedSelectCaseStmts)
57-
{
58-
qualifiedSelectCaseStmt.Context.Accept(_parseTreeValueVisitor);
59-
}
55+
var parseTreeValueVisitor = _parseTreeVisitorFactory.Create(State, _valueFactory);
56+
parseTreeValueVisitor.OnValueResultCreated += ValueResults.OnNewValueResult;
6057

6158
foreach (var qualifiedSelectCaseStmt in qualifiedSelectCaseStmts)
6259
{
60+
qualifiedSelectCaseStmt.Context.Accept(parseTreeValueVisitor);
6361
var selectStmt = _selectStmtFactory.Create((VBAParser.SelectCaseStmtContext)qualifiedSelectCaseStmt.Context, ValueResults);
6462

6563
selectStmt.InspectForUnreachableCases();

‎RubberduckTests/Inspections/UnreachableCaseInspectionTests.cs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,10 @@ public void UciUnit_MinusUnaryOp(string operands, string expected)
394394
[Category("Inspections")]
395395
public void UciUnit_ToString(string firstCase, string secondCase, string expectedClauses)
396396
{
397-
var sumClauses = TestRangesToSummaryClauses(new string[] { firstCase, secondCase, expectedClauses }, Tokens.Long);
398-
sumClauses[0].Add(sumClauses[1]);
397+
var filters = RangeDescriptorsToFilters(new string[] { firstCase, secondCase, expectedClauses }, Tokens.Long);
398+
filters[0].Add(filters[1]);
399399

400-
Assert.AreEqual(sumClauses[2], sumClauses[0]);
400+
Assert.AreEqual(filters[2], filters[0]);
401401
}
402402

403403
[TestCase("50?Long_To_x?Long", "Long", "Range=50:x")]
@@ -409,9 +409,9 @@ public void UciUnit_ToString(string firstCase, string secondCase, string expecte
409409
[TestCase("50_To_100,175_To_225", "Long", "Range=50:100,Range=175:225")]
410410
[TestCase("500?Long_To_100?Long", "Long", "Range=100:500")]
411411
[Category("Inspections")]
412-
public void UciUnit_AddRangeClauses(string firstCase, string summaryTypeName, string expectedClauses)
412+
public void UciUnit_AddRangeClauses(string firstCase, string filterTypeName, string expectedClauses)
413413
{
414-
var UUT = RangeClauseFilterFactory.Create(summaryTypeName, ValueFactory);
414+
var UUT = RangeClauseFilterFactory.Create(filterTypeName, ValueFactory);
415415

416416
var clauses = firstCase.Split(new string[] { "," }, StringSplitOptions.None);
417417
foreach (var clause in clauses)
@@ -421,8 +421,8 @@ public void UciUnit_AddRangeClauses(string firstCase, string summaryTypeName, st
421421
}
422422

423423
clauses = expectedClauses.Split(new string[] { "," }, StringSplitOptions.None);
424-
var theVal = CreateTestSummaryCoverage(clauses.ToList(), summaryTypeName);
425-
Assert.AreEqual(UUT, theVal);
424+
var testFilter = CreateTestFilter(clauses.ToList(), filterTypeName);
425+
Assert.AreEqual(testFilter, UUT);
426426
}
427427

428428
[TestCase("Is_>_50", "Long", "IsGT=50")]
@@ -450,11 +450,11 @@ public void UciUnit_AddRangeClauses(string firstCase, string summaryTypeName, st
450450
[TestCase("Is_<>_True", "Boolean", "RelOp=Is <> True")]
451451
[TestCase(@"Is_<>_""100""", "Long", "IsLT=100,IsGT=100")]
452452
[Category("Inspections")]
453-
public void UciUnit_AddIsClauses(string firstCase, string summaryTypeName, string expectedRangeClauses)
453+
public void UciUnit_AddIsClauses(string firstCase, string filterTypeName, string expectedRangeClauses)
454454
{
455-
var UUT = RangeClauseFilterFactory.Create(summaryTypeName, ValueFactory);
455+
var UUT = RangeClauseFilterFactory.Create(filterTypeName, ValueFactory);
456456

457-
var expectedResult = TestRangesToSummaryClauses(new string[] { expectedRangeClauses }, summaryTypeName);
457+
var expectedResult = RangeDescriptorsToFilters(new string[] { expectedRangeClauses }, filterTypeName);
458458

459459
var clauses = firstCase.Split(new string[] { "," }, StringSplitOptions.None);
460460
foreach (var clause in clauses)
@@ -484,7 +484,7 @@ public void UciUnit_AddIsClauses(string firstCase, string summaryTypeName, strin
484484
[Category("Inspections")]
485485
public void UciUnit_RemovalRangeClauses(string candidateClauseInput, string existingClauseInput, string expectedClauses)
486486
{
487-
var sumClauses = TestRangesToSummaryClauses(new string[] { candidateClauseInput, existingClauseInput }, Tokens.Long);
487+
var sumClauses = RangeDescriptorsToFilters(new string[] { candidateClauseInput, existingClauseInput }, Tokens.Long);
488488
var clausesToFilter = sumClauses[0];
489489
var filter = sumClauses[1];
490490

@@ -494,14 +494,14 @@ public void UciUnit_RemovalRangeClauses(string candidateClauseInput, string exis
494494
if (filterResults.ContainsFilters)
495495
{
496496
var clauses = expectedClauses.Split(new string[] { "," }, StringSplitOptions.None);
497-
var expected = CreateTestSummaryCoverage(clauses.ToList(), Tokens.Long);
497+
var expected = CreateTestFilter(clauses.ToList(), Tokens.Long);
498498
Assert.AreEqual(expected, filterResults);
499499
}
500500
else
501501
{
502502
if (!expectedClauses.Equals(""))
503503
{
504-
Assert.Fail("Function fails to return ISummaryCoverage");
504+
Assert.Fail("Function fails to return Interface");
505505
}
506506
}
507507
}
@@ -522,14 +522,14 @@ public void UciUnit_RemovalRangeClauses(string candidateClauseInput, string exis
522522
[Category("Inspections")]
523523
public void UciUnit_FiltersAll(string firstCase, string secondCase, string typeName)
524524
{
525-
var summaryCoverage = RangeClauseFilterFactory.Create(typeName, ValueFactory);
526-
var sumClauses = TestRangesToSummaryClauses(new string[] { firstCase, secondCase }, typeName);
525+
var cummulativeFilter = RangeClauseFilterFactory.Create(typeName, ValueFactory);
526+
var sumClauses = RangeDescriptorsToFilters(new string[] { firstCase, secondCase }, typeName);
527527
for (var idx = 0; idx < sumClauses.Count; idx++)
528528
{
529-
var filteredResults = sumClauses[idx].FilterUnreachableClauses(summaryCoverage);
530-
summaryCoverage.Add(filteredResults);
529+
var filteredResults = sumClauses[idx].FilterUnreachableClauses(cummulativeFilter);
530+
cummulativeFilter.Add(filteredResults);
531531
}
532-
Assert.IsTrue(summaryCoverage.FiltersAllValues, summaryCoverage.ToString());
532+
Assert.IsTrue(cummulativeFilter.FiltersAllValues, cummulativeFilter.ToString());
533533
}
534534

535535
[TestCase("IsLT=True, IsGT=True", "RelOp=x > 6", "Single=False,RelOp=Is > True")]
@@ -539,7 +539,7 @@ public void UciUnit_FiltersAll(string firstCase, string secondCase, string typeN
539539
[Category("Inspections")]
540540
public void UciUnit_FilterBoolean(string firstCase, string secondCase, string expectedClauses)
541541
{
542-
var sumClauses = TestRangesToSummaryClauses(new string[] { firstCase, secondCase, expectedClauses }, Tokens.Boolean);
542+
var sumClauses = RangeDescriptorsToFilters(new string[] { firstCase, secondCase, expectedClauses }, Tokens.Boolean);
543543

544544
var candidateClause = sumClauses[0];
545545
var filter = sumClauses[1];
@@ -599,7 +599,7 @@ public void UciUnit_AddFiltersBoolean(string firstCase, string secondCase, strin
599599
[Category("Inspections")]
600600
public void UciUnit_FiltersRelationalOps(string firstCase, string secondCase, string expectedClauses)
601601
{
602-
var sumClauses = TestRangesToSummaryClauses(new string[] { firstCase, secondCase, expectedClauses }, Tokens.Long);
602+
var sumClauses = RangeDescriptorsToFilters(new string[] { firstCase, secondCase, expectedClauses }, Tokens.Long);
603603
var firstClause = sumClauses[0];
604604
var secondClause = sumClauses[1];
605605
var expected = sumClauses[2];
@@ -617,21 +617,21 @@ public void UciUnit_FiltersRelationalOps(string firstCase, string secondCase, st
617617
[Category("Inspections")]
618618
public void UciUnit_Extents(string typeName)
619619
{
620-
var summary = RangeClauseFilterFactory.Create(typeName, ValueFactory);
620+
var filter = RangeClauseFilterFactory.Create(typeName, ValueFactory);
621621

622622
if (typeName.Equals(Tokens.Long))
623623
{
624-
var check = (IUCIRangeClauseFilterTestSupport<long>)summary;
624+
var check = (IUCIRangeClauseFilterTestSupport<long>)filter;
625625
CheckExtents(check, UCIRangeClauseFilterFactory.IntegerNumberExtents[typeName].Item1, UCIRangeClauseFilterFactory.IntegerNumberExtents[typeName].Item2);
626626
}
627627
else if (typeName.Equals(Tokens.Single))
628628
{
629-
var check = (IUCIRangeClauseFilterTestSupport<double>)summary;
629+
var check = (IUCIRangeClauseFilterTestSupport<double>)filter;
630630
CheckExtents(check, CompareExtents.SINGLEMIN, CompareExtents.SINGLEMAX);
631631
}
632632
else if (typeName.Equals(Tokens.Currency))
633633
{
634-
var check = (IUCIRangeClauseFilterTestSupport<decimal>)summary;
634+
var check = (IUCIRangeClauseFilterTestSupport<decimal>)filter;
635635
CheckExtents(check, CompareExtents.CURRENCYMIN, CompareExtents.CURRENCYMAX);
636636
}
637637
}
@@ -675,7 +675,7 @@ End Select
675675
var inspRange = InspectionRangeFactory.Create(range, results);
676676
inspRange.EvaluationTypeName = Tokens.Boolean;
677677

678-
var expectedFilters = TestRangesToSummaryClauses(new string[] { expected }, Tokens.Boolean);
678+
var expectedFilters = RangeDescriptorsToFilters(new string[] { expected }, Tokens.Boolean);
679679
Assert.AreEqual(expectedFilters.First().ToString(), inspRange.AsFilter.ToString());
680680
}
681681

@@ -2118,26 +2118,26 @@ private void AddFiltersTestSupport(string[] input, string typeName)
21182118
{
21192119
Assert.IsTrue(input.Count() >= 2, "At least two rangeClase input strings are neede for this test");
21202120

2121-
var sumClauses = TestRangesToSummaryClauses(input, typeName);
2121+
var sumClauses = RangeDescriptorsToFilters(input, typeName);
21222122

2123-
IUCIRangeClauseFilter summary = RangeClauseFilterFactory.Create(typeName, ValueFactory);
2123+
IUCIRangeClauseFilter filter = RangeClauseFilterFactory.Create(typeName, ValueFactory);
21242124
for (var idx = 0; idx <= sumClauses.Count - 2; idx++)
21252125
{
2126-
summary.Add(sumClauses[idx]);
2126+
filter.Add(sumClauses[idx]);
21272127
}
21282128

21292129
var expected = sumClauses[sumClauses.Count - 1];
2130-
Assert.AreEqual(expected, summary);
2130+
Assert.AreEqual(expected, filter);
21312131
}
21322132

2133-
private List<IUCIRangeClauseFilter> TestRangesToSummaryClauses(string[] input, string typeName)
2133+
private List<IUCIRangeClauseFilter> RangeDescriptorsToFilters(string[] input, string typeName)
21342134
{
21352135
var caseToRanges = CasesToRanges(input);
21362136
var sumClauses = new List<IUCIRangeClauseFilter>();
21372137
foreach (var id in caseToRanges)
21382138
{
2139-
var newSummary = CreateTestSummaryCoverage(id.Value, typeName);
2140-
sumClauses.Add(newSummary);
2139+
var newFilter = CreateTestFilter(id.Value, typeName);
2140+
sumClauses.Add(newFilter);
21412141
}
21422142
return sumClauses;
21432143
}
@@ -2173,7 +2173,7 @@ private Dictionary<string, List<string>> CasesToRanges(string[] caseClauses)
21732173
return caseToRanges;
21742174
}
21752175

2176-
private IUCIRangeClauseFilter CreateTestSummaryCoverage(List<string> annotations, string typeName)
2176+
private IUCIRangeClauseFilter CreateTestFilter(List<string> annotations, string typeName)
21772177
{
21782178
var result = RangeClauseFilterFactory.Create(typeName, ValueFactory);
21792179
var clauseItem = string.Empty;

0 commit comments

Comments
 (0)