Support and use HackTest v1.0

- depend-dev on hacktest v1
- migration uses new `HackTest` class instead of v0.x `HackTestCase`
- migration will also migrate `HackTestCase` to `HackTest`

composer.json

@@ -11,7 +11,7 @@
         "facebook/fbexpect": "^2.1.1",
         "facebook/hack-codegen": "~3.2.1",
         "hhvm/hhvm-autoload": "^1.5",
-        "hhvm/hacktest": "^0.2.0"
+        "hhvm/hacktest": "^1.0"
     },
     "require": {
         "hhvm": "^3.28.0",

src/Migrations/PHPUnitToHackTestMigration.php

@@ -25,7 +25,9 @@ private function replaceQualifiedName(
       $name !== "\\PHPUnit_Framework_TestCase" &&
       $name !== "\\PHPUnit\\Framework\\TestCase" &&
       $name !== "PHPUnit_Framework_TestCase" &&
-      $name !== "PHPUnit\\Framework\\TestCase"
+      $name !== "PHPUnit\\Framework\\TestCase" &&
+      $name !== "Facebook\\HackTest\\HackTestCase" &&
+      $name !== "\\Facebook\\HackTest\\HackTestCase"
     ) {
       return $in;
     }
@@ -38,7 +40,7 @@ private function replaceQualifiedName(
         new HHAST\BackslashToken($m, $m),
         new HHAST\NameToken($m, $m, "HackTest"),
         new HHAST\BackslashToken($m, $m),
-        new HHAST\NameToken($m, $m, "HackTestCase"),
+        new HHAST\NameToken($m, $m, "HackTest"),
       ],
     );
 
@@ -218,7 +220,8 @@ final private function replaceUsedTypes(HHAST\Script $script): HHAST\Script {
       |> Dict\filter(
         $$,
         $resolved ==> $resolved === 'PHPUnit_Framework_TestCase' ||
-          $resolved === 'PHPUnit\\Framework\\TestCase',
+          $resolved === 'PHPUnit\\Framework\\TestCase' ||
+          $resolved === 'Facebook\\HackTest\\HackTestCase'
       );
     if (C\is_empty($uses)) {
       return $script;
@@ -251,12 +254,12 @@ final private function replaceUsedTypes(HHAST\Script $script): HHAST\Script {
           return $node;
         }
 
-        return $node->replace($extends, $extends->withText('HackTestCase'));
+        return $node->replace($extends, $extends->withText('HackTest'));
       },
     );
   }
 
