Skip to content

Commit

Permalink
Cleanup disabled tests in ASTConverterTestAST4_2
Browse files Browse the repository at this point in the history 
Some of the tests had asserts for pre 1.8 which is no longer accepted
with a corresponding "uptodate" test in ASTConverterTestAST8_2 - these
are deleted.
Other are enabled as they work now, most likely after the fixes to
jclmin.
Cleaned ASTConverterTestAST8_2 tests from pre 1.8 expectations which are
useless nowadays.
  • Loading branch information
@akurtakov
akurtakov committed Dec 28, 2024
1 parent 0adfaa1 commit 9d6bfc3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 228 deletions.
156 changes: 2 additions & 154 deletions ...lipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST4_2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2627,126 +2627,6 @@ public void test0492() throws JavaModelException {
}
}

/**
* http://bugs.eclipse.org/bugs/show_bug.cgi?id=42839
*/
public void _2551_test0493() throws JavaModelException {
ICompilationUnit sourceUnit = getCompilationUnit("Converter" , "src", "test0493", "A.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
char[] source = sourceUnit.getSource().toCharArray();
ASTNode result = runConversion(getJLS4(), sourceUnit, true);
assertTrue("not a compilation unit", result.getNodeType() == ASTNode.COMPILATION_UNIT); //$NON-NLS-1$
CompilationUnit unit = (CompilationUnit) result;
assertEquals("Wrong number of problems", 0, unit.getProblems().length); //$NON-NLS-1$<
ASTNode node = getASTNode(unit, 0, 0);
assertTrue("not a field declaration", node.getNodeType() == ASTNode.FIELD_DECLARATION); //$NON-NLS-1$
FieldDeclaration fieldDeclaration = (FieldDeclaration) node;
Type type = fieldDeclaration.getType();
checkSourceRange(type, "Class[][]", source);
assertTrue("not an array type", type.isArrayType()); //$NON-NLS-1$
ArrayType arrayType = (ArrayType) type;
Type componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("is an array type", !componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class", source);
}

/**
* http://bugs.eclipse.org/bugs/show_bug.cgi?id=42839
*/
public void _2551_test0494() throws JavaModelException {
ICompilationUnit sourceUnit = getCompilationUnit("Converter" , "src", "test0494", "A.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
char[] source = sourceUnit.getSource().toCharArray();
ASTNode result = runConversion(getJLS4(), sourceUnit, true);
assertTrue("not a compilation unit", result.getNodeType() == ASTNode.COMPILATION_UNIT); //$NON-NLS-1$
CompilationUnit unit = (CompilationUnit) result;
assertEquals("Wrong number of problems", 0, unit.getProblems().length); //$NON-NLS-1$<
ASTNode node = getASTNode(unit, 0, 0);
assertTrue("not a field declaration", node.getNodeType() == ASTNode.FIELD_DECLARATION); //$NON-NLS-1$
FieldDeclaration fieldDeclaration = (FieldDeclaration) node;
Type type = fieldDeclaration.getType();
checkSourceRange(type, "Class[][][]", source);
assertTrue("not an array type", type.isArrayType()); //$NON-NLS-1$
ArrayType arrayType = (ArrayType) type;
Type componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[][]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("is an array type", !componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class", source);
}

/**
* http://bugs.eclipse.org/bugs/show_bug.cgi?id=42839
*/
public void _2551_test0495() throws JavaModelException {
ICompilationUnit sourceUnit = getCompilationUnit("Converter" , "src", "test0495", "A.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
char[] source = sourceUnit.getSource().toCharArray();
ASTNode result = runConversion(getJLS4(), sourceUnit, true);
assertTrue("not a compilation unit", result.getNodeType() == ASTNode.COMPILATION_UNIT); //$NON-NLS-1$
CompilationUnit unit = (CompilationUnit) result;
assertEquals("Wrong number of problems", 0, unit.getProblems().length); //$NON-NLS-1$<
ASTNode node = getASTNode(unit, 0, 0);
assertTrue("not a field declaration", node.getNodeType() == ASTNode.FIELD_DECLARATION); //$NON-NLS-1$
FieldDeclaration fieldDeclaration = (FieldDeclaration) node;
Type type = fieldDeclaration.getType();
checkSourceRange(type, "Class[][]", source);
assertTrue("not an array type", type.isArrayType()); //$NON-NLS-1$
ArrayType arrayType = (ArrayType) type;
Type componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("is an array type", !componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class", source);
List fragments = fieldDeclaration.fragments();
assertEquals("wrong size", 1, fragments.size());
VariableDeclarationFragment fragment = (VariableDeclarationFragment) fragments.get(0);
assertEquals("wrong extra dimension", 1, fragment.getExtraDimensions());
}

/**
* http://bugs.eclipse.org/bugs/show_bug.cgi?id=42839
*/
public void _2551_test0496() throws JavaModelException {
ICompilationUnit sourceUnit = getCompilationUnit("Converter" , "src", "test0496", "A.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
char[] source = sourceUnit.getSource().toCharArray();
ASTNode result = runConversion(getJLS4(), sourceUnit, true);
assertTrue("not a compilation unit", result.getNodeType() == ASTNode.COMPILATION_UNIT); //$NON-NLS-1$
CompilationUnit unit = (CompilationUnit) result;
assertEquals("Wrong number of problems", 0, unit.getProblems().length); //$NON-NLS-1$<
ASTNode node = getASTNode(unit, 0, 0);
assertTrue("not a field declaration", node.getNodeType() == ASTNode.FIELD_DECLARATION); //$NON-NLS-1$
FieldDeclaration fieldDeclaration = (FieldDeclaration) node;
Type type = fieldDeclaration.getType();
checkSourceRange(type, "Class[][][][]", source);
assertTrue("not an array type", type.isArrayType()); //$NON-NLS-1$
ArrayType arrayType = (ArrayType) type;
Type componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[][][]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[][]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("is an array type", !componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class", source);
}

/**
* http://bugs.eclipse.org/bugs/show_bug.cgi?id=42839
*/
Expand Down Expand Up @@ -6278,7 +6158,7 @@ public void test0605() throws JavaModelException {
/*
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=89014
*/
public void _2551_test0606() throws JavaModelException {
public void test0606() throws JavaModelException {
ICompilationUnit workingCopy = null;
try {
String contents =
Expand Down Expand Up @@ -9451,38 +9331,6 @@ public void test0682() throws JavaModelException {
checkSourceRange(arrayType, "String]", sourceUnit.getSource());
}

/**
* http://dev.eclipse.org/bugs/show_bug.cgi?id=196514
*/
public void _2551_test0683() throws JavaModelException {
ICompilationUnit sourceUnit = getCompilationUnit("Converter" , "src", "test0683", "Test.java"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
ASTNode node = runConversion(getJLS4(), sourceUnit, true, true);
assertTrue("Not a compilation unit", node.getNodeType() == ASTNode.COMPILATION_UNIT); //$NON-NLS-1$
CompilationUnit unit = (CompilationUnit) node;
assertProblemsSize(unit, 0);
node = getASTNode(unit, 0, 1, 0);
assertEquals("Not a expression statement", ASTNode.EXPRESSION_STATEMENT, node.getNodeType());
ExpressionStatement expressionStatement = (ExpressionStatement) node;
node = expressionStatement.getExpression();
assertEquals("Not a method invocation", ASTNode.METHOD_INVOCATION, node.getNodeType());
MethodInvocation methodInvocation = (MethodInvocation) node;
List arguments = methodInvocation.arguments();
assertEquals("Wrong size", 1, arguments.size());
node = (ASTNode)arguments.get(0);
assertEquals("Not an array creation", ASTNode.ARRAY_CREATION, node.getNodeType());
ArrayCreation arrayCreation = (ArrayCreation) node;
ArrayType arrayType = arrayCreation.getType();
checkSourceRange(arrayType, "String[0][b[10]][]", sourceUnit.getSource());
node = componentType(arrayType);
assertEquals("Not an array type", ASTNode.ARRAY_TYPE, node.getNodeType());
arrayType = (ArrayType)node;
checkSourceRange(arrayType, "String[0][b[10]]", sourceUnit.getSource());
node = componentType(arrayType);
assertEquals("Not an array type", ASTNode.ARRAY_TYPE, node.getNodeType());
arrayType = (ArrayType)node;
checkSourceRange(arrayType, "String[0]", sourceUnit.getSource());
}

/**
* http://dev.eclipse.org/bugs/show_bug.cgi?id=201929
*/
Expand Down Expand Up @@ -9597,7 +9445,7 @@ public void test0686() throws JavaModelException {
/*
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=207754
*/
public void _2551_test0687() throws JavaModelException {
public void test0687() throws JavaModelException {
ICompilationUnit workingCopy = null;
try {
String contents =
Expand Down
85 changes: 11 additions & 74 deletions ...lipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterTestAST8_2.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2021 IBM Corporation and others.
* Copyright (c) 2011, 2024 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -2654,18 +2654,8 @@ public void test0493() throws JavaModelException {
checkSourceRange(type, "Class[][]", source);
assertTrue("not an array type", type.isArrayType()); //$NON-NLS-1$
ArrayType arrayType = (ArrayType) type;
if (this.ast.apiLevel() < getJLS8()) {
Type componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("is an array type", !componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class", source);
} else {
Type elementType = arrayType.getElementType();
checkSourceRange(elementType, "Class", source);
}
Type elementType = arrayType.getElementType();
checkSourceRange(elementType, "Class", source);
}

/**
Expand All @@ -2685,22 +2675,8 @@ public void test0494() throws JavaModelException {
checkSourceRange(type, "Class[][][]", source);
assertTrue("not an array type", type.isArrayType()); //$NON-NLS-1$
ArrayType arrayType = (ArrayType) type;
if (this.ast.apiLevel() < getJLS8()) {
Type componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[][]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("is an array type", !componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class", source);
} else {
Type elementType = arrayType.getElementType();
checkSourceRange(elementType, "Class", source);
}
Type elementType = arrayType.getElementType();
checkSourceRange(elementType, "Class", source);
}

/**
Expand All @@ -2720,18 +2696,8 @@ public void test0495() throws JavaModelException {
checkSourceRange(type, "Class[][]", source);
assertTrue("not an array type", type.isArrayType()); //$NON-NLS-1$
ArrayType arrayType = (ArrayType) type;
if (this.ast.apiLevel() < getJLS8()) {
Type componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("is an array type", !componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class", source);
} else {
Type elementType = arrayType.getElementType();
checkSourceRange(elementType, "Class", source);
}
Type elementType = arrayType.getElementType();
checkSourceRange(elementType, "Class", source);
List fragments = fieldDeclaration.fragments();
assertEquals("wrong size", 1, fragments.size());
VariableDeclarationFragment fragment = (VariableDeclarationFragment) fragments.get(0);
Expand All @@ -2755,26 +2721,8 @@ public void test0496() throws JavaModelException {
checkSourceRange(type, "Class[][][][]", source);
assertTrue("not an array type", type.isArrayType()); //$NON-NLS-1$
ArrayType arrayType = (ArrayType) type;
if (this.ast.apiLevel() < getJLS8()) {
Type componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[][][]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[][]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("not an array type", componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class[]", source);
arrayType = (ArrayType) componentType;
componentType = componentType(arrayType);
assertTrue("is an array type", !componentType.isArrayType()); //$NON-NLS-1$
checkSourceRange(componentType, "Class", source);
} else {
Type elementType = arrayType.getElementType();
checkSourceRange(elementType, "Class", source);
}
Type elementType = arrayType.getElementType();
checkSourceRange(elementType, "Class", source);
}

/**
Expand Down Expand Up @@ -9495,19 +9443,8 @@ public void test0683() throws JavaModelException {
ArrayCreation arrayCreation = (ArrayCreation) node;
ArrayType arrayType = arrayCreation.getType();
checkSourceRange(arrayType, "String[0][b[10]][]", sourceUnit.getSource());
if (this.ast.apiLevel() < getJLS8()) {
node = componentType(arrayType);
assertEquals("Not an array type", ASTNode.ARRAY_TYPE, node.getNodeType());
arrayType = (ArrayType)node;
checkSourceRange(arrayType, "String[0][b[10]]", sourceUnit.getSource());
node = componentType(arrayType);
assertEquals("Not an array type", ASTNode.ARRAY_TYPE, node.getNodeType());
arrayType = (ArrayType)node;
checkSourceRange(arrayType, "String[0]", sourceUnit.getSource());
} else {
node = arrayType.getElementType();
checkSourceRange(node, "String", sourceUnit.getSource());
}
node = arrayType.getElementType();
checkSourceRange(node, "String", sourceUnit.getSource());
}

/**
Expand Down

0 comments on commit 9d6bfc3

Please sign in to comment.