Skip to content

Commit e610897

Browse files
committed
Fixed Issue #624: overriding tests expected results updated.
1 parent ba6ff0f commit e610897

10 files changed

+18
-18
lines changed

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t03.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ class A<T extends FutureOr<int>> extends OPTED_FUTUREOR_INT<T> { dynamic getPara
2828

2929
main() {
3030
Expect.equals( typeOf<FutureOr<int>>(), A ().getParamType());
31-
Expect.equals( typeOf<FutureOr<int>>(), A<int>().getParamType());
31+
Expect.equals( int, A<int>().getParamType());
3232
}

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t07.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ import "dart:async";
2424
import "../../../Utils/expect.dart";
2525
import "override_checking_A01_opted_in_futureor_lib.dart";
2626

27-
class A1<T extends FutureOr> extends OPTED_FUTUREOR <T> { dynamic getParamType() => typeOf<T>(); }
27+
class A1<T extends FutureOr> extends OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
2828
class A2<T extends FutureOr<FutureOr>> extends OPTED_FUTUREOR_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
2929

3030
main() {
31-
Expect.equals( typeOf<FutureOr>(), A1() .getParamType());
32-
Expect.equals( typeOf<FutureOr>(), A1<int>().getParamType());
31+
Expect.equals( typeOf<FutureOr>(), A1().getParamType());
32+
Expect.equals( int, A1<int>().getParamType());
3333

34-
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2() .getParamType());
34+
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2().getParamType());
3535
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2<FutureOr<FutureOr>>().getParamType());
3636
}

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t08.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import "dart:async";
2424
import "../../../Utils/expect.dart";
2525
import "override_checking_A01_opted_in_futureor_lib.dart";
2626

27-
class A1<T extends Null> extends OPTED_FUTUREOR <T> { dynamic getParamType() => typeOf<T>(); }
27+
class A1<T extends Null> extends OPTED_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
2828
class A2<T extends Null> extends OPTED_FUTUREOR_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
2929

3030
main() {

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t11.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ class A2<T extends Object> implements OPTED_NONNULLABLE_OBJECT <T> { dynamic
2727
class A3<T extends Function> implements OPTED_NONNULLABLE_FUNCTION<T> { dynamic getParamType() => typeOf<T>(); }
2828

2929
main() {
30-
Expect.equals(int, A1() .getParamType());
30+
Expect.equals(int, A1().getParamType());
3131
Expect.equals(int, A1<int>().getParamType());
3232

33-
Expect.equals(Object, A2() .getParamType());
33+
Expect.equals(Object, A2().getParamType());
3434
Expect.equals(Object, A2<Object>().getParamType());
3535

36-
Expect.equals(Function, A3() .getParamType());
36+
Expect.equals(Function, A3().getParamType());
3737
Expect.equals(Function, A3<Function>().getParamType());
3838
}

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t13.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ import "override_checking_A01_opted_in_futureor_lib.dart";
2727
class A<T extends FutureOr<int>> implements OPTED_FUTUREOR_INT<T> { dynamic getParamType() => typeOf<T>(); }
2828

2929
main() {
30-
Expect.equals( typeOf<FutureOr<int>>(), A() .getParamType());
31-
Expect.equals( typeOf<FutureOr<int>>(), A<int>().getParamType());
30+
Expect.equals( typeOf<FutureOr<int>>(), A().getParamType());
31+
Expect.equals( int, A<int>().getParamType());
3232
}

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t17.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ class A1<T extends FutureOr> implements OPTED_FUTUREOR <T> { d
2828
class A2<T extends FutureOr<FutureOr>> implements OPTED_FUTUREOR_FUTUREOR<T> { dynamic getParamType() => typeOf<T>(); }
2929

3030
main() {
31-
Expect.equals( typeOf<FutureOr>(), A1 ().getParamType());
32-
Expect.equals( typeOf<FutureOr>(), A1<int>().getParamType());
31+
Expect.equals( typeOf<FutureOr>(), A1().getParamType());
32+
Expect.equals( int, A1<int>().getParamType());
3333

34-
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2 ().getParamType());
34+
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2().getParamType());
3535
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2<FutureOr<FutureOr>>().getParamType());
3636
}

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t23.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ class A<T extends FutureOr<int>> with OPTED_FUTUREOR_INT<T> { dynamic getParamTy
2828

2929
main() {
3030
Expect.equals( typeOf<FutureOr<int>>(), A().getParamType());
31-
Expect.equals( typeOf<FutureOr<int>>(), A<int>().getParamType());
31+
Expect.equals( int, A<int>().getParamType());
3232
}

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t27.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class A2<T extends FutureOr<FutureOr>> with OPTED_FUTUREOR_FUTUREOR<T> { dynamic
2929

3030
main() {
3131
Expect.equals( typeOf<FutureOr>(), A1().getParamType());
32-
Expect.equals( typeOf<FutureOr>(), A1<int>().getParamType());
32+
Expect.equals( int, A1<int>().getParamType());
3333

3434
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2().getParamType());
3535
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2<FutureOr<FutureOr>>().getParamType());

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t33.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ class A<T extends FutureOr<int>> extends B<T> implements OPTED_FUTUREOR_INT<T> {
3030

3131
main() {
3232
Expect.equals( typeOf<FutureOr<int>>(), A().getParamType());
33-
Expect.equals( typeOf<FutureOr<int>>(), A<int>().getParamType());
33+
Expect.equals( int, A<int>().getParamType());
3434
}

LanguageFeatures/nnbd/overriding/override_checking_A01_CLASSPARAM_t37.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class A2<T extends FutureOr<FutureOr>> extends B2<T> implements OPTED_FUTUREOR_F
3232

3333
main() {
3434
Expect.equals( typeOf<FutureOr>(), A1().getParamType());
35-
Expect.equals( typeOf<FutureOr>(), A1<int>().getParamType());
35+
Expect.equals( int, A1<int>().getParamType());
3636

3737
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2().getParamType());
3838
Expect.equals( typeOf<FutureOr<FutureOr>>(), A2<FutureOr<FutureOr>>().getParamType());

0 commit comments

Comments
 (0)