Skip to content

Commit 8b19dd0

Browse files
committed
Fix tests
1 parent fb4ae0f commit 8b19dd0

File tree

4 files changed

+1
-97
lines changed

4 files changed

+1
-97
lines changed

RetailCoder.VBE/Refactorings/Rename/IRenameDialog.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

RetailCoder.VBE/Rubberduck.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,6 @@
920920
<Compile Include="UI\FileBrowserDialogFactory.cs" />
921921
<Compile Include="UI\SourceControl\IControlView.cs" />
922922
<Compile Include="UI\SourceControl\IControlViewModel.cs" />
923-
<Compile Include="Refactorings\Rename\IRenameDialog.cs" />
924923
<Compile Include="UI\Refactorings\Rename\RenameDialog.cs">
925924
<SubType>Form</SubType>
926925
</Compile>

RubberduckTests/CodeExplorer/CodeExplorerTests.cs

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Rubberduck.Navigation.CodeExplorer;
88
using Rubberduck.Navigation.Folders;
99
using Rubberduck.Parsing.VBA;
10-
using Rubberduck.Refactorings.Rename;
1110
using Rubberduck.Settings;
1211
using Rubberduck.SmartIndenter;
1312
using Rubberduck.UI;
@@ -898,56 +897,6 @@ Dim d As Boolean
898897
Assert.IsFalse(vm.IndenterCommand.CanExecute(vm.SelectedItem));
899898
}
900899

901-
[TestCategory("Code Explorer")]
902-
[TestMethod]
903-
public void RenameProcedure()
904-
{
905-
var inputCode =
906-
@"Sub Foo()
907-
End Sub
908-
909-
Sub Bar()
910-
Foo
911-
End Sub";
912-
913-
var expectedCode =
914-
@"Sub Fizz()
915-
End Sub
916-
917-
Sub Bar()
918-
Fizz
919-
End Sub";
920-
921-
IVBComponent component;
922-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component);
923-
924-
var view = new Mock<IRenameDialog>();
925-
view.Setup(r => r.ShowDialog()).Returns(DialogResult.OK);
926-
view.Setup(r => r.Target);
927-
view.SetupGet(r => r.NewName).Returns("Fizz");
928-
929-
var msgbox = new Mock<IMessageBox>();
930-
msgbox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.YesNo, It.IsAny<MessageBoxIcon>()))
931-
.Returns(DialogResult.Yes);
932-
933-
var state = new RubberduckParserState(vbe.Object);
934-
var commands = new List<CommandBase>
935-
{
936-
new RenameCommand(vbe.Object, state, view.Object, msgbox.Object)
937-
};
938-
939-
var vm = new CodeExplorerViewModel(new FolderHelper(state), state, commands);
940-
941-
var parser = MockParser.Create(vbe.Object, state);
942-
parser.Parse(new CancellationTokenSource());
943-
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
944-
945-
vm.SelectedItem = vm.Projects.First().Items.First().Items.First().Items.OfType<CodeExplorerMemberViewModel>().Single(item => item.Declaration.IdentifierName == "Foo");
946-
vm.RenameCommand.Execute(vm.SelectedItem);
947-
948-
Assert.AreEqual(expectedCode, component.CodeModule.Content());
949-
}
950-
951900
[TestCategory("Code Explorer")]
952901
[TestMethod]
953902
public void ExpandAllNodes()

RubberduckTests/Refactoring/RenameTests.cs

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Rubberduck.Refactorings;
77
using Rubberduck.Refactorings.Rename;
88
using Rubberduck.UI;
9+
using Rubberduck.UI.Refactorings.Rename;
910
using Rubberduck.VBEditor;
1011
using Rubberduck.VBEditor.SafeComWrappers;
1112
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
@@ -946,40 +947,6 @@ public void Factory_SelectionIsNull()
946947
Assert.AreEqual(null, presenter.Show());
947948
}
948949

949-
[TestMethod]
950-
public void Factory_SelectionIsNotNull_Accept()
951-
{
952-
const string newName = "Goo";
953-
954-
//Input
955-
const string inputCode =
956-
@"Private Sub Foo(ByVal arg1 As String)
957-
End Sub";
958-
var selection = new Selection(1, 25, 1, 25);
959-
960-
IVBComponent component;
961-
var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out component, selection);
962-
var state = MockParser.CreateAndParse(vbe.Object);
963-
964-
var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
965-
966-
var vbeWrapper = vbe.Object;
967-
var model = new RenameModel(vbeWrapper, state, qualifiedSelection, null) { NewName = newName };
968-
969-
var view = new Mock<IRenameDialog>();
970-
view.Setup(v => v.NewName).Returns(newName);
971-
view.Setup(v => v.ShowDialog()).Returns(DialogResult.OK);
972-
973-
var msgbox = new Mock<IMessageBox>();
974-
msgbox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.YesNo, It.IsAny<MessageBoxIcon>()))
975-
.Returns(DialogResult.Yes);
976-
977-
var factory = new RenamePresenterFactory(vbeWrapper, view.Object, state, msgbox.Object);
978-
979-
var presenter = factory.Create();
980-
Assert.AreEqual(model.NewName, presenter.Show().NewName);
981-
}
982-
983950
[TestMethod]
984951
public void RenameRefactoring_RenameProject()
985952
{

0 commit comments

Comments
 (0)