From 4e3e82ee3fd7754fdd0f97e904763116e2a058db Mon Sep 17 00:00:00 2001
From: Caio Lima <ticaiolima@gmail.com>
Date: Wed, 6 Feb 2019 18:18:48 -0200
Subject: [PATCH] Fixing async tests and other NIT changes

---
 .../private-field-as-arrow-function.case               |  2 --
 .../private-field-as-async-arrow-function.case         | 10 +++-------
 .../private-field-as-async-function.case               | 10 +++-------
 src/class-elements/private-field-as-function.case      |  2 --
 .../private-field-super-access-throws.case             |  6 +++---
 .../elements/private-field-as-async-arrow-function.js  |  9 +++------
 .../class/elements/private-field-as-async-function.js  |  9 +++------
 .../elements/private-field-super-access-throws.js      |  6 +++---
 .../elements/private-field-as-async-arrow-function.js  |  9 +++------
 .../class/elements/private-field-as-async-function.js  |  9 +++------
 .../elements/private-field-super-access-throws.js      |  6 +++---
 11 files changed, 27 insertions(+), 51 deletions(-)

diff --git a/src/class-elements/private-field-as-arrow-function.case b/src/class-elements/private-field-as-arrow-function.case
index 5d74655e68..9745282072 100644
--- a/src/class-elements/private-field-as-arrow-function.case
+++ b/src/class-elements/private-field-as-arrow-function.case
@@ -1,6 +1,4 @@
 // Copyright (C) 2019 Caio Lima. All rights reserved.
-// Copyright (C) 2018 Jaideep Bhoosreddy (Bloomberg LP). All rights reserved.
-// Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
diff --git a/src/class-elements/private-field-as-async-arrow-function.case b/src/class-elements/private-field-as-async-arrow-function.case
index 47460425f8..4791294e2e 100644
--- a/src/class-elements/private-field-as-async-arrow-function.case
+++ b/src/class-elements/private-field-as-async-arrow-function.case
@@ -1,6 +1,4 @@
 // Copyright (C) 2019 Caio Lima. All rights reserved.
-// Copyright (C) 2018 Jaideep Bhoosreddy (Bloomberg LP). All rights reserved.
-// Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -18,6 +16,7 @@ info: |
     CallExpression[?Yield, ?Await].PrivateName
 template: default
 features: [class-fields-private, async-functions, arrow-function]
+flags: [async]
 ---*/
 
 //- elements
