Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrong package name when parsing class #4782

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 119 additions & 0 deletions src/test/java/spoon/test/api/APITest.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand All @@ -40,8 +41,14 @@
import spoon.SpoonException;
import spoon.compiler.Environment;
import spoon.compiler.InvalidClassPathException;
import spoon.reflect.code.CtExpression;
import spoon.reflect.code.CtFieldRead;
import spoon.reflect.code.CtIf;
import spoon.reflect.code.CtInvocation;
import spoon.reflect.code.CtLocalVariable;
import spoon.reflect.code.CtReturn;
import spoon.reflect.code.CtStatement;
import spoon.reflect.code.CtTypeAccess;
import spoon.reflect.code.CtVariableAccess;
import spoon.reflect.cu.CompilationUnit;
import spoon.reflect.declaration.CtClass;
Expand All @@ -63,15 +70,18 @@
import spoon.support.OutputDestinationHandler;
import spoon.support.UnsettableProperty;
import spoon.support.compiler.SnippetCompilationError;
import spoon.support.compiler.VirtualFile;
import spoon.support.reflect.declaration.CtElementImpl;
import spoon.template.Local;
import spoon.template.TemplateMatcher;
import spoon.template.TemplateParameter;
import spoon.test.api.processors.AwesomeProcessor;
import spoon.test.api.testclasses.Bar;
import spoon.test.api.testclasses.constants.ImportConstants;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
Expand Down Expand Up @@ -447,6 +457,115 @@ public void testOneLinerIntro() {
assertEquals("System.out.println(\"yeah\")", l.getMethodsByName("m").get(0).getBody().getStatement(0).toString());
}

@Test
public void testParsingInlineQualifiedClassName() {
String code1 = "package io.example.pack1.pack2;\n" +
" public class Example{\n" +
" void add(io.example.other.Class1<io.example.other.Class2> value){\n" +
" }\n" +
" }\n";
CtClass<?> class1 = Launcher.parseClass(code1);
List<CtParameter<?>> add = class1.getMethodsByName("add").get(0).getParameters();
assertEquals(1, add.size());
assertEquals("value", add.get(0).getSimpleName());
assertEquals("io.example.other.Class1", add.get(0).getType().getQualifiedName());
assertEquals(1, add.get(0).getType().getActualTypeArguments().size());
assertEquals("io.example.other.Class2", add.get(0).getType().getActualTypeArguments().get(0).getQualifiedName());
String code2 = "package io.example.pack1.pack2;\n" +
" public class Example{\n" +
" void add(io.example.pack1.Class1<io.example.pack1.Class2> value){\n" +
" }\n" +
" }\n";
CtClass<?> class2 = Launcher.parseClass(code2);
List<CtParameter<?>> add2 = class2.getMethodsByName("add").get(0).getParameters();
assertEquals(1, add2.size());
assertEquals("value", add2.get(0).getSimpleName());
assertEquals("io.example.pack1.Class1", add2.get(0).getType().getQualifiedName());
assertEquals(1, add2.get(0).getType().getActualTypeArguments().size());
assertEquals("io.example.pack1.Class2", add2.get(0).getType().getActualTypeArguments().get(0).getQualifiedName());
}

