From 3680bb79e11d7ee2b697308d92288d0873ad5aa2 Mon Sep 17 00:00:00 2001
From: liuxingbaoyu <30521560+liuxingbaoyu@users.noreply.github.com>
Date: Tue, 26 Jul 2022 10:30:41 +0800
Subject: [PATCH] Update some tests (#13176)

* Revert "Disable a test (#13159)"

This reverts commit 26cf77a5d5d621d183a92245108720929076f8fc.

* remove a test case
---
 tests/config/format-test.js                   |   2 -
 .../strings/__snapshots__/jsfmt.spec.js.snap  |  44 ++++++
 tests/format/js/strings/jsfmt.spec.js         |  15 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 140 +++++++++++++++++-
 .../optional-variance/jsfmt.spec.js           |   4 +-
 .../typescript/optional-variance/with-jsx.tsx |   3 -
 6 files changed, 192 insertions(+), 16 deletions(-)

diff --git a/tests/config/format-test.js b/tests/config/format-test.js
index 366d4c498467..98151797d787 100644
--- a/tests/config/format-test.js
+++ b/tests/config/format-test.js
@@ -52,8 +52,6 @@ const espreeDisabledTests = new Set(
   [
     // These tests only work for `babel`
     "comments-closure-typecast",
-    // Unknown reason https://github.com/babel/babel/pull/14779#discussion_r928137651
-    "strings",
   ].map((directory) => path.join(__dirname, "../format/js", directory))
 );
 const acornDisabledTests = espreeDisabledTests;
diff --git a/tests/format/js/strings/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/strings/__snapshots__/jsfmt.spec.js.snap
index 4da5b3c205df..dc97633deb10 100644
--- a/tests/format/js/strings/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/format/js/strings/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,49 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`non-octal-eight-and-nine.js [acorn] format 1`] = `
+"Invalid escape sequence (3:3)
+  1 | // https://github.com/babel/babel/pull/11852
+  2 |
+> 3 | "\\8","\\9";
+    |   ^
+  4 | () => {
+  5 |   "use strict";
+  6 |   "\\8", "\\9";"
+`;
+
+exports[`non-octal-eight-and-nine.js [espree] format 1`] = `
+"Invalid escape sequence (3:3)
+  1 | // https://github.com/babel/babel/pull/11852
+  2 |
+> 3 | "\\8","\\9";
+    |   ^
+  4 | () => {
+  5 |   "use strict";
+  6 |   "\\8", "\\9";"
+`;
+
+exports[`non-octal-eight-and-nine.js - {"trailingComma":"all"} [acorn] format 1`] = `
+"Invalid escape sequence (3:3)
+  1 | // https://github.com/babel/babel/pull/11852
+  2 |
+> 3 | "\\8","\\9";
+    |   ^
+  4 | () => {
+  5 |   "use strict";
+  6 |   "\\8", "\\9";"
+`;
+
+exports[`non-octal-eight-and-nine.js - {"trailingComma":"all"} [espree] format 1`] = `
+"Invalid escape sequence (3:3)
+  1 | // https://github.com/babel/babel/pull/11852
+  2 |
+> 3 | "\\8","\\9";
+    |   ^
+  4 | () => {
+  5 |   "use strict";
+  6 |   "\\8", "\\9";"
+`;
+
 exports[`non-octal-eight-and-nine.js - {"trailingComma":"all"} format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow"]
diff --git a/tests/format/js/strings/jsfmt.spec.js b/tests/format/js/strings/jsfmt.spec.js
index 23e9edc554f5..c1f60b1648bb 100644
--- a/tests/format/js/strings/jsfmt.spec.js
+++ b/tests/format/js/strings/jsfmt.spec.js
@@ -1,2 +1,13 @@
-run_spec(import.meta, ["babel", "flow"]);
-run_spec(import.meta, ["babel", "flow"], { trailingComma: "all" });
+run_spec(import.meta, ["babel", "flow"], {
+  errors: {
+    acorn: ["non-octal-eight-and-nine.js"],
+    espree: ["non-octal-eight-and-nine.js"],
+  },
+});
+run_spec(import.meta, ["babel", "flow"], {
+  trailingComma: "all",
+  errors: {
+    acorn: ["non-octal-eight-and-nine.js"],
+    espree: ["non-octal-eight-and-nine.js"],
+  },
+});
diff --git a/tests/format/typescript/optional-variance/__snapshots__/jsfmt.spec.js.snap b/tests/format/typescript/optional-variance/__snapshots__/jsfmt.spec.js.snap
index ff238fb554f1..0354574d02f9 100644
--- a/tests/format/typescript/optional-variance/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/format/typescript/optional-variance/__snapshots__/jsfmt.spec.js.snap
@@ -140,9 +140,6 @@ parsers: ["typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
-// valid JSX
-<in T>() => {}</in>;
-
 type Covariant<out T> = {
     x: T;
 }
@@ -206,9 +203,6 @@ declare class StateNode<TContext, in out TEvent extends { type: string }> {
 }
 
 =====================================output=====================================
-// valid JSX
-<in T>() => {}</in>;
-
 type Covariant<out T> = {
   x: T;
 };
@@ -283,3 +277,137 @@ exports[`with-jsx.tsx [typescript] format 1`] = `
   4 | type Covariant<out T> = {
   5 |     x: T;"
 `;
+
+exports[`with-jsx.tsx format 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+type Covariant<out T> = {
+    x: T;
+}
+type Contravariant<in T> = {
+    f: (x: T) => void;
+}
+type Invariant<in out T> = {
+    f: (x: T) => T;
+}
+type T10<out T> = T;
+type T11<in T> = keyof T;
+type T12<out T, out K extends keyof T> = T[K];
+type T13<in out T> = T[keyof T];
+
+type Covariant1<in T> = {
+    x: T;
+}
+
+type Contravariant1<out T> = keyof T;
+
+type Contravariant2<out T> = {
+    f: (x: T) => void;
+}
+
+type Invariant1<in T> = {
+    f: (x: T) => T;
+}
+
+type Invariant2<out T> = {
+    f: (x: T) => T;
+}
+type Foo1<in T> = {
+    x: T;
+    f: FooFn1<T>;
+}
+
+type Foo2<out T> = {
+    x: T;
+    f: FooFn2<T>;
+}
+
+type Foo3<in out T> = {
+    x: T;
+    f: FooFn3<T>;
+}
+
+type T21<in out T> = T;
+
+interface Baz<out T> {}
+interface Baz<in T> {}
+
+interface Parent<out A> {
+    child: Child<A> | null;
+    parent: Parent<A> | null;
+}
+
+declare class StateNode<TContext, in out TEvent extends { type: string }> {
+    _storedEvent: TEvent;
+    _action: ActionObject<TEvent>;
+    _state: StateNode<TContext, any>;
+}
+
+=====================================output=====================================
+type Covariant<out T> = {
+  x: T;
+};
+type Contravariant<in T> = {
+  f: (x: T) => void;
+};
+type Invariant<in out T> = {
+  f: (x: T) => T;
+};
+type T10<out T> = T;
+type T11<in T> = keyof T;
+type T12<out T, out K extends keyof T> = T[K];
+type T13<in out T> = T[keyof T];
+
+type Covariant1<in T> = {
+  x: T;
+};
+
+type Contravariant1<out T> = keyof T;
+
+type Contravariant2<out T> = {
+  f: (x: T) => void;
+};
+
+type Invariant1<in T> = {
+  f: (x: T) => T;
+};
+
+type Invariant2<out T> = {
+  f: (x: T) => T;
+};
+type Foo1<in T> = {
+  x: T;
+  f: FooFn1<T>;
+};
+
+type Foo2<out T> = {
+  x: T;
+  f: FooFn2<T>;
+};
+
+type Foo3<in out T> = {
+  x: T;
+  f: FooFn3<T>;
+};
+
+type T21<in out T> = T;
+
+interface Baz<out T> {}
+interface Baz<in T> {}
+
+interface Parent<out A> {
+  child: Child<A> | null;
+  parent: Parent<A> | null;
+}
+
+declare class StateNode<TContext, in out TEvent extends { type: string }> {
+  _storedEvent: TEvent;
+  _action: ActionObject<TEvent>;
+  _state: StateNode<TContext, any>;
+}
+
+================================================================================
+`;
diff --git a/tests/format/typescript/optional-variance/jsfmt.spec.js b/tests/format/typescript/optional-variance/jsfmt.spec.js
index 72e980aee6c2..29084a9c8a10 100644
--- a/tests/format/typescript/optional-variance/jsfmt.spec.js
+++ b/tests/format/typescript/optional-variance/jsfmt.spec.js
@@ -1,3 +1 @@
-run_spec(import.meta, ["typescript"], {
-  errors: { typescript: ["with-jsx.tsx"] },
-});
+run_spec(import.meta, ["typescript"]);
diff --git a/tests/format/typescript/optional-variance/with-jsx.tsx b/tests/format/typescript/optional-variance/with-jsx.tsx
index bd14abc7a9e5..9210edb034ae 100644
--- a/tests/format/typescript/optional-variance/with-jsx.tsx
+++ b/tests/format/typescript/optional-variance/with-jsx.tsx
@@ -1,6 +1,3 @@
-// valid JSX
-<in T>() => {}</in>;
-
 type Covariant<out T> = {
     x: T;
 }