Merge ExpectObj classes (#9)

Robert Lynch · facebook-github-bot · commit 94145a2cc56d · 2019-01-09T12:00:41.000-08:00
Summary: Pull Request resolved: #9 Pull Request resolved: hhvm/hsl-experimental#32 Pull Request resolved: hhvm/hsl#70 Merge the different ExpectObj implementations Reviewed By: nicoreed Differential Revision: D13605955 fbshipit-source-id: ce811d4e797b3507b75fe6d6d989281aff48ca78
diff --git a/tests/ClusterTest.php b/tests/ClusterTest.php
@@ -11,7 +11,8 @@
 namespace Facebook\DiffLib;
 
 use namespace HH\Lib\{C, Vec};
-use function Facebook\FBExpect\expect;
+// @oss-disable: use function \expect;
+use function Facebook\FBExpect\expect; // @oss-enable
 
 final class ClusterTest extends \Facebook\HackTest\HackTest {
   public function testReplaceTrailing(): void {
diff --git a/tests/RawDiffTest.php b/tests/RawDiffTest.php
@@ -11,7 +11,8 @@
 namespace Facebook\DiffLib;
 
 use namespace HH\Lib\{C, Vec};
-use function Facebook\FBExpect\expect;
+// @oss-disable: use function \expect;
+use function Facebook\FBExpect\expect; // @oss-enable
 
 /** Test raw diff ops - not unified diffs etc.
  *
diff --git a/tests/StringDiffTest.php b/tests/StringDiffTest.php
@@ -11,7 +11,8 @@
 namespace Facebook\DiffLib;
 
 use namespace HH\Lib\{C, Str, Vec};
-use function Facebook\FBExpect\expect;
+// @oss-disable: use function \expect;
+use function Facebook\FBExpect\expect; // @oss-enable
 
 // @oss-disable: use type \DataProvider;
 use type Facebook\HackTest\DataProvider; // @oss-enable

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`namespace Facebook\DiffLib;`
`12`	`12`
`13`	`13`	`use namespace HH\Lib\{C, Vec};`
`14`		`-use function Facebook\FBExpect\expect;`
	`14`	`+// @oss-disable: use function \expect;`
	`15`	`+use function Facebook\FBExpect\expect; // @oss-enable`
`15`	`16`
`16`	`17`	`/** Test raw diff ops - not unified diffs etc.`
`17`	`18`	`*`