chore: add some tests for CliApp

Author: inhere

README.md

@@ -226,7 +226,7 @@ $arrArg = $fs->getArg('arrArg'); // array{"arr0", "arr1"}
 
 -----------
 
-## Create simple cmd or app
+## Build simple cli app
 
 In the pflag, built in `CliApp` and `CliCmd` for quick create and run an simple console application.
 

src/CliApp.php

@@ -9,26 +9,21 @@
 use Toolkit\Cli\Cli;
 use Toolkit\Cli\Color;
 use Toolkit\Stdlib\Arr;
-use Toolkit\Stdlib\Str;
 use function array_merge;
 use function array_shift;
 use function basename;
 use function class_exists;
 use function function_exists;
 use function getcwd;
-use function implode;
 use function is_array;
 use function is_callable;
 use function is_object;
 use function is_string;
 use function ksort;
 use function method_exists;
-use function rtrim;
 use function str_pad;
 use function strlen;
-use function strpos;
 use function ucfirst;
-use function vdump;
 
 /**
  * class CliApp
@@ -37,8 +32,10 @@
  */
 class CliApp
 {
+    // use AutoConfigTrait;
+
     /** @var self|null */
-    public static $global;
+    private static $global;
 
     private const COMMAND_CONFIG = [
         'desc'      => '',
@@ -396,7 +393,7 @@ public function addCommand(string $command, $handler, array $config = []): void
     }
 
     /**
-     * @param array $commands
+     * @param array<string, array{desc: string, handler:callable, options:array, arguments:array}> $commands
      *
      * @throws InvalidArgumentException
      */
@@ -450,6 +447,16 @@ public function displayCommands(string $err = ''): void
         Cli::println($help);
     }
 
+    /**
+     * @param string $command
+     *
+     * @return bool
+     */
+    public function hasCommand(string $command): bool
+    {
+        return isset($this->commands[$command]);
+    }
+
     /****************************************************************************
      * getter/setter methods
      ****************************************************************************/
@@ -462,12 +469,20 @@ public function getScriptFile(): string
         return $this->scriptFile;
     }
 
+    /**
+     * @return string
+     */
+    public function getBinName(): string
+    {
+        return $this->scriptName;
+    }
+
     /**
      * @return string
      */
     public function getScriptName(): string
     {
-        return basename($this->scriptFile);
+        return $this->scriptName;
     }
 
     /**

test/CliAppTest.php

@@ -0,0 +1,62 @@
+<?php declare(strict_types=1);
+
+namespace Toolkit\PFlagTest;
+
+use Toolkit\PFlag\CliApp;
+use Toolkit\Stdlib\Obj\DataObject;
+
+/**
+ * class CliAppTest
+ *
+ * @author inhere
+ */
+class CliAppTest extends BaseFlagsTestCase
+{
+    private function initApp(CliApp $app): DataObject
+    {
+        $buf = DataObject::new();
+        $app->add('test1', fn() => $buf->set('key', 'in test1'));
+        $app->addCommands([
+            'test2' => [
+                'desc'   => 'desc for test2 command',
+                'handler' => fn() => $buf->set('key', 'in test2'),
+                'options' => [
+                    'opt1' => 'string;a string opt1 for command test2',
+                    'opt2' => 'int;a int opt2 for command test2',
+                ],
+            ],
+        ]);
+
+        return $buf;
+    }
+
+    public function testCliApp_basic(): void
+    {
+        $app = CliApp::global();
+        $app->setScriptFile('/path/myapp');
+
+        $this->assertEquals('/path/myapp', $app->getScriptFile());
+        $this->assertEquals('myapp', $app->getBinName());
+        $this->assertEquals('myapp', $app->getScriptName());
+        $this->assertFalse($app->hasCommand('test1'));
+
+        $buf = $this->initApp($app);
+
+        $this->assertTrue($app->hasCommand('test1'));
+        $this->assertTrue($app->hasCommand('test2'));
+
+        $app->runByArgs(['test1']);
+        $this->assertEquals('in test1', $buf->get('key'));
+    }
+
+    public function testCliApp_showHelp(): void
+    {
+        $app = new CliApp();
+        $this->initApp($app);
+
+        $this->assertTrue($app->hasCommand('test1'));
+        $this->assertTrue($app->hasCommand('test2'));
+
+        $app->runByArgs(['-h']);
+    }
+}