support and require fbexpect 2.7.0+

Author: jjergus

composer.json

@@ -32,6 +32,7 @@
     ],
     "type": "library",
     "require-dev": {
+        "hhvm/fbexpect": "^2.7.0",
         "hhvm/hacktest": "^1.0",
         "hhvm/type-assert": "^3.1",
         "facebook/fbexpect": "^2.1.0",

tests/CodegenClassTest.hack

@@ -257,7 +257,7 @@ final class CodegenClassTest extends CodegenBaseTest {
     $cgf = $this->getCodegenFactory();
     $code = $cgf->codegenClass('Foo')->setExtendsf('X<%s>', 'Y')->render();
 
-    expect($code)->toContain('extends X<Y>');
+    expect($code)->toContainSubstring('extends X<Y>');
   }
 
   public function testGenericsWithSubtypeConstraints(): void {
@@ -266,7 +266,7 @@ final class CodegenClassTest extends CodegenBaseTest {
       ->addGenericSubtypeConstraint('T', 'U')
       ->render();
 
-    expect($code)->toContain('T as U');
+    expect($code)->toContainSubstring('T as U');
   }
 
   public function testGenericsWithSuperTypeConstraints(): void {
@@ -275,7 +275,7 @@ final class CodegenClassTest extends CodegenBaseTest {
       ->addGenericSupertypeConstraint('T', 'U')
       ->render();
 
-    expect($code)->toContain('T super U');
+    expect($code)->toContainSubstring('T super U');
   }
 
   public function testGenericsWithConstraints(): void {
@@ -288,9 +288,9 @@ final class CodegenClassTest extends CodegenBaseTest {
       ->addGeneric('Tsingle')
       ->render();
 
-    expect($code)->toContain('Tk as Tv');
-    expect($code)->toContain('Tu super Sp');
-    expect($code)->toContain('Tt as Xx');
-    expect($code)->toContain('Tsingle');
+    expect($code)->toContainSubstring('Tk as Tv');
+    expect($code)->toContainSubstring('Tu super Sp');
+    expect($code)->toContainSubstring('Tt as Xx');
+    expect($code)->toContainSubstring('Tsingle');
   }
 }

tests/CodegenFileTest.hack

@@ -315,7 +315,7 @@ final class CodegenFileTest extends CodegenBaseTest {
         ->setFileType(CodegenFileType::HACK_STRICT)
         ->setShebangLine('#!/usr/bin/env hhvm')
         ->render(),
-    )->toThrow(\HH\InvariantException::class);
+    )->toThrow(InvariantException::class);
   }
 
   public function testDotHackExecutable(): void {
@@ -341,7 +341,7 @@ final class CodegenFileTest extends CodegenBaseTest {
         ->setFileType(CodegenFileType::HACK_STRICT)
         ->setPseudoMainHeader('exit();')
         ->render(),
-    )->toThrow(\HH\InvariantException::class);
+    )->toThrow(InvariantException::class);
   }
 
   public function testNoPseudoMainFooterInStrict(): void {
@@ -351,7 +351,7 @@ final class CodegenFileTest extends CodegenBaseTest {
         ->setFileType(CodegenFileType::HACK_STRICT)
         ->setPseudoMainFooter('exit();')
         ->render(),
-    )->toThrow(\HH\InvariantException::class);
+    )->toThrow(InvariantException::class);
   }
 
   public function testFormattingFullyGeneratedFile(): void {

tests/HackBuilderTest.hack

@@ -373,8 +373,8 @@ $del."extends SomeBaseClass",
         HackBuilderValues::vector(HackBuilderValues::export()),
       )
       ->getCode();
-    expect($body)->toContain('Vector');
-    expect($body)->toNotContain('HH');
+    expect($body)->toContainSubstring('Vector');
+    expect($body)->toNotContainSubstring('HH');
     expect_with_context(static::class, $body)->toBeUnchanged();
   }