Skip to content

Commit 60ce807

Browse files
committed
Remove merge artifacts, redundant tests.
1 parent ade0099 commit 60ce807

File tree

3 files changed

+0
-23
lines changed

3 files changed

+0
-23
lines changed

Rubberduck.Core/app.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,15 +406,12 @@
406406
InspectionType="RubberduckOpportunities" />
407407
<CodeInspection Name="OnLocalErrorInspection" Severity="Suggestion"
408408
InspectionType="LanguageOpportunities" />
409-
<<<<<<< HEAD
410409
<CodeInspection Name="IsMissingOnInappropriateArgumentInspection"
411410
Severity="Warning" InspectionType="CodeQualityIssues" />
412411
<CodeInspection Name="IsMissingWithNonArgumentParameterInspection"
413412
Severity="Warning" InspectionType="CodeQualityIssues" />
414-
=======
415413
<CodeInspection Name="AssignmentNotUsedInspection" Severity="Suggestion"
416414
InspectionType="CodeQualityIssues" />
417-
>>>>>>> next
418415
</CodeInspections>
419416
<WhitelistedIdentifiers />
420417
<RunInspectionsOnSuccessfulParse>true</RunInspectionsOnSuccessfulParse>

RubberduckTests/Inspections/IsMissingOnInappropriateArgumentInspectionTests.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,5 @@ private int ArrangeAndGetInspectionCount(string code)
219219
return inspectionResults.Count();
220220
}
221221
}
222-
223-
[Test]
224-
[Category("Inspections")]
225-
public void InspectionName()
226-
{
227-
const string inspectionName = "IsMissingOnInappropriateArgumentInspection";
228-
var inspection = new IsMissingOnInappropriateArgumentInspection(null);
229-
230-
Assert.AreEqual(inspectionName, inspection.Name);
231-
}
232222
}
233223
}

RubberduckTests/Inspections/IsMissingWithNonArgumentParameterInspectionTests.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,5 @@ private int ArrangeAndGetInspectionCount(string code)
172172
return inspectionResults.Count();
173173
}
174174
}
175-
176-
[Test]
177-
[Category("Inspections")]
178-
public void InspectionName()
179-
{
180-
const string inspectionName = "IsMissingWithNonArgumentParameterInspection";
181-
var inspection = new IsMissingWithNonArgumentParameterInspection(null);
182-
183-
Assert.AreEqual(inspectionName, inspection.Name);
184-
}
185175
}
186176
}

0 commit comments

Comments
 (0)