-  private function getQualifiedNameForHackTestCase(): HHAST\QualifiedName {
+  private function getQualifiedNameForHackTest(): HHAST\QualifiedName {
     $m = HHAST\Missing();
     return new HHAST\QualifiedName(
       new HHAST\EditableList(
@@ -265,7 +268,7 @@ private function getQualifiedNameForHackTestCase(): HHAST\QualifiedName {
           new HHAST\BackslashToken($m, $m),
           new HHAST\NameToken($m, $m, "HackTest"),
           new HHAST\BackslashToken($m, $m),
-          new HHAST\NameToken($m, $m, "HackTestCase"),
+          new HHAST\NameToken($m, $m, "HackTest"),
         ],
       ),
     );
@@ -280,7 +283,7 @@ private function replaceUseClause(
       if ($what->getText() !== "PHPUnit_Framework_TestCase") {
         return $node;
       }
-      return $node->withName($this->getQualifiedNameForHackTestCase());
+      return $node->withName($this->getQualifiedNameForHackTest());
     }
 
     if (!$what is HHAST\QualifiedName) {
@@ -293,11 +296,12 @@ private function replaceUseClause(
       |> Str\strip_prefix($$, '\\');
     if (
       $text !== 'PHPUnit_Framework_TestCase' &&
-      $text !== 'PHPUnit\\Framework\\TestCase'
+      $text !== 'PHPUnit\\Framework\\TestCase' &&
+      $text !== 'Facebook\\HackTest\\HackTestCase'
     ) {
       return $node;
     }
-    return $node->withName($this->getQualifiedNameForHackTestCase());
+    return $node->withName($this->getQualifiedNameForHackTest());
   }
 
   private function renameSetUpTearDownFunctions(

src/__Private/MigrationCLI.php

@@ -101,8 +101,7 @@ protected function getSupportedOptions(): vec<CLIOptions\CLIOption> {
       ),
       CLIOptions\flag(
         () ==> { $this->migrations[] = PHPUnitToHackTestMigration::class; },
-        'Migrate from PHPUnit to HackTest. You may need to run '.
-        '--assert-to-expect first.',
+        'Migrate from PHPUnit to HackTest',
         '--phpunit-to-hacktest',
       ),
       CLIOptions\flag(

tests/TestCase.php

@@ -13,7 +13,7 @@
 
 use namespace HH\Lib\C;
 
-abstract class TestCase extends \Facebook\HackTest\HackTestCase {
+abstract class TestCase extends \Facebook\HackTest\HackTest {
   protected static function getNodeAndParents(
     string $code,
   ): (EditableNode, vec<EditableNode>) {

tests/fixtures/migrations/PHPUnitToHackTest/dataprovider_and_comment.php.expect

@@ -13,7 +13,7 @@
 
 namespace MyNS;
 
-final class FooTest extends \Facebook\HackTest\HackTestCase {
+final class FooTest extends \Facebook\HackTest\HackTest {
   public function provideFoo(): array<array<string>> {
     return [['abc']];
   }

tests/fixtures/migrations/PHPUnitToHackTest/new_name_no_ns.php.expect

@@ -11,7 +11,7 @@
  *
  */
 
-final class FooTest extends Facebook\HackTest\HackTestCase {
+final class FooTest extends Facebook\HackTest\HackTest {
   public function provideFoo(): array<array<string>> {
     return [['abc']];
   }
@@ -21,5 +21,5 @@ final class FooTest extends Facebook\HackTest\HackTestCase {
   }
 }
 
-final class BarTest extends \Facebook\HackTest\HackTestCase {
+final class BarTest extends \Facebook\HackTest\HackTest {
 }

tests/fixtures/migrations/PHPUnitToHackTest/new_name_no_ns_with_use.php.expect

@@ -11,9 +11,9 @@
  *
  */
 
-use type Facebook\HackTest\HackTestCase;
+use type Facebook\HackTest\HackTest;
 
-final class FooTest extends HackTestCase {
+final class FooTest extends HackTest {
   public function provideFoo(): array<array<string>> {
     return [['abc']];
   }

tests/fixtures/migrations/PHPUnitToHackTest/new_name_ns_direct.php.expect

@@ -13,7 +13,7 @@
 
 namespace MyNS;
 
-final class FooTest extends \Facebook\HackTest\HackTestCase {
+final class FooTest extends \Facebook\HackTest\HackTest {
   public function provideFoo(): array<array<string>> {
     return [['abc']];
   }

tests/fixtures/migrations/PHPUnitToHackTest/old_name_no_ns.php.expect

@@ -21,5 +21,5 @@ final class FooTest extends PHPUnit_Framework_TestCase {
   }
 }
 
-final class BarTest extends \Facebook\HackTest\HackTestCase {
+final class BarTest extends \Facebook\HackTest\HackTest {
 }

tests/fixtures/migrations/PHPUnitToHackTest/old_name_ns_direct.php.expect

@@ -13,7 +13,7 @@
 
 namespace MyNS;
 
-final class FooTest extends \Facebook\HackTest\HackTestCase {
+final class FooTest extends \Facebook\HackTest\HackTest {
   public function provideFoo(): array<array<string>> {
     return [['abc']];
   }

tests/fixtures/migrations/PHPUnitToHackTest/old_name_ns_with_use.php.expect

@@ -11,9 +11,9 @@
  *
  */
 
-use type Facebook\HackTest\HackTestCase;
+use type Facebook\HackTest\HackTest;
 
-final class FooTest extends HackTestCase {
+final class FooTest extends HackTest {
   public function provideFoo(): array<array<string>> {
     return [['abc']];
   }