Adjust dom tests to additional OT AST Nodes
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTStructuralPropertyTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTStructuralPropertyTest.java
index 55ae39b..d4c0cfd 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTStructuralPropertyTest.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTStructuralPropertyTest.java
@@ -196,16 +196,46 @@
case AST.JLS4 :
assertEquals("Wrong number of visited node classes", 81, nodeClasses.size());
assertEquals("Wrong number of visited properties", 103, visitedProperties.size());
+//{ObjectTeams: 2 new simple properties in TypeDeclaration: TEAM_PROPERTY and ROLE_PROPERTY:
+// 1 new property in ImportDeclaration: BASE_PROPERTY
+/* orig:
assertEquals("Wrong number of simple properties", 23, simpleProperties.size());
+ :giro */
+ assertEquals("Wrong number of simple properties", 26, simpleProperties.size());
+ // 2 new child properties: GUARD_PROPERTY (in TypeDeclaration and MethodDeclaration)
+/* orig:
assertEquals("Wrong number of child properties", 115, childProperties.size());
+ :giro */
+ assertEquals("Wrong number of child properties", 117, childProperties.size());
+
+ // 2 new child list properties: TypeDeclaration.PRECEDENCES_PROPERTY, PackageDeclaration.MODIFIERS_PROPERTY
+/* orig:
assertEquals("Wrong number of child list properties", 54, childListProperties.size());
+ :giro */
+ assertEquals("Wrong number of child list properties", 56, childListProperties.size());
+// SH}
break;
case AST.JLS8 :
assertEquals("Wrong number of visited node classes", 84, nodeClasses.size());
assertEquals("Wrong number of visited properties", 105, visitedProperties.size());
+//{ObjectTeams: 2 new simple properties in TypeDeclaration: TEAM_PROPERTY and ROLE_PROPERTY:
+// 1 new property in ImportDeclaration: BASE_PROPERTY
+/* orig:
assertEquals("Wrong number of simple properties", 21, simpleProperties.size());
+ :giro */
+ assertEquals("Wrong number of simple properties", 24, simpleProperties.size());
+ // 2 new child properties: GUARD_PROPERTY (in TypeDeclaration and MethodDeclaration)
+/* orig:
assertEquals("Wrong number of child properties", 118, childProperties.size());
+ :giro */
+ assertEquals("Wrong number of child properties", 120, childProperties.size());
+
+ // 2 new child list properties: TypeDeclaration.PRECEDENCES_PROPERTY, PackageDeclaration.MODIFIERS_PROPERTY
+/* orig:
assertEquals("Wrong number of child list properties", 66, childListProperties.size());
+ :giro */
+ assertEquals("Wrong number of child list properties", 68, childListProperties.size());
+// SH}
break;
default :
fail();
@@ -419,7 +449,7 @@
/* orig:
assertEquals("Wrong last known type", 92, hi); // last known one
:giro */
- assertEquals("Wrong last known type", 107, hi); // last known one
+ assertEquals("Wrong last known type", 108, hi); // last known one
// jwl}
assertEquals("Wrong number of distinct types", hi, classes.size()); // all classes are distinct
}
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTTest.java
index c07b2c1..aa3b9a4 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTTest.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTTest.java
@@ -8798,7 +8798,25 @@
ASTNode.CREATION_REFERENCE,
ASTNode.EXPRESSION_METHOD_REFERENCE,
ASTNode.SUPER_METHOD_REFERENCE,
- ASTNode.TYPE_METHOD_REFERENCE
+ ASTNode.TYPE_METHOD_REFERENCE,
+//{ObjectTeams:
+ ASTNode.METHOD_SPEC,
+ ASTNode.CALLIN_MAPPING_DECLARATION,
+ ASTNode.CALLOUT_MAPPING_DECLARATION,
+ ASTNode.LIFTING_TYPE,
+ ASTNode.WITHIN_STATEMENT,
+ ASTNode.BASE_CONSTRUCTOR_INVOCATION,
+ ASTNode.PARAMETER_MAPPING,
+ ASTNode.BASE_CALL_MESSAGE_SEND,
+ ASTNode.FIELD_ACCESS_SPEC,
+ ASTNode.ROLE_TYPE_DECLARATION,
+ ASTNode.TSUPER_MESSAGE_SEND,
+ ASTNode.TSUPER_CONSTRUCTOR_INVOCATION,
+ ASTNode.TYPE_ANCHOR,
+ ASTNode.PRECEDENCE_DECLARATION,
+ ASTNode.GUARD_PREDICATE_DECLARATION,
+ ASTNode.METHOD_BINDING_OPERATOR
+// SH}
};
// assert that nodeType values are correct: