Replaced most "api_get_user" calls with newer BaseApi calls

[friendica.git] / tests / src / App / ArgumentsTest.php

diff --git a/tests/src/App/ArgumentsTest.php b/tests/src/App/ArgumentsTest.php
index a7ef451d985d6d1a42207180b24365b02b9d1f1a..8243205ff68b70ad798e08367eaeb06d45fd94d8 100644 (file)
--- a/tests/src/App/ArgumentsTest.php
+++ b/tests/src/App/ArgumentsTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,11 +28,11 @@ class ArgumentsTest extends TestCase
 {
        private function assertArguments(array $assert, App\Arguments $arguments)
        {
-               $this->assertEquals($assert['queryString'], $arguments->getQueryString());
-               $this->assertEquals($assert['command'], $arguments->getCommand());
-               $this->assertEquals($assert['argv'], $arguments->getArgv());
-               $this->assertEquals($assert['argc'], $arguments->getArgc());
-               $this->assertCount($assert['argc'], $arguments->getArgv());
+               self::assertEquals($assert['queryString'], $arguments->getQueryString());
+               self::assertEquals($assert['command'], $arguments->getCommand());
+               self::assertEquals($assert['argv'], $arguments->getArgv());
+               self::assertEquals($assert['argc'], $arguments->getArgc());
+               self::assertCount($assert['argc'], $arguments->getArgv());
        }
 
        /**
@@ -42,11 +42,11 @@ class ArgumentsTest extends TestCase
        {
                $arguments = new App\Arguments();
 
-               $this->assertArguments([
+               self::assertArguments([
                        'queryString' => '',
                        'command'     => '',
-                       'argv'        => ['home'],
-                       'argc'        => 1,
+                       'argv'        => [],
+                       'argc'        => 0,
                ],
                        $arguments);
        }
@@ -62,108 +62,106 @@ class ArgumentsTest extends TestCase
                                        'argc'        => 3,
                                ],
                                'server' => [
-                                       'QUERY_STRING' => 'pagename=profile/test/it?arg1=value1&arg2=value2',
+                                       'QUERY_STRING' => 'pagename=profile/test/it&arg1=value1&arg2=value2',
                                ],
                                'get'    => [
                                        'pagename' => 'profile/test/it',
                                ],
                        ],
-                       'withQ'                => [
+                       'withUnixHomeDir'      => [
                                'assert' => [
-                                       'queryString' => 'profile/test/it?arg1=value1&arg2=value2',
-                                       'command'     => 'profile/test/it',
-                                       'argv'        => ['profile', 'test', 'it'],
-                                       'argc'        => 3,
+                                       'queryString' => '~test/it?arg1=value1&arg2=value2',
+                                       'command'     => '~test/it',
+                                       'argv'        => ['~test', 'it'],
+                                       'argc'        => 2,
                                ],
                                'server' => [
-                                       'QUERY_STRING' => 'q=profile/test/it?arg1=value1&arg2=value2',
+                                       'QUERY_STRING' => 'pagename=~test/it&arg1=value1&arg2=value2',
                                ],
                                'get'    => [
-                                       'q' => 'profile/test/it',
+                                       'pagename' => '~test/it',
                                ],
                        ],
-                       'withWrongDelimiter'   => [
+                       'withDiasporaHomeDir'  => [
                                'assert' => [
-                                       'queryString' => 'profile/test/it?arg1=value1&arg2=value2',
-                                       'command'     => 'profile/test/it',
-                                       'argv'        => ['profile', 'test', 'it'],
+                                       'queryString' => 'u/test/it?arg1=value1&arg2=value2',
+                                       'command'     => 'u/test/it',
+                                       'argv'        => ['u', 'test', 'it'],
                                        'argc'        => 3,
                                ],
                                'server' => [
-                                       'QUERY_STRING' => 'pagename=profile/test/it&arg1=value1&arg2=value2',
+                                       'QUERY_STRING' => 'pagename=u/test/it&arg1=value1&arg2=value2',
                                ],
                                'get'    => [
-                                       'pagename' => 'profile/test/it',
+                                       'pagename' => 'u/test/it',
                                ],
                        ],
-                       'withUnixHomeDir'      => [
+                       'withTrailingSlash'    => [
                                'assert' => [
-                                       'queryString' => '~test/it?arg1=value1&arg2=value2',
+                                       'queryString' => 'profile/test/it?arg1=value1&arg2=value2%2F',
                                        'command'     => 'profile/test/it',
                                        'argv'        => ['profile', 'test', 'it'],
                                        'argc'        => 3,
                                ],
                                'server' => [
-                                       'QUERY_STRING' => 'pagename=~test/it?arg1=value1&arg2=value2',
+                                       'QUERY_STRING' => 'pagename=profile/test/it&arg1=value1&arg2=value2/',
                                ],
                                'get'    => [
-                                       'pagename' => '~test/it',
+                                       'pagename' => 'profile/test/it',
                                ],
                        ],
-                       'withDiasporaHomeDir'  => [
+                       'withWrongQueryString' => [
                                'assert' => [
-                                       'queryString' => 'u/test/it?arg1=value1&arg2=value2',
+                                       'queryString' => 'profile/test/it?wrong=profile%2Ftest%2Fit&arg1=value1&arg2=value2%2F',
                                        'command'     => 'profile/test/it',
                                        'argv'        => ['profile', 'test', 'it'],
                                        'argc'        => 3,
                                ],
                                'server' => [
-                                       'QUERY_STRING' => 'pagename=u/test/it?arg1=value1&arg2=value2',
+                                       'QUERY_STRING' => 'wrong=profile/test/it&arg1=value1&arg2=value2/',
                                ],
                                'get'    => [
-                                       'pagename' => 'u/test/it',
+                                       'pagename' => 'profile/test/it',
                                ],
                        ],
-                       'withTrailingSlash'    => [
+                       'withMissingPageName'  => [
                                'assert' => [
-                                       'queryString' => 'profile/test/it?arg1=value1&arg2=value2/',
-                                       'command'     => 'profile/test/it',
-                                       'argv'        => ['profile', 'test', 'it'],
-                                       'argc'        => 3,
+                                       'queryString' => 'notvalid/it?arg1=value1&arg2=value2%2F',
+                                       'command'     => 'notvalid/it',
+                                       'argv'        => ['notvalid', 'it'],
+                                       'argc'        => 2,
                                ],
                                'server' => [
-                                       'QUERY_STRING' => 'pagename=profile/test/it?arg1=value1&arg2=value2/',
+                                       'QUERY_STRING' => 'pagename=notvalid/it&arg1=value1&arg2=value2/',
                                ],
                                'get'    => [
-                                       'pagename' => 'profile/test/it',
                                ],
                        ],
-                       'withWrongQueryString' => [
+                       'withNothing'  => [
                                'assert' => [
-                                       // empty query string?!
-                                       'queryString' => '',
-                                       'command'     => 'profile/test/it',
-                                       'argv'        => ['profile', 'test', 'it'],
-                                       'argc'        => 3,
+                                       'queryString' => '?arg1=value1&arg2=value2%2F',
+                                       'command'     => '',
+                                       'argv'        => [],
+                                       'argc'        => 0,
                                ],
                                'server' => [
-                                       'QUERY_STRING' => 'wrong=profile/test/it?arg1=value1&arg2=value2/',
+                                       'QUERY_STRING' => 'arg1=value1&arg2=value2/',
                                ],
                                'get'    => [
-                                       'pagename' => 'profile/test/it',
                                ],
                        ],
-                       'withMissingPageName'  => [
+                       'withFileExtension'  => [
                                'assert' => [
-                                       'queryString' => 'notvalid/it?arg1=value1&arg2=value2/',
-                                       'command'     => App\Module::DEFAULT,
-                                       'argv'        => [App\Module::DEFAULT],
-                                       'argc'        => 1,
+                                       'queryString' => 'api/call.json',
+                                       'command'     => 'api/call.json',
+                                       'argv'        => ['api', 'call.json'],
+                                       'argc'        => 2,
                                ],
                                'server' => [
-                                       'QUERY_STRING' => 'pagename=notvalid/it?arg1=value1&arg2=value2/',
+                                       'QUERY_STRING' => 'pagename=api/call.json',
                                ],
                                'get'    => [
+                                       'pagename' => 'api/call.json'
                                ],
                        ],
                ];
@@ -179,7 +177,7 @@ class ArgumentsTest extends TestCase
                $arguments = (new App\Arguments())
                        ->determine($server, $get);
 
-               $this->assertArguments($assert, $arguments);
+               self::assertArguments($assert, $arguments);
        }
 
        /**
@@ -193,13 +191,13 @@ class ArgumentsTest extends TestCase
                        ->determine($server, $get);
 
                for ($i = 0; $i < $arguments->getArgc(); $i++) {
-                       $this->assertTrue($arguments->has($i));
-                       $this->assertEquals($assert['argv'][$i], $arguments->get($i));
+                       self::assertTrue($arguments->has($i));
+                       self::assertEquals($assert['argv'][$i], $arguments->get($i));
                }
 
-               $this->assertFalse($arguments->has($arguments->getArgc()));
-               $this->assertEmpty($arguments->get($arguments->getArgc()));
-               $this->assertEquals('default', $arguments->get($arguments->getArgc(), 'default'));
+               self::assertFalse($arguments->has($arguments->getArgc()));
+               self::assertEmpty($arguments->get($arguments->getArgc()));
+               self::assertEquals('default', $arguments->get($arguments->getArgc(), 'default'));
        }
 
        public function dataStripped()
@@ -207,27 +205,27 @@ class ArgumentsTest extends TestCase
                return [
                        'strippedZRLFirst'  => [
                                'assert' => '?arg1=value1',
-                               'input'  => '?zrl=nope&arg1=value1',
+                               'input'  => '&zrl=nope&arg1=value1',
                        ],
                        'strippedZRLLast'   => [
                                'assert' => '?arg1=value1',
-                               'input'  => '?arg1=value1&zrl=nope',
+                               'input'  => '&arg1=value1&zrl=nope',
                        ],
                        'strippedZTLMiddle' => [
                                'assert' => '?arg1=value1&arg2=value2',
-                               'input'  => '?arg1=value1&zrl=nope&arg2=value2',
+                               'input'  => '&arg1=value1&zrl=nope&arg2=value2',
                        ],
                        'strippedOWTFirst'  => [
                                'assert' => '?arg1=value1',
-                               'input'  => '?owt=test&arg1=value1',
+                               'input'  => '&owt=test&arg1=value1',
                        ],
                        'strippedOWTLast'   => [
                                'assert' => '?arg1=value1',
-                               'input'  => '?arg1=value1&owt=test',
+                               'input'  => '&arg1=value1&owt=test',
                        ],
                        'strippedOWTMiddle' => [
                                'assert' => '?arg1=value1&arg2=value2',
-                               'input'  => '?arg1=value1&owt=test&arg2=value2',
+                               'input'  => '&arg1=value1&owt=test&arg2=value2',
                        ],
                ];
        }
@@ -242,9 +240,9 @@ class ArgumentsTest extends TestCase
                $command = 'test/it';
 
                $arguments = (new App\Arguments())
-                       ->determine(['QUERY_STRING' => 'q=' . $command . $input,], ['pagename' => $command]);
+                       ->determine(['QUERY_STRING' => 'pagename=' . $command . $input,], ['pagename' => $command]);
 
-               $this->assertEquals($command . $assert, $arguments->getQueryString());
+               self::assertEquals($command . $assert, $arguments->getQueryString());
        }
 
        /**
@@ -256,6 +254,6 @@ class ArgumentsTest extends TestCase
 
                $argNew = $argument->determine([], []);
 
-               $this->assertNotSame($argument, $argNew);
+               self::assertNotSame($argument, $argNew);
        }
 }