@Test
public void testParsingConstants() {

// Successful case
final Launcher launcher = new Launcher();
Environment environment = launcher.getEnvironment();

environment.setNoClasspath(true);
environment.setAutoImports(true);
environment.setComplianceLevel(11);
Path basePath = Paths.get("src/test/java/");
Path filePath = Paths.get("spoon/test/api/testclasses/constants/ImportConstants.java");
launcher.addInputResource(basePath.resolve(filePath).toString());
launcher.run();

CtType<ImportConstants> ctClass = launcher.getFactory().Type().get(ImportConstants.class);
CtMethod<?> concatConstants = ctClass.getMethodsByName("concatConstants").get(0);
CtStatement middle = concatConstants.getBody().getStatement(0);
assertInstanceOf(CtLocalVariable.class, middle);
assertEquals("java.lang.String", ((CtLocalVariable<?>) middle).getType().getQualifiedName());
CtFieldRead<?> defaultExpression2 = (CtFieldRead<?>) ((CtLocalVariable<?>) middle).getDefaultExpression();
assertEquals("spoon.test.api.testclasses.constants.Constants", ((CtTypeAccess<?>) defaultExpression2.getTarget()).getAccessedType().getQualifiedName());

assertInstanceOf(CtReturn.class, concatConstants.getBody().getStatement(1));
CtExpression<?> returnedExpression = ((CtReturn<?>) concatConstants.getBody().getStatement(1)).getReturnedExpression();
assertInstanceOf(CtInvocation.class, returnedExpression);
CtFieldRead<?> first = (CtFieldRead<?>) ((CtInvocation<?>) returnedExpression).getArguments().get(0);
assertInstanceOf(CtTypeAccess.class, first.getTarget());
assertEquals("spoon.test.api.testclasses.constants.Constants", ((CtTypeAccess<?>) first.getTarget()).getAccessedType().getQualifiedName());
CtFieldRead<?> last = (CtFieldRead<?>) ((CtInvocation<?>) returnedExpression).getArguments().get(2);
assertInstanceOf(CtTypeAccess.class, last.getTarget());
assertEquals("spoon.test.api.testclasses.constants.Constants", ((CtTypeAccess<?>) last.getTarget()).getAccessedType().getQualifiedName());

// Failed case with the same check
String code1 = "package io.example.pack2;\n" +
" import io.example.Constants;\n" +
" import static io.example.Constants.LAST;\n" +
"package io.example.pack;\n" +
"\n" +
"import io.example.Constants;\n" +
"import static io.example.Constants.LAST;\n" +
"\n" +
"public class ImportConstants {\n" +
"\n" +
" public String concatConstants(){\n" +
" String middle = Constants.MIDDLE;\n" +
" return concat(Constants.FIRST, middle, LAST);\n" +
" }\n" +
"\n" +
" public String concat(String prefix, String middle, String suffix){\n" +
" return prefix + middle + suffix;\n" +
" }\n" +
"}";

Launcher launcher1 = new Launcher();
launcher1.addInputResource(new VirtualFile(code1));
launcher1.getEnvironment().setNoClasspath(true);
launcher1.getEnvironment().setAutoImports(true);
launcher1.getEnvironment().setComplianceLevel(11);
Collection<CtType<?>> allTypes = launcher1.buildModel().getAllTypes();
CtClass<?> class1 = (CtClass<?>) allTypes.stream().findFirst().get();
CtMethod<?> concatConstants1 = class1.getMethodsByName("concatConstants").get(0);
CtStatement middle1 = concatConstants1.getBody().getStatement(0);
assertInstanceOf(CtLocalVariable.class, middle1);
assertEquals("java.lang.String", ((CtLocalVariable<?>) middle1).getType().getQualifiedName());
CtFieldRead<?> defaultExpression1 = (CtFieldRead<?>) ((CtLocalVariable<?>) middle1).getDefaultExpression();
assertEquals("io.example.Constants", ((CtTypeAccess<?>)defaultExpression1.getTarget()).getAccessedType().getQualifiedName());

assertInstanceOf(CtReturn.class, concatConstants1.getBody().getStatement(1));
CtExpression<?> returnedExpression1 = ((CtReturn<?>) concatConstants1.getBody().getStatement(1)).getReturnedExpression();
assertInstanceOf(CtInvocation.class, returnedExpression1);
assertInstanceOf(CtFieldRead.class, ((CtInvocation<?>) returnedExpression1).getArguments().get(0));
CtFieldRead<?> first1 = (CtFieldRead<?>) ((CtInvocation<?>) returnedExpression1).getArguments().get(0);
assertInstanceOf(CtTypeAccess.class, first1.getTarget());
assertEquals("io.example.Constants", ((CtTypeAccess<?>)first1.getTarget()).getAccessedType().getQualifiedName());
assertInstanceOf(CtFieldRead.class, ((CtInvocation<?>) returnedExpression1).getArguments().get(2));
CtFieldRead<?> last1 = (CtFieldRead<?>) ((CtInvocation<?>) returnedExpression1).getArguments().get(2);
assertInstanceOf(CtTypeAccess.class, last1.getTarget());
assertEquals("io.example.Constants", ((CtTypeAccess<?>)last1.getTarget()).getAccessedType().getQualifiedName());
}

@Test
public void testSourceClasspathDoesNotAcceptDotClass() {
// contract: setSourceClassPath does not accept .class files
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package spoon.test.api.testclasses.constants;

public class Constants {

public static String FIRST = "first";
public static String MIDDLE = "middle";
public static String LAST = "last";

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package spoon.test.api.testclasses.constants;

import spoon.test.api.testclasses.constants.Constants;
import static spoon.test.api.testclasses.constants.Constants.LAST;

public class ImportConstants {

public String concatConstants(){
var middle = Constants.MIDDLE;
return concat(Constants.FIRST, middle, LAST);
}

public String concat(String prefix, String middle, String suffix){
return prefix + middle + suffix;
}
}
Loading