Skip to content

Commit

Permalink
rename AbstractTest to AbstractSymbolResolutionTest
Browse files Browse the repository at this point in the history
  • Loading branch information
ftomassetti committed Aug 15, 2018
1 parent 710ed40 commit d3bc278
Show file tree
Hide file tree
Showing 25 changed files with 46 additions and 53 deletions.
Expand Up @@ -18,18 +18,17 @@

import com.github.javaparser.utils.CodeGenerationUtils;

import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

public abstract class AbstractTest {
public abstract class AbstractSymbolResolutionTest {

protected static Path adaptPath(Path path) {
if (Files.exists(path)) {
return path.toAbsolutePath();
}
Path underSymbolSolver = CodeGenerationUtils.mavenModuleRoot(AbstractTest.class).resolve("javaparser-symbol-solver-testing").resolve(path);
Path underSymbolSolver = CodeGenerationUtils.mavenModuleRoot(AbstractSymbolResolutionTest.class).resolve("javaparser-symbol-solver-testing").resolve(path);
if (Files.exists(underSymbolSolver)) {
return underSymbolSolver;
} else {
Expand Down
Expand Up @@ -19,7 +19,7 @@

import static org.junit.Assert.assertEquals;

public class Issue113 extends AbstractTest {
public class Issue113 extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver;

Expand Down
Expand Up @@ -17,7 +17,7 @@

import static org.junit.Assert.assertEquals;

public class Issue1485 extends AbstractTest {
public class Issue1485 extends AbstractSymbolResolutionTest {

@Test
public void issue1485withoutSpecifyingJARs() throws IOException {
Expand Down
Expand Up @@ -3,7 +3,6 @@
import com.github.javaparser.JavaParser;
import com.github.javaparser.ParseStart;
import com.github.javaparser.ParserConfiguration;
import com.github.javaparser.StreamProvider;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.body.*;
import com.github.javaparser.resolution.declarations.*;
Expand All @@ -17,16 +16,14 @@
import org.junit.Before;
import org.junit.Test;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Path;
import java.util.List;

import static com.github.javaparser.Providers.provider;
import static org.junit.Assert.assertEquals;

public class JavaParserAPIIntegrationTest extends AbstractTest {
public class JavaParserAPIIntegrationTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver;
private ResolvedReferenceType string;
Expand Down
Expand Up @@ -40,7 +40,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

public class SolveMethodDeclaredInEnumTest extends AbstractTest {
public class SolveMethodDeclaredInEnumTest extends AbstractSymbolResolutionTest {

@Test
public void methodDeclaredInEnum_enumFromJar() throws IOException {
Expand Down
Expand Up @@ -27,7 +27,7 @@
import com.github.javaparser.resolution.declarations.ResolvedMethodLikeDeclaration;
import com.github.javaparser.resolution.types.ResolvedPrimitiveType;
import com.github.javaparser.resolution.types.ResolvedReferenceType;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
Expand All @@ -50,7 +50,7 @@

import static org.junit.Assert.*;

public class JavaParserClassDeclarationTest extends AbstractTest {
public class JavaParserClassDeclarationTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver;
private TypeSolver typeSolverNewCode;
Expand Down
Expand Up @@ -28,7 +28,7 @@
import com.github.javaparser.resolution.declarations.*;
import com.github.javaparser.resolution.types.ResolvedPrimitiveType;
import com.github.javaparser.resolution.types.ResolvedReferenceType;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.JavaSymbolSolver;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
Expand All @@ -41,7 +41,6 @@
import org.junit.Before;
import org.junit.Test;

import java.io.File;
import java.nio.file.Path;
import java.util.Comparator;
import java.util.List;
Expand All @@ -50,7 +49,7 @@

import static org.junit.Assert.assertEquals;

public class JavaParserEnumDeclarationTest extends AbstractTest {
public class JavaParserEnumDeclarationTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver;

Expand Down
Expand Up @@ -25,7 +25,7 @@
import com.github.javaparser.resolution.declarations.*;
import com.github.javaparser.resolution.types.ResolvedPrimitiveType;
import com.github.javaparser.resolution.types.ResolvedReferenceType;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.JavaSymbolSolver;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
Expand All @@ -47,7 +47,7 @@

import static org.junit.Assert.assertEquals;

public class JavaParserInterfaceDeclarationTest extends AbstractTest {
public class JavaParserInterfaceDeclarationTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver;

Expand Down
Expand Up @@ -5,7 +5,7 @@
import com.github.javaparser.ast.expr.Expression;
import com.github.javaparser.ast.stmt.ExpressionStmt;
import com.github.javaparser.ast.stmt.Statement;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
Expand All @@ -17,7 +17,7 @@
import java.io.IOException;
import java.nio.file.Path;

public class Issue257 extends AbstractTest {
public class Issue257 extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver;

Expand Down
Expand Up @@ -17,7 +17,7 @@
package com.github.javaparser.symbolsolver.javassistmodel;

import com.github.javaparser.resolution.types.ResolvedReferenceType;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver;
Expand All @@ -32,7 +32,7 @@

import static org.junit.Assert.*;

public class JavassistClassDeclarationTest extends AbstractTest {
public class JavassistClassDeclarationTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver;

Expand Down
Expand Up @@ -17,7 +17,7 @@
package com.github.javaparser.symbolsolver.javassistmodel;

import com.github.javaparser.resolution.declarations.ResolvedEnumDeclaration;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver;
Expand All @@ -31,7 +31,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class JavassistEnumDeclarationTest extends AbstractTest {
public class JavassistEnumDeclarationTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver;

Expand Down
Expand Up @@ -16,7 +16,7 @@

package com.github.javaparser.symbolsolver.javassistmodel;

import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver;
Expand All @@ -30,7 +30,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class JavassistInterfaceDeclarationTest extends AbstractTest {
public class JavassistInterfaceDeclarationTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver;

Expand Down
Expand Up @@ -20,7 +20,7 @@
import com.github.javaparser.resolution.declarations.*;
import com.github.javaparser.resolution.types.ResolvedReferenceType;
import com.github.javaparser.resolution.types.ResolvedTypeVariable;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
Expand All @@ -35,7 +35,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class ReflectionClassDeclarationTest extends AbstractTest {
public class ReflectionClassDeclarationTest extends AbstractSymbolResolutionTest {

private TypeSolver typeResolver = new ReflectionTypeSolver(false);

Expand Down
Expand Up @@ -16,7 +16,7 @@

package com.github.javaparser.symbolsolver.reflectionmodel;

import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
import org.junit.Test;
Expand All @@ -25,7 +25,7 @@

import static org.junit.Assert.assertEquals;

public class ReflectionEnumDeclarationTest extends AbstractTest {
public class ReflectionEnumDeclarationTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver = new ReflectionTypeSolver(false);

Expand Down
Expand Up @@ -21,7 +21,7 @@
import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
import com.github.javaparser.resolution.types.ResolvedReferenceType;
import com.github.javaparser.resolution.types.ResolvedTypeVariable;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
Expand All @@ -36,7 +36,7 @@

import static org.junit.Assert.assertEquals;

public class ReflectionInterfaceDeclarationTest extends AbstractTest {
public class ReflectionInterfaceDeclarationTest extends AbstractSymbolResolutionTest {

@Test
public void testGetDeclaredMethods() {
Expand Down
Expand Up @@ -17,16 +17,15 @@
package com.github.javaparser.symbolsolver.resolution;

import com.github.javaparser.JavaParser;
import com.github.javaparser.ParseException;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;

import java.io.InputStream;

/**
* @author Federico Tomassetti
*/
public abstract class AbstractResolutionTest extends AbstractTest {
public abstract class AbstractResolutionTest extends AbstractSymbolResolutionTest {

protected CompilationUnit parseSampleWithStandardExtension(String sampleName) {
return parseSample(sampleName, "java");
Expand Down
Expand Up @@ -17,7 +17,7 @@
package com.github.javaparser.symbolsolver.resolution;

import com.github.javaparser.SlowTest;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.SourceFileInfoExtractor;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
Expand All @@ -35,7 +35,7 @@
import static org.junit.Assert.assertTrue;

@Category(SlowTest.class)
public class AnalyseJavaParserTest extends AbstractTest {
public class AnalyseJavaParserTest extends AbstractSymbolResolutionTest {

private static final Path root = adaptPath("src/test/test_sourcecode/javaparser_src");
private static final Path properSrc = root.resolve("proper_source");
Expand Down
Expand Up @@ -30,7 +30,7 @@
import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
import com.github.javaparser.resolution.declarations.ResolvedTypeDeclaration;
import com.github.javaparser.resolution.types.ResolvedType;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.core.resolution.Context;
import com.github.javaparser.symbolsolver.javaparser.Navigator;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
Expand All @@ -52,7 +52,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

public class ContextTest extends AbstractTest {
public class ContextTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolver = new CombinedTypeSolver(new MemoryTypeSolver(), new ReflectionTypeSolver());

Expand Down
Expand Up @@ -17,7 +17,7 @@
package com.github.javaparser.symbolsolver.resolution;

import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
Expand All @@ -35,7 +35,7 @@
/**
* @author Federico Tomassetti
*/
public class SymbolSolverTest extends AbstractTest {
public class SymbolSolverTest extends AbstractSymbolResolutionTest {

private TypeSolver typeSolverNewCode;
private SymbolSolver symbolSolver;
Expand Down
Expand Up @@ -18,7 +18,7 @@

import com.github.javaparser.resolution.UnsolvedSymbolException;
import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
Expand All @@ -33,7 +33,7 @@

import static org.junit.Assert.*;

public class SymbolSolverWithJavassistClassTest extends AbstractTest {
public class SymbolSolverWithJavassistClassTest extends AbstractSymbolResolutionTest {
private TypeSolver typeSolver;
private SymbolSolver symbolSolver;
private JavassistClassDeclaration classDeclarationConcreteClass;
Expand Down
Expand Up @@ -2,7 +2,7 @@

import com.github.javaparser.resolution.UnsolvedSymbolException;
import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
Expand All @@ -18,7 +18,7 @@
import static org.junit.Assert.*;
import static org.junit.Assert.fail;

public class SymbolSolverWithJavassistEnumTest extends AbstractTest {
public class SymbolSolverWithJavassistEnumTest extends AbstractSymbolResolutionTest {
private TypeSolver typeSolver;
private SymbolSolver symbolSolver;
private JavassistEnumDeclaration enumDeclarationConcrete;
Expand Down
Expand Up @@ -2,7 +2,7 @@

import com.github.javaparser.resolution.UnsolvedSymbolException;
import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
import com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
Expand All @@ -17,7 +17,7 @@

import static org.junit.Assert.*;

public class SymbolSolverWithJavassistInterfaceTest extends AbstractTest {
public class SymbolSolverWithJavassistInterfaceTest extends AbstractSymbolResolutionTest {
private TypeSolver typeSolver;
private SymbolSolver symbolSolver;
private JavassistInterfaceDeclaration interfaceDeclarationStandalone;
Expand Down

0 comments on commit d3bc278

Please sign in to comment.