Moved test to FindEndOfStatementTest file

squizlabs · Dec 8, 2019 · 17f5e17 · 17f5e17
1 parent 1be4196
commit 17f5e17
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/tests/Core/File/FindEndOfStatementTest.inc b/tests/Core/File/FindEndOfStatementTest.inc
@@ -35,3 +35,8 @@ $a = [
     'a' => fn() => return 1,
     'b' => fn() => return 1,
 ];
+
+/* testArrowFunctionEndOfStatement */
+static fn ($a) => $a;
+
+return 0;
diff --git a/tests/Core/File/FindEndOfStatementTest.php b/tests/Core/File/FindEndOfStatementTest.php
@@ -188,4 +188,22 @@ public function testArrowFunctionArrayValue()
     }//end testArrowFunctionArrayValue()
 
 
+    /**
+     * Test end of statement for fn closure.
+     *
+     * @return void
+     */
+    public function testArrayFunctionEndOfStatement()
+    {
+        $static = (self::$phpcsFile->findNext(T_COMMENT, 0, null, false, '/* testArrowFunctionEndOfStatement */') + 2);
+        $fn     = self::$phpcsFile->findNext(T_FN, ($static + 1));
+
+        $endOfStatementStatic = self::$phpcsFile->findEndOfStatement($static);
+        $endOfStatementFn     = self::$phpcsFile->findEndOfStatement($fn);
+
+        $this->assertSame($endOfStatementFn, $endOfStatementStatic);
+
+    }//end testArrayFunctionEndOfStatement()
+
+
 }//end class
diff --git a/tests/Core/Tokenizer/BackfillFnTokenTest.inc b/tests/Core/Tokenizer/BackfillFnTokenTest.inc
@@ -69,8 +69,3 @@ fn(callable $a) : callable => $a;
 
 /* testTernary */
 $fn = fn($a) => $a ? /* testTernaryThen */ fn() : string => 'a' : /* testTernaryElse */ fn() : string => 'b';
-
-/* testEndOfStatement */
-static fn ($a) => $a;
-
-return 0;
diff --git a/tests/Core/Tokenizer/BackfillFnTokenTest.php b/tests/Core/Tokenizer/BackfillFnTokenTest.php
@@ -594,23 +594,4 @@ private function backfillHelper($token)
     }//end backfillHelper()
 
 
-    /**
-     * Test end of statement for fn closure.
-     *
-     * @return void
-     */
-    public function testEndOfStatement()
-    {
-        $token = $this->getTargetToken('/* testEndOfStatement */', T_FN);
-        $this->backfillHelper($token);
-
-        $static = self::$phpcsFile->findPrevious(T_STATIC, ($token - 1));
-        $endOfStatementStatic = self::$phpcsFile->findEndOfStatement($static);
-        $endOfStatementFn     = self::$phpcsFile->findEndOfStatement($token);
-
-        $this->assertSame($endOfStatementFn, $endOfStatementStatic);
-
-    }//end testEndOfStatement()
-
-
 }//end class