11using System ;
22using System . IO ;
33using System . Threading . Tasks ;
4- using FluentAssertions ;
4+ using Shouldly ;
55using NSubstitute ;
66using NUnit . Framework ;
77using Octopus . CommandLine ;
@@ -32,11 +32,10 @@ public void SetUp()
3232 logger = new LoggerConfiguration ( ) . WriteTo . TextWriter ( output ) . CreateLogger ( ) ;
3333 commandOutputProvider = new CommandOutputProvider ( "TestApp" , "1.0.0" , new DefaultCommandOutputJsonSerializer ( ) , logger ) ;
3434 commandLocator . List ( )
35- . Returns ( new ICommandMetadata [ ]
36- {
35+ . Returns ( [
3736 new CommandAttribute ( "test" ) ,
3837 new CommandAttribute ( "help" )
39- } ) ;
38+ ] ) ;
4039 var helpCommand = new HelpCommand ( new Lazy < ICommandLocator > ( ( ) => commandLocator ) , commandOutputProvider ) ;
4140 var testCommand = new TestCommand ( commandOutputProvider ) ;
4241 commandLocator . Find ( "help" ) . Returns ( helpCommand ) ;
@@ -47,59 +46,59 @@ public void SetUp()
4746 [ Test ]
4847 public async Task ShouldReturnSubCommandSuggestions ( )
4948 {
50- await completeCommand . Execute ( new [ ] { "he" } ) ;
51-
49+ await completeCommand . Execute ( [ "he" ] ) ;
5250 output . ToString ( )
53- . Should ( )
54- . Contain ( "help" )
55- . And . NotContain ( "test" ) ;
51+ . ShouldSatisfyAllConditions (
52+ actual => actual . ShouldContain ( "help" ) ,
53+ actual => actual . ShouldNotContain ( "test" )
54+ ) ;
5655 }
5756
5857 [ Test ]
5958 public async Task ShouldReturnParameterSuggestions ( )
6059 {
61- await completeCommand . Execute ( new [ ] { "test" , "--ap" } ) ;
60+ await completeCommand . Execute ( [ "test" , "--ap" ] ) ;
6261 output . ToString ( )
63- . Should ( )
64- . Contain ( "--apiKey" ) ;
62+ . ShouldContain ( "--apiKey" ) ;
6563 }
6664
6765 [ Test ]
6866 public async Task ShouldReturnCommonOptionsWhenSingleEmptyParameter ( )
6967 {
70- await completeCommand . Execute ( new [ ] { "--" } ) ;
68+ await completeCommand . Execute ( [ "--" ] ) ;
7169 output . ToString ( )
72- . Should ( )
73- . Contain ( "--helpOutputFormat" ) ;
70+ . ShouldContain ( "--helpOutputFormat" ) ;
7471 }
7572
7673 [ Test ]
7774 public async Task ShouldReturnOptionSuggestions ( )
7875 {
79- await completeCommand . Execute ( new [ ] { "--helpOut" } ) ;
76+ await completeCommand . Execute ( [ "--helpOut" ] ) ;
77+
8078 output . ToString ( )
81- . Should ( )
82- . Contain ( "--helpOutputFormat" )
83- . And . NotContain ( "--help\n " ) ;
79+ . ShouldSatisfyAllConditions (
80+ actual => actual . ShouldContain ( "--helpOutputFormat" ) ,
81+ actual => actual . ShouldNotContain ( "--help\n " )
82+ ) ;
8483 }
8584
8685 [ Test ]
8786 public async Task ShouldReturnAllSubCommandsWhenEmptyArguments ( )
8887 {
89- await completeCommand . Execute ( new [ ] { "" } ) ;
88+ await completeCommand . Execute ( [ "" ] ) ;
9089 output . ToString ( )
91- . Should ( )
92- . Contain ( "help" )
93- . And . Contain ( "test" ) ;
90+ . ShouldSatisfyAllConditions (
91+ actual => actual . ShouldContain ( "help" ) ,
92+ actual => actual . ShouldContain ( "test" )
93+ ) ;
9494 }
9595
9696 [ Test ]
9797 public async Task ShouldStopSubCommandCompletionAfterOptionSuggestion ( )
9898 {
99- await completeCommand . Execute ( new [ ] { "test" , "--api" , "API-KEY" , "--u" } ) ;
99+ await completeCommand . Execute ( [ "test" , "--api" , "API-KEY" , "--u" ] ) ;
100100 output . ToString ( )
101- . Should ( )
102- . Contain ( "--url" ) ;
101+ . ShouldContain ( "--url" ) ;
103102 }
104103
105104 [ Test ]
@@ -109,8 +108,7 @@ public async Task SupportsHelpOption(string commandLine)
109108 {
110109 await completeCommand . Execute ( commandLine . Split ( ' ' ) ) ;
111110 output . ToString ( )
112- . Should ( )
113- . Contain ( "Where <command> is the current command line to filter auto-completions" ) ;
111+ . ShouldContain ( "Where <command> is the current command line to filter auto-completions" ) ;
114112 }
115113
116114 [ TearDown ]
0 commit comments