Update remaining legacy tests, add null handling in commands.

comintern · comintern · commit 7308be13c7dc · 2019-02-05T20:06:46.000-06:00
diff --git a/Rubberduck.Core/UI/UnitTesting/Commands/AddTestMethodCommand.cs b/Rubberduck.Core/UI/UnitTesting/Commands/AddTestMethodCommand.cs
@@ -38,7 +38,7 @@ protected override bool EvaluateCanExecute(object parameter)
 
             using (var activePane = _vbe.ActiveCodePane)
             {
-                if (activePane == null || activePane.IsWrappingNullReference)
+                if (activePane?.IsWrappingNullReference ?? true)
                 {
                     return false;
                 }
@@ -69,7 +69,7 @@ protected override void OnExecute(object parameter)
         {
             using (var pane = _vbe.ActiveCodePane)
             {
-                if (pane.IsWrappingNullReference)
+                if (pane?.IsWrappingNullReference ?? true)
                 {
                     return;
                 }
diff --git a/Rubberduck.Core/UI/UnitTesting/Commands/AddTestMethodExpectedErrorCommand.cs b/Rubberduck.Core/UI/UnitTesting/Commands/AddTestMethodExpectedErrorCommand.cs
@@ -33,7 +33,7 @@ protected override bool EvaluateCanExecute(object parameter)
         {
             using (var pane = _vbe.ActiveCodePane)
             {
-                if (_state.Status != ParserState.Ready || pane.IsWrappingNullReference)
+                if (_state.Status != ParserState.Ready || pane is null || pane.IsWrappingNullReference)
                 {
                     return false;
                 }
@@ -63,7 +63,7 @@ protected override void OnExecute(object parameter)
         {
             using (var pane = _vbe.ActiveCodePane)
             {
-                if (pane.IsWrappingNullReference)
+                if (pane?.IsWrappingNullReference ?? true)
                 {
                     return;
                 }
diff --git a/RubberduckTests/Commands/UnitTestCommandTests.cs b/RubberduckTests/Commands/UnitTestCommandTests.cs

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected override bool EvaluateCanExecute(object parameter)`
`38`	`38`
`39`	`39`	`using (var activePane = _vbe.ActiveCodePane)`
`40`	`40`	`{`
`41`		`- if (activePane == null \|\| activePane.IsWrappingNullReference)`
	`41`	`+ if (activePane?.IsWrappingNullReference ?? true)`
`42`	`42`	`{`
`43`	`43`	`return false;`
`44`	`44`	`}`
`@@ -69,7 +69,7 @@ protected override void OnExecute(object parameter)`
`69`	`69`	`{`
`70`	`70`	`using (var pane = _vbe.ActiveCodePane)`
`71`	`71`	`{`
`72`		`- if (pane.IsWrappingNullReference)`
	`72`	`+ if (pane?.IsWrappingNullReference ?? true)`
`73`	`73`	`{`
`74`	`74`	`return;`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected override bool EvaluateCanExecute(object parameter)`
`33`	`33`	`{`
`34`	`34`	`using (var pane = _vbe.ActiveCodePane)`
`35`	`35`	`{`
`36`		`- if (_state.Status != ParserState.Ready \|\| pane.IsWrappingNullReference)`
	`36`	`+ if (_state.Status != ParserState.Ready \|\| pane is null \|\| pane.IsWrappingNullReference)`
`37`	`37`	`{`
`38`	`38`	`return false;`
`39`	`39`	`}`
`@@ -63,7 +63,7 @@ protected override void OnExecute(object parameter)`
`63`	`63`	`{`
`64`	`64`	`using (var pane = _vbe.ActiveCodePane)`
`65`	`65`	`{`
`66`		`- if (pane.IsWrappingNullReference)`
	`66`	`+ if (pane?.IsWrappingNullReference ?? true)`
`67`	`67`	`{`
`68`	`68`	`return;`
`69`	`69`	`}`