From ad10ed80d6eace73cde16f330266f1069aa55f93 Mon Sep 17 00:00:00 2001
From: "Maxim.Kolmakov" <maxim.kolmakov@jetbrains.com>
Date: Thu, 24 Jan 2019 13:56:42 +0100
Subject: [PATCH] Run test in the folder instead of single file

---
 .travis.yml                                   |  3 +--
 docker-compose.yml                            |  3 +--
 ...php => StubsMetaExpectedArgumentsTest.php} | 19 ++++++++++++-------
 tests/{TestStubs.php => StubsTest.php}        |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)
 rename tests/{TestStubsMetaExpectedArguments.php => StubsMetaExpectedArgumentsTest.php} (87%)
 rename tests/{TestStubs.php => StubsTest.php} (99%)

diff --git a/.travis.yml b/.travis.yml
index 04b839c5..97e06e14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,4 @@ install:
   - composer install --ignore-platform-reqs
 script:
   - docker-compose -f docker-compose.yml pull
-  - docker-compose -f docker-compose.yml build
-  - docker-compose -f docker-compose.yml run php
+  - docker-compose -f docker-compose.yml run php /opt/project/vendor/bin/phpunit /opt/project/tests/
diff --git a/docker-compose.yml b/docker-compose.yml
index 16aa1cb5..f1d36fd4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,5 +3,4 @@ services:
   php:
     image: php:7.3
     volumes:
-     - .:/opt/project
-    command: /opt/project/vendor/bin/phpunit /opt/project/tests/TestStubs.php
\ No newline at end of file
+     - .:/opt/project
\ No newline at end of file
diff --git a/tests/TestStubsMetaExpectedArguments.php b/tests/StubsMetaExpectedArgumentsTest.php
similarity index 87%
rename from tests/TestStubsMetaExpectedArguments.php
rename to tests/StubsMetaExpectedArgumentsTest.php
index 1a7883db..382e638c 100644
--- a/tests/TestStubsMetaExpectedArguments.php
+++ b/tests/StubsMetaExpectedArgumentsTest.php
@@ -2,13 +2,18 @@
 
 namespace StubTests;
 
+use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Expr\ConstFetch;
+use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\StaticCall;
 use PHPUnit\Framework\TestCase;
+use StubTests\Model\PHPConst;
 use StubTests\Model\StubsContainer;
 use StubTests\Parsers\ExpectedFunctionArgumentsInfo;
 use StubTests\Parsers\MetaExpectedArgumentsCollector;
 use StubTests\TestData\Providers\PhpStormStubsSingleton;
 
-class TestStubsMetaExpectedArguments extends TestCase
+class StubsMetaExpectedArgumentsTest extends TestCase
 {
     /**
      * @var ExpectedFunctionArgumentsInfo[]
@@ -25,7 +30,7 @@ class TestStubsMetaExpectedArguments extends TestCase
         self::$functionsFqns = array_map(function (Model\PHPFunction $func) {
             return self::toPresentableFqn((string)$func->name);
         }, $stubs->getFunctions());
-        self::$methodsFqns = self::getMethodsFqns($stubs);;
+        self::$methodsFqns = self::getMethodsFqns($stubs);
         self::$constantsFqns = self::getConstantsFqns($stubs);
     }
 
@@ -40,7 +45,7 @@ class TestStubsMetaExpectedArguments extends TestCase
 
     public static function getConstantsFqns(StubsContainer $stubs): array
     {
-        $constants = array_map(function (\StubTests\Model\PHPConst $constant) {
+        $constants = array_map(function (PHPConst $constant) {
             return self::toPresentableFqn((string)$constant->name);
         }, $stubs->getConstants());
         foreach ($stubs->getClasses() as $class) {
@@ -67,10 +72,10 @@ class TestStubsMetaExpectedArguments extends TestCase
     {
         foreach (self::$expectedArguments as $argument) {
             $expr = $argument->getFunctionReference();
-            if ($expr instanceof \PhpParser\Node\Expr\FuncCall) {
+            if ($expr instanceof FuncCall) {
                 $fqn = self::toPresentableFqn($expr->name);
                 self::assertArrayHasKey($fqn, self::$functionsFqns, "Can't resolve function " . $fqn);
-            } else if ($expr instanceof \PhpParser\Node\Expr\StaticCall) {
+            } else if ($expr instanceof StaticCall) {
                 if ((string)$expr->name !== '__construct') {
                     $fqn = self::getClassMemberFqn($expr->class, $expr->name);
                     self::assertArrayHasKey($fqn, self::$methodsFqns, "Can't resolve method " . $fqn);
@@ -87,10 +92,10 @@ class TestStubsMetaExpectedArguments extends TestCase
             $expectedArguments = $argument->getExpectedArguments();
             self::assertNotEmpty($expectedArguments, 'Expected arguments should not be empty for ' . $argument);
             foreach ($expectedArguments as $constantReference) {
-                if ($constantReference instanceof \PhpParser\Node\Expr\ClassConstFetch) {
+                if ($constantReference instanceof ClassConstFetch) {
                     $fqn = self::getClassMemberFqn($constantReference->class, $constantReference->name);
                     self::assertArrayHasKey($fqn, self::$constantsFqns, "Can't resolve class constant " . $fqn);
-                } else if ($constantReference instanceof \PhpParser\Node\Expr\ConstFetch) {
+                } else if ($constantReference instanceof ConstFetch) {
                     $fqn = self::toPresentableFqn((string)$constantReference->name);
                     self::assertArrayHasKey($fqn, self::$constantsFqns, "Can't resolve constant " . $fqn);
                 }
diff --git a/tests/TestStubs.php b/tests/StubsTest.php
similarity index 99%
rename from tests/TestStubs.php
rename to tests/StubsTest.php
index 3fafb9dc..71525a4f 100644
--- a/tests/TestStubs.php
+++ b/tests/StubsTest.php
@@ -17,7 +17,7 @@ use StubTests\Model\PHPMethod;
 use StubTests\Model\StubProblemType;
 use StubTests\TestData\Providers\PhpStormStubsSingleton;
 
-class TestStubs extends TestCase
+class StubsTest extends TestCase
 {
     /**
      * @dataProvider \StubTests\TestData\Providers\ReflectionTestDataProviders::constantProvider