Merge pull request #2149 from Hosch250/Issue2135

Hosch250 · web-flow · commit 15b9aead8913 · 2016-07-26T19:43:02.000-05:00
Add a bunch of tests
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/RefactorExtractInterfaceCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/RefactorExtractInterfaceCommand.cs
@@ -21,22 +21,9 @@ public RefactorExtractInterfaceCommand(VBE vbe, RubberduckParserState state, IMe
             _messageBox = messageBox;
         }
 
-        private static readonly vbext_ComponentType[] ModuleTypes =
-        {
-            vbext_ComponentType.vbext_ct_ClassModule, 
-            vbext_ComponentType.vbext_ct_Document, 
-            vbext_ComponentType.vbext_ct_MSForm, 
-        };
-
         protected override bool CanExecuteImpl(object parameter)
         {
-            var activePane = Vbe.ActiveCodePane;
-            if (activePane == null)
-            {
-                return false;
-            }
-
-            var selection = activePane.GetQualifiedSelection();
+            var selection = Vbe.ActiveCodePane.GetQualifiedSelection();
             if (!selection.HasValue)
             {
                 return false;
@@ -49,9 +36,7 @@ protected override bool CanExecuteImpl(object parameter)
             var hasMembers = _state.AllUserDeclarations.Any(item => item.DeclarationType.HasFlag(DeclarationType.Member) && item.ParentDeclaration != null && item.ParentDeclaration.Equals(target));
 
             // true if active code pane is for a class/document/form module
-            var canExecute = ModuleTypes.Contains(Vbe.ActiveCodePane.CodeModule.Parent.Type) && target != null && hasMembers;
-
-            return canExecute;
+            return target != null && hasMembers;
         }
 
         protected override void ExecuteImpl(object parameter)
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/RefactorImplementInterfaceCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/RefactorImplementInterfaceCommand.cs
@@ -21,7 +21,7 @@ public RefactorImplementInterfaceCommand(VBE vbe, RubberduckParserState state)
 
         protected override bool CanExecuteImpl(object parameter)
         {
-            if (Vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
+            if (_state.Status != ParserState.Ready)
             {
                 return false;
             }
@@ -38,9 +38,7 @@ protected override bool CanExecuteImpl(object parameter)
                         !d.IsBuiltIn && d.DeclarationType == DeclarationType.ClassModule &&
                         d.QualifiedSelection.QualifiedName.Equals(selection.Value.QualifiedName));
 
-            var canExecute = targetInterface != null && targetClass != null;
-
-            return canExecute;
+            return targetInterface != null && targetClass != null;
         }
 
         protected override void ExecuteImpl(object parameter)
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/RefactorIntroduceFieldCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/RefactorIntroduceFieldCommand.cs
@@ -18,7 +18,7 @@ public RefactorIntroduceFieldCommand (VBE vbe, RubberduckParserState state)
 
         protected override bool CanExecuteImpl(object parameter)
         {
-            if (Vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
+            if (_state.Status != ParserState.Ready)
             {
                 return false;
             }
@@ -31,9 +31,7 @@ protected override bool CanExecuteImpl(object parameter)
 
             var target = _state.AllUserDeclarations.FindVariable(selection.Value);
 
-            var canExecute = target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
-
-            return canExecute;
+            return target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
         }
 
         protected override void ExecuteImpl(object parameter)
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/RefactorIntroduceParameterCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/RefactorIntroduceParameterCommand.cs
@@ -18,7 +18,7 @@ public RefactorIntroduceParameterCommand (VBE vbe, RubberduckParserState state)
 
         protected override bool CanExecuteImpl(object parameter)
         {
-            if (Vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
+            if (_state.Status != ParserState.Ready)
             {
                 return false;
             }
@@ -31,9 +31,7 @@ protected override bool CanExecuteImpl(object parameter)
 
             var target = _state.AllUserDeclarations.FindVariable(selection.Value);
 
-            var canExecute = target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
-
-            return canExecute;
+            return target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);
         }
 
         protected override void ExecuteImpl(object parameter)
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs
@@ -34,11 +34,9 @@ protected override bool CanExecuteImpl(object parameter)
             }
 
             var target = _state.FindSelectedDeclaration(Vbe.ActiveCodePane);
-            var canExecute = target != null 
+            return target != null 
                 && (target.DeclarationType == DeclarationType.Variable || target.DeclarationType == DeclarationType.Constant)
                 && target.References.Any();
-
-            return canExecute;
         }
 
         protected override void ExecuteImpl(object parameter)
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/RefactorRemoveParametersCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/RefactorRemoveParametersCommand.cs
@@ -45,11 +45,9 @@ protected override bool CanExecuteImpl(object parameter)
             }
 
             var parameters = _state.AllUserDeclarations.Where(item => item.DeclarationType == DeclarationType.Parameter && member.Equals(item.ParentScopeDeclaration)).ToList();
