Skip to content

Commit 38fdc6f

Browse files
author
Andrin Meier
committed
fix tests
1 parent 9b51b83 commit 38fdc6f

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

RetailCoder.VBE/Inspections/ImplicitPublicMemberInspectionResult.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public ImplicitPublicMemberInspectionResult(IInspection inspection, QualifiedCon
1717
{
1818
_quickFixes = new CodeInspectionQuickFix[]
1919
{
20-
new SpecifyExplicitPublicModifierQuickFix(Context, QualifiedSelection),
20+
new SpecifyExplicitPublicModifierQuickFix(qualifiedContext.Context, QualifiedSelection),
2121
new IgnoreOnceQuickFix(qualifiedContext.Context, QualifiedSelection, Inspection.AnnotationName),
2222
};
2323
}
@@ -45,14 +45,13 @@ public override void Fix()
4545
var oldContent = Context.GetText();
4646
var newContent = Tokens.Public + ' ' + oldContent;
4747

48-
var selection = Selection.Selection;
48+
var selection = Context.GetSelection();
4949

5050
var module = Selection.QualifiedName.Component.CodeModule;
5151
var lines = module.get_Lines(selection.StartLine, selection.LineCount);
5252

53-
var result = lines.Replace(oldContent, newContent);
5453
module.DeleteLines(selection.StartLine, selection.LineCount);
55-
module.InsertLines(selection.StartLine, result);
54+
module.InsertLines(selection.StartLine, newContent);
5655
}
5756
}
5857
}

RubberduckTests/Inspections/ImplicitPublicMemberInspectionTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,14 @@ public void ImplicitPublicMember_QuickFixWorks()
145145
{
146146
const string inputCode =
147147
@"Sub Foo(ByVal arg1 as Integer)
148+
149+
148150
End Sub";
149151

150152
const string expectedCode =
151153
@"Public Sub Foo(ByVal arg1 as Integer)
154+
155+
152156
End Sub";
153157

154158
//Arrange

RubberduckTests/Refactoring/IntroduceFieldTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ Dim bar As Boolean
544544
m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
545545
It.IsAny<MessageBoxIcon>()), Times.Once);
546546

547-
Assert.AreEqual("Invalid declaration type\r\nParameter name: target", e.Message);
547+
Assert.AreEqual("Invalid declaration type\r\nParametername: target", e.Message);
548548
Assert.AreEqual(inputCode, module.Lines());
549549
return;
550550
}

RubberduckTests/Refactoring/IntroduceParameterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ Dim bar As Boolean
820820
m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),
821821
It.IsAny<MessageBoxIcon>()), Times.Once);
822822

823-
Assert.AreEqual("Invalid declaration type\r\nParameter name: target", e.Message);
823+
Assert.AreEqual("Invalid declaration type\r\nParametername: target", e.Message);
824824
Assert.AreEqual(inputCode, module.Lines());
825825
return;
826826
}

RubberduckTests/Refactoring/MoveCloserToUsageTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ Private Sub Foo()
756756
}
757757
catch (ArgumentException e)
758758
{
759-
Assert.AreEqual("Invalid Argument. DeclarationType must be 'Variable'\r\nParameter name: target", e.Message);
759+
Assert.AreEqual("Invalid Argument. DeclarationType must be 'Variable'\r\nParametername: target", e.Message);
760760
Assert.AreEqual(inputCode, module.Lines());
761761
messageBox.Verify(m =>
762762
m.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButtons>(),

0 commit comments

Comments
 (0)