33namespace knivey \cmdr \test ;
44
55use knivey \cmdr \Args ;
6+ use knivey \cmdr \Option ;
67use knivey \cmdr \ParseException ;
78use knivey \cmdr \SyntaxException ;
89use PHPUnit \Framework \TestCase ;
@@ -259,31 +260,31 @@ function testArgWhenNotReq()
259260
260261 function testOptions ()
261262 {
262- $ args = new Args ('<foo>... ' , ['--nes ' ]);
263+ $ args = new Args ('<foo>... ' , [new Option ( '--nes ' ) ]);
263264 $ args ->parse ('moo boo poo ' );
264265 $ this ->assertEquals ('moo boo poo ' , $ args [0 ]);
265266 $ this ->assertEmpty ($ args ->getOpts ());
266267 $ args ->parse ('moo --nes poo ' );
267268 $ this ->assertEquals ('moo poo ' , $ args [0 ]);
268269 $ this ->assertEquals (['--nes ' =>null ], $ args ->getOpts ());
269270
270- $ args = new Args ('<foo> ' , ['--nes ' ]);
271+ $ args = new Args ('<foo> ' , [new Option ( '--nes ' ) ]);
271272 $ args ->parse ('moo boo poo ' );
272273 $ this ->assertEquals ('moo ' , $ args [0 ]);
273274 $ this ->assertEmpty ($ args ->getOpts ());
274275 $ args ->parse ('moo --nes poo ' );
275276 $ this ->assertEquals ('moo ' , $ args [0 ]);
276277 $ this ->assertEquals (['--nes ' =>null ], $ args ->getOpts ());
277278
278- $ args = new Args ('[foo] ' , ['--nes ' ]);
279+ $ args = new Args ('[foo] ' , [new Option ( '--nes ' ) ]);
279280 $ args ->parse ('moo boo poo ' );
280281 $ this ->assertEquals ('moo ' , $ args [0 ]);
281282 $ this ->assertEmpty ($ args ->getOpts ());
282283 $ args ->parse ('--nes moo ' );
283284 $ this ->assertEquals ('moo ' , $ args [0 ]);
284285 $ this ->assertTrue ($ args ->getOpt ('--nes ' ));
285286
286- $ args = new Args ('[foo] ' , ['--nes ' , '--bar ' ]);
287+ $ args = new Args ('[foo] ' , [new Option ( '--nes ' ), new Option ( '--bar ' ) ]);
287288 $ args ->parse ('moo --nes boo poo ' );
288289 $ this ->assertEquals ('moo ' , $ args [0 ]);
289290 $ this ->assertTrue ($ args ->getOpt ('--nes ' ));
@@ -296,20 +297,20 @@ function testOptions()
296297
297298 function testOptionsCase ()
298299 {
299- $ args = new Args ('' , ['--nes ' , '--NES ' ]);
300+ $ args = new Args ('' , [new Option ( '--nes ' ), new Option ( '--NES ' ) ]);
300301 $ args ->parse ('--nes ' );
301302 $ this ->assertTrue ($ args ->getOpt ("--nes " ));
302303 $ this ->assertFalse ($ args ->getOpt ("--NES " ));
303304
304- $ args = new Args ('' , ['--nes ' , '--NES ' ]);
305+ $ args = new Args ('' , [new Option ( '--nes ' ), new Option ( '--NES ' ) ]);
305306 $ args ->parse ('--NES ' );
306307 $ this ->assertFalse ($ args ->getOpt ("--nes " ));
307308 $ this ->assertTrue ($ args ->getOpt ("--NES " ));
308309 }
309310
310311 function testOptionsValue ()
311312 {
312- $ args = new Args ('' , ['--nes ' , '--jam ' ]);
313+ $ args = new Args ('' , [new Option ( '--nes ' ), new Option ( '--jam ' ) ]);
313314 $ args = $ args ->parse ('--nes ' );
314315 $ this ->assertTrue ($ args ->getOpt ("--nes " ));
315316 $ this ->assertEquals ('' , $ args ->getOptVal ("--nes " ));
0 commit comments