@@ -29,9 +28,6 @@ method() {
 //- assertions
 let c = new C();
 
-async function asyncRun() {
-    assert.sameValue(await c.method(), 'test262');
-}
-
-asyncRun();
+c.method().then((value) => assert.sameValue(value, 'test262'))
+  .then($DONE, $DONE);
 
diff --git a/src/class-elements/private-field-as-async-function.case b/src/class-elements/private-field-as-async-function.case
index ea67edb6cf..0cb4760a8e 100644
--- a/src/class-elements/private-field-as-async-function.case
+++ b/src/class-elements/private-field-as-async-function.case
@@ -1,6 +1,4 @@
 // Copyright (C) 2019 Caio Lima. All rights reserved.
-// Copyright (C) 2018 Jaideep Bhoosreddy (Bloomberg LP). All rights reserved.
-// Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -18,6 +16,7 @@ info: |
     CallExpression[?Yield, ?Await].PrivateName
 template: default
 features: [class-fields-private, async-functions]
+flags: [async]
 ---*/
 
 //- elements
@@ -29,9 +28,6 @@ method() {
 //- assertions
 let c = new C();
 
-async function asyncRun() {
-    assert.sameValue(await c.method(), 'test262');
-}
-
-asyncRun();
+c.method().then((value) => assert.sameValue(value, 'test262'))
+  .then($DONE, $DONE);
 
diff --git a/src/class-elements/private-field-as-function.case b/src/class-elements/private-field-as-function.case
index 7c85fa6c55..376b7f81f1 100644
--- a/src/class-elements/private-field-as-function.case
+++ b/src/class-elements/private-field-as-function.case
@@ -1,6 +1,4 @@
 // Copyright (C) 2019 Caio Lima. All rights reserved.
-// Copyright (C) 2018 Jaideep Bhoosreddy (Bloomberg LP). All rights reserved.
-// Copyright (C) 2018 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
diff --git a/src/class-elements/private-field-super-access-throws.case b/src/class-elements/private-field-super-access-throws.case
index 2ca109d8a4..3e8ee67582 100644
--- a/src/class-elements/private-field-super-access-throws.case
+++ b/src/class-elements/private-field-super-access-throws.case
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-desc: Acessing private field from super shoudl throw an error
+desc: Acessing private field from super should throw an error
 info: |
   Updated Productions
 
@@ -33,10 +33,10 @@ Child = class extends C {
 
 //- assertions
 assert.throws(TypeError, function() {
-  (new (new C()).Child).method();
+  (new (new C()).Child()).method();
 }, 'super.#m() throws TypeError');
 
 assert.throws(TypeError, function() {
-  (new (new C()).Child).access();
+  (new (new C()).Child()).access();
 }, 'super.#m throws TypeError');
 
diff --git a/test/language/expressions/class/elements/private-field-as-async-arrow-function.js b/test/language/expressions/class/elements/private-field-as-async-arrow-function.js
index 3033aec4c5..c58fae344f 100644
--- a/test/language/expressions/class/elements/private-field-as-async-arrow-function.js
+++ b/test/language/expressions/class/elements/private-field-as-async-arrow-function.js
@@ -5,7 +5,7 @@
 description: Calling async arrow function returned from private field access (field definitions in a class expression)
 esid: prod-FieldDefinition
 features: [class-fields-private, async-functions, arrow-function, class]
-flags: [generated]
+flags: [generated, async]
 info: |
     Updated Productions
 
@@ -31,9 +31,6 @@ var C = class {
 
 let c = new C();
 
-async function asyncRun() {
-    assert.sameValue(await c.method(), 'test262');
-}
-
-asyncRun();
+c.method().then((value) => assert.sameValue(value, 'test262'))
+  .then($DONE, $DONE);
 
diff --git a/test/language/expressions/class/elements/private-field-as-async-function.js b/test/language/expressions/class/elements/private-field-as-async-function.js
index 6aea0dc10c..ec0f5d0b9b 100644
--- a/test/language/expressions/class/elements/private-field-as-async-function.js
+++ b/test/language/expressions/class/elements/private-field-as-async-function.js
@@ -5,7 +5,7 @@
 description: Calling async function returned from private field access (field definitions in a class expression)
 esid: prod-FieldDefinition
 features: [class-fields-private, async-functions, class]
-flags: [generated]
+flags: [generated, async]
 info: |
     Updated Productions
 
@@ -31,9 +31,6 @@ var C = class {
 
 let c = new C();
 
-async function asyncRun() {
-    assert.sameValue(await c.method(), 'test262');
-}
-
-asyncRun();
+c.method().then((value) => assert.sameValue(value, 'test262'))
+  .then($DONE, $DONE);
 
diff --git a/test/language/expressions/class/elements/private-field-super-access-throws.js b/test/language/expressions/class/elements/private-field-super-access-throws.js
index fc566d93d5..2759b9c9bc 100644
--- a/test/language/expressions/class/elements/private-field-super-access-throws.js
+++ b/test/language/expressions/class/elements/private-field-super-access-throws.js
@@ -2,7 +2,7 @@
 // - src/class-elements/private-field-super-access-throws.case
 // - src/class-elements/default/cls-expr.template
 /*---
-description: Acessing private field from super shoudl throw an error (field definitions in a class expression)
+description: Acessing private field from super should throw an error (field definitions in a class expression)
 esid: prod-FieldDefinition
 features: [class-fields-private, class-fields-public, class]
 flags: [generated]
@@ -37,10 +37,10 @@ var C = class {
 }
 
 assert.throws(TypeError, function() {
-  (new (new C()).Child).method();
+  (new (new C()).Child()).method();
 }, 'super.#m() throws TypeError');
 
 assert.throws(TypeError, function() {
-  (new (new C()).Child).access();
+  (new (new C()).Child()).access();
 }, 'super.#m throws TypeError');
 
diff --git a/test/language/statements/class/elements/private-field-as-async-arrow-function.js b/test/language/statements/class/elements/private-field-as-async-arrow-function.js
index 665b50817a..69cc9b486b 100644
--- a/test/language/statements/class/elements/private-field-as-async-arrow-function.js
+++ b/test/language/statements/class/elements/private-field-as-async-arrow-function.js
@@ -5,7 +5,7 @@
 description: Calling async arrow function returned from private field access (field definitions in a class declaration)
 esid: prod-FieldDefinition
 features: [class-fields-private, async-functions, arrow-function, class]
-flags: [generated]
+flags: [generated, async]
 info: |
     Updated Productions
 
@@ -31,9 +31,6 @@ class C {
 
 let c = new C();
 
-async function asyncRun() {
-    assert.sameValue(await c.method(), 'test262');
-}
-
-asyncRun();
+c.method().then((value) => assert.sameValue(value, 'test262'))
+  .then($DONE, $DONE);
 
diff --git a/test/language/statements/class/elements/private-field-as-async-function.js b/test/language/statements/class/elements/private-field-as-async-function.js
index 2ef5910b3c..70300602f9 100644
--- a/test/language/statements/class/elements/private-field-as-async-function.js
+++ b/test/language/statements/class/elements/private-field-as-async-function.js
@@ -5,7 +5,7 @@
 description: Calling async function returned from private field access (field definitions in a class declaration)
 esid: prod-FieldDefinition
 features: [class-fields-private, async-functions, class]
-flags: [generated]
+flags: [generated, async]
 info: |
     Updated Productions
 
@@ -31,9 +31,6 @@ class C {
 
 let c = new C();
 
-async function asyncRun() {
-    assert.sameValue(await c.method(), 'test262');
-}
-
-asyncRun();
+c.method().then((value) => assert.sameValue(value, 'test262'))
+  .then($DONE, $DONE);
 
diff --git a/test/language/statements/class/elements/private-field-super-access-throws.js b/test/language/statements/class/elements/private-field-super-access-throws.js
index 62029afd53..a10d8d9f41 100644
--- a/test/language/statements/class/elements/private-field-super-access-throws.js
+++ b/test/language/statements/class/elements/private-field-super-access-throws.js
@@ -2,7 +2,7 @@
 // - src/class-elements/private-field-super-access-throws.case
 // - src/class-elements/default/cls-decl.template
 /*---
-description: Acessing private field from super shoudl throw an error (field definitions in a class declaration)
+description: Acessing private field from super should throw an error (field definitions in a class declaration)
 esid: prod-FieldDefinition
 features: [class-fields-private, class-fields-public, class]
 flags: [generated]
@@ -37,10 +37,10 @@ class C {
 }
 
 assert.throws(TypeError, function() {
-  (new (new C()).Child).method();
+  (new (new C()).Child()).method();
 }, 'super.#m() throws TypeError');
 
 assert.throws(TypeError, function() {
-  (new (new C()).Child).access();
+  (new (new C()).Child()).access();
 }, 'super.#m throws TypeError');
 
-- 
GitLab