| Index: pkg/analyzer/test/generated/inheritance_manager_test.dart
|
| diff --git a/pkg/analyzer/test/generated/inheritance_manager_test.dart b/pkg/analyzer/test/generated/inheritance_manager_test.dart
|
| index f8afcd0ed07c2510e85ced9eb6a6a2e1dd198249..e41df2fa6842f073a486e24cf34d3fca3cb40290 100644
|
| --- a/pkg/analyzer/test/generated/inheritance_manager_test.dart
|
| +++ b/pkg/analyzer/test/generated/inheritance_manager_test.dart
|
| @@ -66,13 +66,13 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| ClassElementImpl classB = ElementFactory.classElement("B", classA.type);
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(getterName), same(getterG));
|
| @@ -86,14 +86,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.interfaces = <InterfaceType>[classA.type];
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject);
|
| expect(mapB.get(getterName), isNull);
|
| @@ -107,14 +107,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.mixins = <InterfaceType>[classA.type];
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(getterName), same(getterG));
|
| @@ -126,7 +126,7 @@ class InheritanceManagerTest {
|
| // class A {}
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| _assertNoErrors(classA);
|
| }
|
| @@ -137,14 +137,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.supertype = classA.type;
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(methodName), same(methodM));
|
| @@ -158,14 +158,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.interfaces = <InterfaceType>[classA.type];
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject);
|
| expect(mapB.get(methodName), isNull);
|
| @@ -179,14 +179,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.mixins = <InterfaceType>[classA.type];
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(methodName), same(methodM));
|
| @@ -201,16 +201,16 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA1 = ElementFactory.classElement2("A1");
|
| String methodName = "m";
|
| MethodElement methodA1M =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA1.methods = <MethodElement>[methodA1M];
|
| ClassElementImpl classA2 = ElementFactory.classElement2("A2");
|
| MethodElement methodA2M =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA2.methods = <MethodElement>[methodA2M];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.mixins = <InterfaceType>[classA1.type, classA2.type];
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromClasses(classB);
|
| expect(mapB.get(methodName), same(methodA2M));
|
| _assertNoErrors(classA1);
|
| _assertNoErrors(classA2);
|
| @@ -223,13 +223,13 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| ClassElementImpl classB = ElementFactory.classElement("B", classA.type);
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(getterName), same(getterG));
|
| @@ -243,14 +243,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.interfaces = <InterfaceType>[classA.type];
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(getterName), same(getterG));
|
| @@ -264,14 +264,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.mixins = <InterfaceType>[classA.type];
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(getterName), same(getterG));
|
| @@ -283,29 +283,29 @@ class InheritanceManagerTest {
|
| // class A {}
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| _assertNoErrors(classA);
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_getter_method() {
|
| + test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_getter_method() {
|
| // class I1 { int m(); }
|
| // class I2 { int get m; }
|
| // class A implements I2, I1 {}
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classI1.methods = <MethodElement>[methodM];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| PropertyAccessorElement getter =
|
| - ElementFactory.getterElement(methodName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(methodName, false, _typeProvider.intType);
|
| classI2.accessors = <PropertyAccessorElement>[getter];
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI2.type, classI1.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapA.get(methodName), isNull);
|
| _assertErrors(classA,
|
| @@ -313,14 +313,14 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_int_str() {
|
| + test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_int_str() {
|
| // class I1 { int m(); }
|
| // class I2 { String m(); }
|
| // class A implements I1, I2 {}
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName = "m";
|
| MethodElement methodM1 =
|
| - ElementFactory.methodElement(methodName, null, [_typeProvider.intType]);
|
| + ElementFactory.methodElement(methodName, null, [_typeProvider.intType]);
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| MethodElement methodM2 = ElementFactory
|
| @@ -329,7 +329,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI1.type, classI2.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapA.get(methodName), isNull);
|
| _assertErrors(
|
| @@ -337,23 +337,23 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_method_getter() {
|
| + test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_method_getter() {
|
| // class I1 { int m(); }
|
| // class I2 { int get m; }
|
| // class A implements I1, I2 {}
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classI1.methods = <MethodElement>[methodM];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| PropertyAccessorElement getter =
|
| - ElementFactory.getterElement(methodName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(methodName, false, _typeProvider.intType);
|
| classI2.accessors = <PropertyAccessorElement>[getter];
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI1.type, classI2.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapA.get(methodName), isNull);
|
| _assertErrors(classA,
|
| @@ -361,37 +361,37 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_numOfRequiredParams() {
|
| + test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_numOfRequiredParams() {
|
| // class I1 { dynamic m(int, [int]); }
|
| // class I2 { dynamic m(int, int, int); }
|
| // class A implements I1, I2 {}
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName = "m";
|
| MethodElementImpl methodM1 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| ParameterElementImpl parameter1 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a1"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a1"));
|
| parameter1.type = _typeProvider.intType;
|
| parameter1.parameterKind = ParameterKind.REQUIRED;
|
| ParameterElementImpl parameter2 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a2"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a2"));
|
| parameter2.type = _typeProvider.intType;
|
| parameter2.parameterKind = ParameterKind.POSITIONAL;
|
| methodM1.parameters = <ParameterElement>[parameter1, parameter2];
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| MethodElementImpl methodM2 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| ParameterElementImpl parameter3 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a3"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a3"));
|
| parameter3.type = _typeProvider.intType;
|
| parameter3.parameterKind = ParameterKind.REQUIRED;
|
| ParameterElementImpl parameter4 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a4"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a4"));
|
| parameter4.type = _typeProvider.intType;
|
| parameter4.parameterKind = ParameterKind.REQUIRED;
|
| ParameterElementImpl parameter5 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a5"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a5"));
|
| parameter5.type = _typeProvider.intType;
|
| parameter5.parameterKind = ParameterKind.REQUIRED;
|
| methodM2.parameters = <ParameterElement>[
|
| @@ -403,7 +403,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI1.type, classI2.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapA.get(methodName), isNull);
|
| _assertErrors(
|
| @@ -411,7 +411,7 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_str_int() {
|
| + test_getMapOfMembersInheritedFromInterfaces_inconsistentMethodInheritance_str_int() {
|
| // class I1 { int m(); }
|
| // class I2 { String m(); }
|
| // class A implements I2, I1 {}
|
| @@ -422,12 +422,12 @@ class InheritanceManagerTest {
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| MethodElement methodM2 =
|
| - ElementFactory.methodElement(methodName, null, [_typeProvider.intType]);
|
| + ElementFactory.methodElement(methodName, null, [_typeProvider.intType]);
|
| classI2.methods = <MethodElement>[methodM2];
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI2.type, classI1.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapA.get(methodName), isNull);
|
| _assertErrors(
|
| @@ -440,13 +440,13 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement("B", classA.type);
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(methodName), same(methodM));
|
| @@ -460,14 +460,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.interfaces = <InterfaceType>[classA.type];
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(methodName), same(methodM));
|
| @@ -481,14 +481,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.mixins = <InterfaceType>[classA.type];
|
| MemberMap mapB =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classB);
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject);
|
| expect(mapB.size, _numOfMembersInObject + 1);
|
| expect(mapB.get(methodName), same(methodM));
|
| @@ -503,17 +503,17 @@ class InheritanceManagerTest {
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName1 = "m1";
|
| MethodElement methodM1 =
|
| - ElementFactory.methodElement(methodName1, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName1, _typeProvider.intType);
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| String methodName2 = "m2";
|
| MethodElement methodM2 =
|
| - ElementFactory.methodElement(methodName2, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName2, _typeProvider.intType);
|
| classI2.methods = <MethodElement>[methodM2];
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI1.type, classI2.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject + 2);
|
| expect(mapA.get(methodName1), same(methodM1));
|
| expect(mapA.get(methodName2), same(methodM2));
|
| @@ -521,7 +521,7 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_2_getters() {
|
| + test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_2_getters() {
|
| // class I1 { int get g; }
|
| // class I2 { num get g; }
|
| // class A implements I1, I2 {}
|
| @@ -537,7 +537,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI1.type, classI2.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject + 1);
|
| PropertyAccessorElement syntheticAccessor = ElementFactory.getterElement(
|
| accessorName, false, _typeProvider.dynamicType);
|
| @@ -546,25 +546,25 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_2_methods() {
|
| + test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_2_methods() {
|
| // class I1 { dynamic m(int); }
|
| // class I2 { dynamic m(num); }
|
| // class A implements I1, I2 {}
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName = "m";
|
| MethodElementImpl methodM1 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| ParameterElementImpl parameter1 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| parameter1.type = _typeProvider.intType;
|
| parameter1.parameterKind = ParameterKind.REQUIRED;
|
| methodM1.parameters = <ParameterElement>[parameter1];
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| MethodElementImpl methodM2 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| ParameterElementImpl parameter2 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| parameter2.type = _typeProvider.numType;
|
| parameter2.parameterKind = ParameterKind.REQUIRED;
|
| methodM2.parameters = <ParameterElement>[parameter2];
|
| @@ -572,7 +572,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI1.type, classI2.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject + 1);
|
| MethodElement syntheticMethod = ElementFactory.methodElement(
|
| methodName, _typeProvider.dynamicType, [_typeProvider.dynamicType]);
|
| @@ -581,7 +581,7 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_2_setters() {
|
| + test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_2_setters() {
|
| // class I1 { set s(int); }
|
| // class I2 { set s(num); }
|
| // class A implements I1, I2 {}
|
| @@ -597,7 +597,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI1.type, classI2.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject + 1);
|
| PropertyAccessorElementImpl syntheticAccessor = ElementFactory
|
| .setterElement(accessorName, false, _typeProvider.dynamicType);
|
| @@ -607,7 +607,7 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_3_getters() {
|
| + test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_3_getters() {
|
| // class A {}
|
| // class B extends A {}
|
| // class C extends B {}
|
| @@ -621,15 +621,15 @@ class InheritanceManagerTest {
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String accessorName = "g";
|
| PropertyAccessorElement getter1 =
|
| - ElementFactory.getterElement(accessorName, false, classA.type);
|
| + ElementFactory.getterElement(accessorName, false, classA.type);
|
| classI1.accessors = <PropertyAccessorElement>[getter1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| PropertyAccessorElement getter2 =
|
| - ElementFactory.getterElement(accessorName, false, classB.type);
|
| + ElementFactory.getterElement(accessorName, false, classB.type);
|
| classI2.accessors = <PropertyAccessorElement>[getter2];
|
| ClassElementImpl classI3 = ElementFactory.classElement2("I3");
|
| PropertyAccessorElement getter3 =
|
| - ElementFactory.getterElement(accessorName, false, classC.type);
|
| + ElementFactory.getterElement(accessorName, false, classC.type);
|
| classI3.accessors = <PropertyAccessorElement>[getter3];
|
| ClassElementImpl classD = ElementFactory.classElement2("D");
|
| classD.interfaces = <InterfaceType>[
|
| @@ -638,7 +638,7 @@ class InheritanceManagerTest {
|
| classI3.type
|
| ];
|
| MemberMap mapD =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classD);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classD);
|
| expect(mapD.size, _numOfMembersInObject + 1);
|
| PropertyAccessorElement syntheticAccessor = ElementFactory.getterElement(
|
| accessorName, false, _typeProvider.dynamicType);
|
| @@ -647,7 +647,7 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_3_methods() {
|
| + test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_3_methods() {
|
| // class A {}
|
| // class B extends A {}
|
| // class C extends B {}
|
| @@ -661,27 +661,27 @@ class InheritanceManagerTest {
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName = "m";
|
| MethodElementImpl methodM1 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| ParameterElementImpl parameter1 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| parameter1.type = classA.type;
|
| parameter1.parameterKind = ParameterKind.REQUIRED;
|
| methodM1.parameters = <ParameterElement>[parameter1];
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| MethodElementImpl methodM2 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| ParameterElementImpl parameter2 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| parameter2.type = classB.type;
|
| parameter2.parameterKind = ParameterKind.REQUIRED;
|
| methodM2.parameters = <ParameterElement>[parameter2];
|
| classI2.methods = <MethodElement>[methodM2];
|
| ClassElementImpl classI3 = ElementFactory.classElement2("I3");
|
| MethodElementImpl methodM3 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.dynamicType);
|
| ParameterElementImpl parameter3 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a0"));
|
| parameter3.type = classC.type;
|
| parameter3.parameterKind = ParameterKind.REQUIRED;
|
| methodM3.parameters = <ParameterElement>[parameter3];
|
| @@ -693,7 +693,7 @@ class InheritanceManagerTest {
|
| classI3.type
|
| ];
|
| MemberMap mapD =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classD);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classD);
|
| expect(mapD.size, _numOfMembersInObject + 1);
|
| MethodElement syntheticMethod = ElementFactory.methodElement(
|
| methodName, _typeProvider.dynamicType, [_typeProvider.dynamicType]);
|
| @@ -702,7 +702,7 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_3_setters() {
|
| + test_getMapOfMembersInheritedFromInterfaces_union_multipleSubtypes_3_setters() {
|
| // class A {}
|
| // class B extends A {}
|
| // class C extends B {}
|
| @@ -716,15 +716,15 @@ class InheritanceManagerTest {
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String accessorName = "s";
|
| PropertyAccessorElement setter1 =
|
| - ElementFactory.setterElement(accessorName, false, classA.type);
|
| + ElementFactory.setterElement(accessorName, false, classA.type);
|
| classI1.accessors = <PropertyAccessorElement>[setter1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| PropertyAccessorElement setter2 =
|
| - ElementFactory.setterElement(accessorName, false, classB.type);
|
| + ElementFactory.setterElement(accessorName, false, classB.type);
|
| classI2.accessors = <PropertyAccessorElement>[setter2];
|
| ClassElementImpl classI3 = ElementFactory.classElement2("I3");
|
| PropertyAccessorElement setter3 =
|
| - ElementFactory.setterElement(accessorName, false, classC.type);
|
| + ElementFactory.setterElement(accessorName, false, classC.type);
|
| classI3.accessors = <PropertyAccessorElement>[setter3];
|
| ClassElementImpl classD = ElementFactory.classElement2("D");
|
| classD.interfaces = <InterfaceType>[
|
| @@ -733,7 +733,7 @@ class InheritanceManagerTest {
|
| classI3.type
|
| ];
|
| MemberMap mapD =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classD);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classD);
|
| expect(mapD.size, _numOfMembersInObject + 1);
|
| PropertyAccessorElementImpl syntheticAccessor = ElementFactory
|
| .setterElement(accessorName, false, _typeProvider.dynamicType);
|
| @@ -743,20 +743,20 @@ class InheritanceManagerTest {
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_union_oneSubtype_2_methods() {
|
| + test_getMapOfMembersInheritedFromInterfaces_union_oneSubtype_2_methods() {
|
| // class I1 { int m(); }
|
| // class I2 { int m([int]); }
|
| // class A implements I1, I2 {}
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName = "m";
|
| MethodElement methodM1 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| MethodElementImpl methodM2 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| ParameterElementImpl parameter1 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a1"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a1"));
|
| parameter1.type = _typeProvider.intType;
|
| parameter1.parameterKind = ParameterKind.POSITIONAL;
|
| methodM2.parameters = <ParameterElement>[parameter1];
|
| @@ -764,14 +764,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| classA.interfaces = <InterfaceType>[classI1.type, classI2.type];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject + 1);
|
| expect(mapA.get(methodName), same(methodM2));
|
| _assertNoErrors(classA);
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_union_oneSubtype_3_methods() {
|
| + test_getMapOfMembersInheritedFromInterfaces_union_oneSubtype_3_methods() {
|
| // class I1 { int m(); }
|
| // class I2 { int m([int]); }
|
| // class I3 { int m([int, int]); }
|
| @@ -779,26 +779,26 @@ class InheritanceManagerTest {
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName = "m";
|
| MethodElementImpl methodM1 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| MethodElementImpl methodM2 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| ParameterElementImpl parameter1 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a1"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a1"));
|
| parameter1.type = _typeProvider.intType;
|
| parameter1.parameterKind = ParameterKind.POSITIONAL;
|
| methodM1.parameters = <ParameterElement>[parameter1];
|
| classI2.methods = <MethodElement>[methodM2];
|
| ClassElementImpl classI3 = ElementFactory.classElement2("I3");
|
| MethodElementImpl methodM3 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| ParameterElementImpl parameter2 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a2"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a2"));
|
| parameter2.type = _typeProvider.intType;
|
| parameter2.parameterKind = ParameterKind.POSITIONAL;
|
| ParameterElementImpl parameter3 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a3"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a3"));
|
| parameter3.type = _typeProvider.intType;
|
| parameter3.parameterKind = ParameterKind.POSITIONAL;
|
| methodM3.parameters = <ParameterElement>[parameter2, parameter3];
|
| @@ -810,14 +810,14 @@ class InheritanceManagerTest {
|
| classI3.type
|
| ];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject + 1);
|
| expect(mapA.get(methodName), same(methodM3));
|
| _assertNoErrors(classA);
|
| }
|
|
|
| void
|
| - test_getMapOfMembersInheritedFromInterfaces_union_oneSubtype_4_methods() {
|
| + test_getMapOfMembersInheritedFromInterfaces_union_oneSubtype_4_methods() {
|
| // class I1 { int m(); }
|
| // class I2 { int m(); }
|
| // class I3 { int m([int]); }
|
| @@ -826,30 +826,30 @@ class InheritanceManagerTest {
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName = "m";
|
| MethodElement methodM1 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| MethodElement methodM2 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classI2.methods = <MethodElement>[methodM2];
|
| ClassElementImpl classI3 = ElementFactory.classElement2("I3");
|
| MethodElementImpl methodM3 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| ParameterElementImpl parameter1 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a1"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a1"));
|
| parameter1.type = _typeProvider.intType;
|
| parameter1.parameterKind = ParameterKind.POSITIONAL;
|
| methodM3.parameters = <ParameterElement>[parameter1];
|
| classI3.methods = <MethodElement>[methodM3];
|
| ClassElementImpl classI4 = ElementFactory.classElement2("I4");
|
| MethodElementImpl methodM4 =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| ParameterElementImpl parameter2 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a2"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a2"));
|
| parameter2.type = _typeProvider.intType;
|
| parameter2.parameterKind = ParameterKind.POSITIONAL;
|
| ParameterElementImpl parameter3 =
|
| - new ParameterElementImpl.forNode(AstFactory.identifier3("a3"));
|
| + new ParameterElementImpl.forNode(AstFactory.identifier3("a3"));
|
| parameter3.type = _typeProvider.intType;
|
| parameter3.parameterKind = ParameterKind.POSITIONAL;
|
| methodM4.parameters = <ParameterElement>[parameter2, parameter3];
|
| @@ -862,7 +862,7 @@ class InheritanceManagerTest {
|
| classI4.type
|
| ];
|
| MemberMap mapA =
|
| - _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| + _inheritanceManager.getMapOfMembersInheritedFromInterfaces(classA);
|
| expect(mapA.size, _numOfMembersInObject + 1);
|
| expect(mapA.get(methodName), same(methodM4));
|
| _assertNoErrors(classA);
|
| @@ -872,7 +872,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.interfaces = <InterfaceType>[classA.type];
|
| @@ -886,7 +886,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.interfaces = <InterfaceType>[classA.type];
|
| @@ -900,7 +900,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String setterName = "s";
|
| PropertyAccessorElement setterS =
|
| - ElementFactory.setterElement(setterName, false, _typeProvider.intType);
|
| + ElementFactory.setterElement(setterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[setterS];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.interfaces = <InterfaceType>[classA.type];
|
| @@ -914,7 +914,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| (methodM as MethodElementImpl).static = true;
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| @@ -945,12 +945,12 @@ class InheritanceManagerTest {
|
| ClassElementImpl classI1 = ElementFactory.classElement2("I1");
|
| String methodName1 = "m1";
|
| MethodElement methodM1 =
|
| - ElementFactory.methodElement(methodName1, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName1, _typeProvider.intType);
|
| classI1.methods = <MethodElement>[methodM1];
|
| ClassElementImpl classI2 = ElementFactory.classElement2("I2");
|
| String methodName2 = "m2";
|
| MethodElement methodM2 =
|
| - ElementFactory.methodElement(methodName2, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName2, _typeProvider.intType);
|
| classI2.methods = <MethodElement>[methodM2];
|
| classI2.interfaces = <InterfaceType>[classI1.type];
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| @@ -968,7 +968,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.mixins = <InterfaceType>[classA.type];
|
| @@ -982,7 +982,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.mixins = <InterfaceType>[classA.type];
|
| @@ -996,7 +996,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String setterName = "s";
|
| PropertyAccessorElement setterS =
|
| - ElementFactory.setterElement(setterName, false, _typeProvider.intType);
|
| + ElementFactory.setterElement(setterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[setterS];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.mixins = <InterfaceType>[classA.type];
|
| @@ -1010,7 +1010,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| (methodM as MethodElementImpl).static = true;
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| @@ -1030,7 +1030,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| ClassElementImpl classB = ElementFactory.classElement("B", classA.type);
|
| expect(_inheritanceManager.lookupInheritance(classB, getterName),
|
| @@ -1060,7 +1060,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement("B", classA.type);
|
| expect(_inheritanceManager.lookupInheritance(classB, methodName),
|
| @@ -1073,7 +1073,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String setterName = "s";
|
| PropertyAccessorElement setterS =
|
| - ElementFactory.setterElement(setterName, false, _typeProvider.intType);
|
| + ElementFactory.setterElement(setterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[setterS];
|
| ClassElementImpl classB = ElementFactory.classElement("B", classA.type);
|
| expect(_inheritanceManager.lookupInheritance(classB, "$setterName="),
|
| @@ -1086,7 +1086,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| (methodM as MethodElementImpl).static = true;
|
| classA.methods = <MethodElement>[methodM];
|
| ClassElementImpl classB = ElementFactory.classElement("B", classA.type);
|
| @@ -1099,7 +1099,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| expect(_inheritanceManager.lookupMember(classA, getterName), same(getterG));
|
| _assertNoErrors(classA);
|
| @@ -1109,7 +1109,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String getterName = "g";
|
| PropertyAccessorElement getterG =
|
| - ElementFactory.getterElement(getterName, true, _typeProvider.intType);
|
| + ElementFactory.getterElement(getterName, true, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[getterG];
|
| expect(_inheritanceManager.lookupMember(classA, getterName), isNull);
|
| _assertNoErrors(classA);
|
| @@ -1119,7 +1119,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| expect(_inheritanceManager.lookupMember(classA, methodName), same(methodM));
|
| _assertNoErrors(classA);
|
| @@ -1129,7 +1129,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElement methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| (methodM as MethodElementImpl).static = true;
|
| classA.methods = <MethodElement>[methodM];
|
| expect(_inheritanceManager.lookupMember(classA, methodName), isNull);
|
| @@ -1146,7 +1146,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String setterName = "s";
|
| PropertyAccessorElement setterS =
|
| - ElementFactory.setterElement(setterName, false, _typeProvider.intType);
|
| + ElementFactory.setterElement(setterName, false, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[setterS];
|
| expect(_inheritanceManager.lookupMember(classA, "$setterName="),
|
| same(setterS));
|
| @@ -1157,7 +1157,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String setterName = "s";
|
| PropertyAccessorElement setterS =
|
| - ElementFactory.setterElement(setterName, true, _typeProvider.intType);
|
| + ElementFactory.setterElement(setterName, true, _typeProvider.intType);
|
| classA.accessors = <PropertyAccessorElement>[setterS];
|
| expect(_inheritanceManager.lookupMember(classA, setterName), isNull);
|
| _assertNoErrors(classA);
|
| @@ -1167,7 +1167,7 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElementImpl methodM =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodM];
|
| expect(
|
| _inheritanceManager.lookupOverrides(classA, methodName), hasLength(0));
|
| @@ -1178,14 +1178,14 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElementImpl methodMinA =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodMinA];
|
| ClassElementImpl classB = ElementFactory.classElement("B", classA.type);
|
| MethodElementImpl methodMinB =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classB.methods = <MethodElement>[methodMinB];
|
| List<ExecutableElement> overrides =
|
| - _inheritanceManager.lookupOverrides(classB, methodName);
|
| + _inheritanceManager.lookupOverrides(classB, methodName);
|
| expect(overrides, unorderedEquals([methodMinA]));
|
| _assertNoErrors(classA);
|
| _assertNoErrors(classB);
|
| @@ -1195,15 +1195,15 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElementImpl methodMinA =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodMinA];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| classB.interfaces = <InterfaceType>[classA.type];
|
| MethodElementImpl methodMinB =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classB.methods = <MethodElement>[methodMinB];
|
| List<ExecutableElement> overrides =
|
| - _inheritanceManager.lookupOverrides(classB, methodName);
|
| + _inheritanceManager.lookupOverrides(classB, methodName);
|
| expect(overrides, unorderedEquals([methodMinA]));
|
| _assertNoErrors(classA);
|
| _assertNoErrors(classB);
|
| @@ -1213,19 +1213,19 @@ class InheritanceManagerTest {
|
| ClassElementImpl classA = ElementFactory.classElement2("A");
|
| String methodName = "m";
|
| MethodElementImpl methodMinA =
|
| - ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.intType);
|
| classA.methods = <MethodElement>[methodMinA];
|
| ClassElementImpl classB = ElementFactory.classElement2("B");
|
| MethodElementImpl methodMinB =
|
| - ElementFactory.methodElement(methodName, _typeProvider.doubleType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.doubleType);
|
| classB.methods = <MethodElement>[methodMinB];
|
| ClassElementImpl classC = ElementFactory.classElement2("C");
|
| classC.interfaces = <InterfaceType>[classA.type, classB.type];
|
| MethodElementImpl methodMinC =
|
| - ElementFactory.methodElement(methodName, _typeProvider.numType);
|
| + ElementFactory.methodElement(methodName, _typeProvider.numType);
|
| classC.methods = <MethodElement>[methodMinC];
|
| List<ExecutableElement> overrides =
|
| - _inheritanceManager.lookupOverrides(classC, methodName);
|
| + _inheritanceManager.lookupOverrides(classC, methodName);
|
| expect(overrides, unorderedEquals([methodMinA, methodMinB]));
|
| _assertNoErrors(classA);
|
| _assertNoErrors(classB);
|
| @@ -1236,7 +1236,7 @@ class InheritanceManagerTest {
|
| [List<ErrorCode> expectedErrorCodes = ErrorCode.EMPTY_LIST]) {
|
| GatheringErrorListener errorListener = new GatheringErrorListener();
|
| HashSet<AnalysisError> actualErrors =
|
| - _inheritanceManager.getErrors(classElt);
|
| + _inheritanceManager.getErrors(classElt);
|
| if (actualErrors != null) {
|
| for (AnalysisError error in actualErrors) {
|
| errorListener.onError(error);
|
| @@ -1257,9 +1257,9 @@ class InheritanceManagerTest {
|
| InheritanceManager _createInheritanceManager() {
|
| AnalysisContext context = AnalysisContextFactory.contextWithCore();
|
| FileBasedSource source =
|
| - new FileBasedSource(FileUtilities2.createFile("/test.dart"));
|
| + new FileBasedSource(FileUtilities2.createFile("/test.dart"));
|
| CompilationUnitElementImpl definingCompilationUnit =
|
| - new CompilationUnitElementImpl("test.dart");
|
| + new CompilationUnitElementImpl("test.dart");
|
| definingCompilationUnit.librarySource =
|
| definingCompilationUnit.source = source;
|
| _definingLibrary = ElementFactory.library(context, "test");
|
|
|