Skip to content

Commit

Permalink
Drop ConfirmYesNo without optional argument
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vogel612
Vogel612 committed Jun 2, 2018
1 parent c45bba8 commit 02a5860
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
2 changes: 0 additions & 2 deletions Rubberduck.Interaction/IMessageBox.cs
View file
Expand Up @@ -30,8 +30,6 @@ public interface IMessageBox
/// <param name="caption">The caption of the dialog window</param>
/// <returns>true, if the user selects "Yes", false if the user selects "No"</returns>
bool Question(string text, string caption);
[Obsolete] // TODO absorb into confirmation with preselected result
bool ConfirmYesNo(string text, string caption);
/// <summary>
/// Ask the user for a simple confirmation. If the user selects an option, non-reversible consequences are acceptable.
/// Will only return on user-input.
Expand Down
2 changes: 1 addition & 1 deletion RubberduckTests/Refactoring/IntroduceParameterTests.cs
View file
Expand Up @@ -630,7 +630,7 @@ Sub IClass1_fizz(ByVal boo As Boolean)
{

var messageBox = new Mock<IMessageBox>();
messageBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>())).Returns(false);
messageBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(false);

var refactoring = new IntroduceParameterRefactoring(vbe.Object, state, messageBox.Object);

Expand Down
4 changes: 2 additions & 2 deletions RubberduckTests/Refactoring/RemoveParametersTests.cs
View file
Expand Up @@ -1864,7 +1864,7 @@ public void RemoveParametersRefactoring_LastInterfaceParamsRemoved_AcceptPrompt(
var module2 = project.Object.VBComponents[1].CodeModule;

var messageBox = new Mock<IMessageBox>();
messageBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
messageBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(true);

//Specify Params to remove
var model = new RemoveParametersModel(state, qualifiedSelection, messageBox.Object);
Expand Down Expand Up @@ -1910,7 +1910,7 @@ public void RemoveParametersRefactoring_LastInterfaceParamRemoved_RejectPrompt()
var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(project.Object.VBComponents[0]), selection);

var messageBox = new Mock<IMessageBox>();
messageBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>())).Returns(false);
messageBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(false);

//Specify Params to remove
var model = new RemoveParametersModel(state, qualifiedSelection, messageBox.Object);
Expand Down
16 changes: 8 additions & 8 deletions RubberduckTests/Refactoring/RenameTests.cs
View file
Expand Up @@ -1232,7 +1232,7 @@ End Sub
};
PerformExpectedVersusActualRenameTests(tdo, inputOutput1, inputOutputWithSelection, inputOutput3);

tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
}

[Test]
Expand Down Expand Up @@ -1310,7 +1310,7 @@ c1.Nothing 7
};
PerformExpectedVersusActualRenameTests(tdo, inputOutput1, inputOutputWithSelection, inputOutput3);

tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
}

[Test]
Expand Down Expand Up @@ -1494,7 +1494,7 @@ public void RenameRefactoring_RenameInterface_AcceptPrompt()
};
PerformExpectedVersusActualRenameTests(tdo, inputOutput1, inputOutput2);

tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
}

[Test]
Expand Down Expand Up @@ -1524,7 +1524,7 @@ public void RenameRefactoring_RenameInterface_RejectPrompt()
tdo.MsgBoxReturn = DialogResult.No;
PerformExpectedVersusActualRenameTests(tdo, inputOutput1, inputOutput2);

tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
}

#endregion
Expand Down Expand Up @@ -1634,7 +1634,7 @@ public void RenameRefactoring_RenameCodeModule()
var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);

var msgbox = new Mock<IMessageBox>();
msgbox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
msgbox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(true);

var vbeWrapper = vbe.Object;
var model = new RenameModel(vbeWrapper, state, qualifiedSelection) { NewName = newName };
Expand Down Expand Up @@ -1671,7 +1671,7 @@ public void RenameRefactoring_RenameProject()
{

var msgbox = new Mock<IMessageBox>();
msgbox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
msgbox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(true);

var vbeWrapper = vbe.Object;
var model = new RenameModel(vbeWrapper, state, default(QualifiedSelection)) { NewName = newName };
Expand Down Expand Up @@ -2074,7 +2074,7 @@ public void RenameRefactoring_RenameClassModule_DoesNotChangeMeReferences()
var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);

var msgbox = new Mock<IMessageBox>();
msgbox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
msgbox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(true);

var vbeWrapper = vbe.Object;
var model = new RenameModel(vbeWrapper, state, qualifiedSelection) { NewName = newName };
Expand Down Expand Up @@ -2157,7 +2157,7 @@ public void RenameRefactoring_RenameClassModule_DoesNotChangeMeReferences()

tdo.MsgBox = new Mock<IMessageBox>();
// FIXME this might be a bit broken now
tdo.MsgBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>())).Returns(tdo.MsgBoxReturn == DialogResult.Yes);
tdo.MsgBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(tdo.MsgBoxReturn == DialogResult.Yes);

tdo.VBE = tdo.VBE ?? BuildProject(tdo.ProjectName, tdo.ModuleTestSetupDefs);
tdo.ParserState = MockParser.CreateAndParse(tdo.VBE, testLibraries: testLibraries);
Expand Down
2 changes: 1 addition & 1 deletion RubberduckTests/Refactoring/ReorderParametersTests.cs
View file
Expand Up @@ -1391,7 +1391,7 @@ public void ReorderParametersRefactoring_InterfaceParamsSwapped_AcceptPrompt()
var module2 = project.Object.VBComponents[1].CodeModule;

var messageBox = new Mock<IMessageBox>();
messageBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
messageBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(true);

//Specify Params to remove
var model = new ReorderParametersModel(state, qualifiedSelection, messageBox.Object);
Expand Down

0 comments on commit 02a5860

Please sign in to comment.