-            var canExecute = (member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet)
+            return member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet
                     ? parameters.Count > 1
                     : parameters.Any();
-
-            return canExecute;
         }
 
         protected override void ExecuteImpl(object parameter)
diff --git a/RubberduckTests/Commands/RefactorCommandTests.cs b/RubberduckTests/Commands/RefactorCommandTests.cs
diff --git a/RubberduckTests/RubberduckTests.csproj b/RubberduckTests/RubberduckTests.csproj

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public RefactorImplementInterfaceCommand(VBE vbe, RubberduckParserState state)`
`21`	`21`
`22`	`22`	`protected override bool CanExecuteImpl(object parameter)`
`23`	`23`	`{`
`24`		`- if (Vbe.ActiveCodePane == null \|\| _state.Status != ParserState.Ready)`
	`24`	`+ if (_state.Status != ParserState.Ready)`
`25`	`25`	`{`
`26`	`26`	`return false;`
`27`	`27`	`}`
`@@ -38,9 +38,7 @@ protected override bool CanExecuteImpl(object parameter)`
`38`	`38`	`!d.IsBuiltIn && d.DeclarationType == DeclarationType.ClassModule &&`
`39`	`39`	`d.QualifiedSelection.QualifiedName.Equals(selection.Value.QualifiedName));`
`40`	`40`
`41`		`- var canExecute = targetInterface != null && targetClass != null;`
`42`		`-`
`43`		`- return canExecute;`
	`41`	`+ return targetInterface != null && targetClass != null;`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`protected override void ExecuteImpl(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public RefactorIntroduceFieldCommand (VBE vbe, RubberduckParserState state)`
`18`	`18`
`19`	`19`	`protected override bool CanExecuteImpl(object parameter)`
`20`	`20`	`{`
`21`		`- if (Vbe.ActiveCodePane == null \|\| _state.Status != ParserState.Ready)`
	`21`	`+ if (_state.Status != ParserState.Ready)`
`22`	`22`	`{`
`23`	`23`	`return false;`
`24`	`24`	`}`
`@@ -31,9 +31,7 @@ protected override bool CanExecuteImpl(object parameter)`
`31`	`31`
`32`	`32`	`var target = _state.AllUserDeclarations.FindVariable(selection.Value);`
`33`	`33`
`34`		`- var canExecute = target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);`
`35`		`-`
`36`		`- return canExecute;`
	`34`	`+ return target != null && target.ParentScopeDeclaration.DeclarationType.HasFlag(DeclarationType.Member);`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`protected override void ExecuteImpl(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,9 @@ protected override bool CanExecuteImpl(object parameter)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`var target = _state.FindSelectedDeclaration(Vbe.ActiveCodePane);`
`37`		`- var canExecute = target != null`
	`37`	`+ return target != null`
`38`	`38`	`&& (target.DeclarationType == DeclarationType.Variable \|\| target.DeclarationType == DeclarationType.Constant)`
`39`	`39`	`&& target.References.Any();`
`40`		`-`
`41`		`- return canExecute;`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`protected override void ExecuteImpl(object parameter)`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,9 @@ protected override bool CanExecuteImpl(object parameter)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`var parameters = _state.AllUserDeclarations.Where(item => item.DeclarationType == DeclarationType.Parameter && member.Equals(item.ParentScopeDeclaration)).ToList();`
`48`		`- var canExecute = (member.DeclarationType == DeclarationType.PropertyLet \|\| member.DeclarationType == DeclarationType.PropertySet)`
	`48`	`+ return member.DeclarationType == DeclarationType.PropertyLet \|\| member.DeclarationType == DeclarationType.PropertySet`
`49`	`49`	`? parameters.Count > 1`
`50`	`50`	`: parameters.Any();`
`51`		`-`
`52`		`- return canExecute;`
`53`	`51`	`}`
`54`	`52`
`55`	`53`	`protected override void ExecuteImpl(object parameter)`