Skip to content

Commit

Permalink
Move expected output
Browse files Browse the repository at this point in the history
  • Loading branch information
matozoid committed Apr 22, 2018
1 parent bb5e70c commit 1137d4a
Show file tree
Hide file tree
Showing 397 changed files with 32 additions and 34 deletions.
Expand Up @@ -16,7 +16,6 @@


package com.github.javaparser.symbolsolver.resolution; package com.github.javaparser.symbolsolver.resolution;


import com.github.javaparser.ParseException;
import com.github.javaparser.SlowTest; import com.github.javaparser.SlowTest;
import com.github.javaparser.symbolsolver.AbstractTest; import com.github.javaparser.symbolsolver.AbstractTest;
import com.github.javaparser.symbolsolver.SourceFileInfoExtractor; import com.github.javaparser.symbolsolver.SourceFileInfoExtractor;
Expand All @@ -31,21 +30,21 @@
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths;


import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;


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


private static final Path src = adaptPath("src/test/test_sourcecode/javaparser_src/proper_source"); private static final Path root = adaptPath("src/test/test_sourcecode/javaparser_src");
private static final Path properSrc = root.resolve("proper_source");


private SourceFileInfoExtractor getSourceFileInfoExtractor() { private SourceFileInfoExtractor getSourceFileInfoExtractor() {
CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver(); CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
combinedTypeSolver.add(new ReflectionTypeSolver()); combinedTypeSolver.add(new ReflectionTypeSolver());
combinedTypeSolver.add(new JavaParserTypeSolver(src)); combinedTypeSolver.add(new JavaParserTypeSolver(properSrc));
combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath("src/test/test_sourcecode/javaparser_src/generated"))); combinedTypeSolver.add(new JavaParserTypeSolver(root.resolve("generated")));
SourceFileInfoExtractor sourceFileInfoExtractor = new SourceFileInfoExtractor(); SourceFileInfoExtractor sourceFileInfoExtractor = new SourceFileInfoExtractor();
sourceFileInfoExtractor.setTypeSolver(combinedTypeSolver); sourceFileInfoExtractor.setTypeSolver(combinedTypeSolver);
sourceFileInfoExtractor.setPrintFileName(false); sourceFileInfoExtractor.setPrintFileName(false);
Expand All @@ -60,8 +59,8 @@ static String readFile(Path file)


private static final boolean DEBUG = true; private static final boolean DEBUG = true;


private void parse(String fileName) throws IOException, ParseException { private void parse(String fileName) throws IOException {
Path sourceFile = src.resolve( fileName + ".java"); Path sourceFile = properSrc.resolve( fileName + ".java");
SourceFileInfoExtractor sourceFileInfoExtractor = getSourceFileInfoExtractor(); SourceFileInfoExtractor sourceFileInfoExtractor = getSourceFileInfoExtractor();
OutputStream outErrStream = new ByteArrayOutputStream(); OutputStream outErrStream = new ByteArrayOutputStream();
PrintStream outErr = new PrintStream(outErrStream); PrintStream outErr = new PrintStream(outErrStream);
Expand All @@ -71,15 +70,15 @@ private void parse(String fileName) throws IOException, ParseException {
sourceFileInfoExtractor.solve(sourceFile); sourceFileInfoExtractor.solve(sourceFile);
String output = outErrStream.toString(); String output = outErrStream.toString();


String path = "src/test/resources/javaparser_expected_output/" + fileName.replaceAll("/", "_") + ".txt"; String path = "expected_output/" + fileName.replaceAll("/", "_") + ".txt";
Path dstFile = adaptPath(path); Path dstFile = adaptPath(root.resolve(path));


if (DEBUG && (sourceFileInfoExtractor.getKo() != 0 || sourceFileInfoExtractor.getUnsupported() != 0)) { if (DEBUG && (sourceFileInfoExtractor.getKo() != 0 || sourceFileInfoExtractor.getUnsupported() != 0)) {
System.err.println(output); System.err.println(output);
} }


assertTrue("No failures expected when analyzing " + path, 0 == sourceFileInfoExtractor.getKo()); assertEquals("No failures expected when analyzing " + path, 0, sourceFileInfoExtractor.getKo());
assertTrue("No UnsupportedOperationException expected when analyzing " + path, 0 == sourceFileInfoExtractor.getUnsupported()); assertEquals("No UnsupportedOperationException expected when analyzing " + path, 0, sourceFileInfoExtractor.getUnsupported());


String expected = readFile(dstFile); String expected = readFile(dstFile);


Expand All @@ -101,27 +100,27 @@ private void parse(String fileName) throws IOException, ParseException {
} }


@Test @Test
public void parsePositionUtils() throws IOException, ParseException { public void parsePositionUtils() throws IOException {
parse("com/github/javaparser/PositionUtils"); parse("com/github/javaparser/PositionUtils");
} }


@Test @Test
public void parseJavaParser() throws IOException, ParseException { public void parseJavaParser() throws IOException {
parse("com/github/javaparser/JavaParser"); parse("com/github/javaparser/JavaParser");
} }


@Test @Test
public void parseStatement() throws IOException, ParseException { public void parseStatement() throws IOException {
parse("com/github/javaparser/ast/stmt/Statement"); parse("com/github/javaparser/ast/stmt/Statement");
} }


@Test @Test
public void parseCatchClause() throws IOException, ParseException { public void parseCatchClause() throws IOException {
parse("com/github/javaparser/ast/stmt/CatchClause"); parse("com/github/javaparser/ast/stmt/CatchClause");
} }


@Test @Test
public void parseStatements() throws IOException, ParseException { public void parseStatements() throws IOException {
parse("com/github/javaparser/ast/stmt/LabeledStmt"); parse("com/github/javaparser/ast/stmt/LabeledStmt");
parse("com/github/javaparser/ast/stmt/BreakStmt"); parse("com/github/javaparser/ast/stmt/BreakStmt");
parse("com/github/javaparser/ast/stmt/ReturnStmt"); parse("com/github/javaparser/ast/stmt/ReturnStmt");
Expand All @@ -145,7 +144,7 @@ public void parseStatements() throws IOException, ParseException {
} }


@Test @Test
public void parseExpressions() throws IOException, ParseException { public void parseExpressions() throws IOException {
parse("com/github/javaparser/ast/expr/NameExpr"); parse("com/github/javaparser/ast/expr/NameExpr");
parse("com/github/javaparser/ast/expr/FieldAccessExpr"); parse("com/github/javaparser/ast/expr/FieldAccessExpr");
parse("com/github/javaparser/ast/expr/CharLiteralExpr"); parse("com/github/javaparser/ast/expr/CharLiteralExpr");
Expand Down Expand Up @@ -187,7 +186,7 @@ public void parseExpressions() throws IOException, ParseException {
} }


@Test @Test
public void parseTypes() throws IOException, ParseException { public void parseTypes() throws IOException {
parse("com/github/javaparser/ast/type/ClassOrInterfaceType"); parse("com/github/javaparser/ast/type/ClassOrInterfaceType");
parse("com/github/javaparser/ast/type/PrimitiveType"); parse("com/github/javaparser/ast/type/PrimitiveType");
parse("com/github/javaparser/ast/type/WildcardType"); parse("com/github/javaparser/ast/type/WildcardType");
Expand All @@ -198,7 +197,7 @@ public void parseTypes() throws IOException, ParseException {
} }


@Test @Test
public void parseVisitors() throws IOException, ParseException { public void parseVisitors() throws IOException {
parse("com/github/javaparser/ast/visitor/EqualsVisitor"); parse("com/github/javaparser/ast/visitor/EqualsVisitor");
parse("com/github/javaparser/ast/visitor/ModifierVisitorAdapter"); parse("com/github/javaparser/ast/visitor/ModifierVisitorAdapter");
parse("com/github/javaparser/ast/visitor/DumpVisitor"); parse("com/github/javaparser/ast/visitor/DumpVisitor");
Expand All @@ -209,17 +208,17 @@ public void parseVisitors() throws IOException, ParseException {
} }


@Test @Test
public void parseCloneVisitor() throws IOException, ParseException { public void parseCloneVisitor() throws IOException {
parse("com/github/javaparser/ast/visitor/CloneVisitor"); parse("com/github/javaparser/ast/visitor/CloneVisitor");
} }


@Test @Test
public void parseSourcesHelper() throws IOException, ParseException { public void parseSourcesHelper() throws IOException {
parse("com/github/javaparser/SourcesHelper"); parse("com/github/javaparser/SourcesHelper");
} }


@Test @Test
public void parseComments() throws IOException, ParseException { public void parseComments() throws IOException {
parse("com/github/javaparser/ast/comments/LineComment"); parse("com/github/javaparser/ast/comments/LineComment");
parse("com/github/javaparser/ast/comments/Comment"); parse("com/github/javaparser/ast/comments/Comment");
parse("com/github/javaparser/ast/comments/CommentsParser"); parse("com/github/javaparser/ast/comments/CommentsParser");
Expand All @@ -229,7 +228,7 @@ public void parseComments() throws IOException, ParseException {
} }


@Test @Test
public void parseTheRest() throws IOException, ParseException { public void parseTheRest() throws IOException {
parse("com/github/javaparser/ast/internal/Utils"); parse("com/github/javaparser/ast/internal/Utils");
parse("com/github/javaparser/ast/body/AnnotationMemberDeclaration"); parse("com/github/javaparser/ast/body/AnnotationMemberDeclaration");
parse("com/github/javaparser/ast/body/EnumDeclaration"); parse("com/github/javaparser/ast/body/EnumDeclaration");
Expand Down
Expand Up @@ -16,15 +16,13 @@


package com.github.javaparser.symbolsolver.resolution; package com.github.javaparser.symbolsolver.resolution;


import com.github.javaparser.ParseException;
import com.github.javaparser.SlowTest; import com.github.javaparser.SlowTest;
import com.github.javaparser.symbolsolver.SourceFileInfoExtractor; import com.github.javaparser.symbolsolver.SourceFileInfoExtractor;
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JarTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;

import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
Expand All @@ -45,9 +43,9 @@
public class AnalyseJavaSymbolSolver060Test extends AbstractResolutionTest { public class AnalyseJavaSymbolSolver060Test extends AbstractResolutionTest {


private static final Path root = adaptPath("src/test/test_sourcecode/javasymbolsolver_0_6_0"); private static final Path root = adaptPath("src/test/test_sourcecode/javasymbolsolver_0_6_0");
private static final Path src = adaptPath(root.resolve("src")); private static final Path src = root.resolve("src");
private static final Path lib = adaptPath(root.resolve("lib")); private static final Path lib = root.resolve("lib");
private static final Path expectedOutput = adaptPath("src/test/resources/javasymbolsolver_0_6_0/expected_output"); private static final Path expectedOutput = root.resolve("expected_output");


private static SourceFileInfoExtractor getSourceFileInfoExtractor() { private static SourceFileInfoExtractor getSourceFileInfoExtractor() {
CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver(); CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
Expand Down
Expand Up @@ -39,13 +39,14 @@
@Category(SlowTest.class) @Category(SlowTest.class)
public class AnalyseNewJavaParserTest extends AbstractResolutionTest { public class AnalyseNewJavaParserTest extends AbstractResolutionTest {


private static final Path root = adaptPath("src/test/test_sourcecode/javaparser_new_src");
private static final Path src = adaptPath("src/test/test_sourcecode/javaparser_new_src/javaparser-core"); private static final Path src = adaptPath("src/test/test_sourcecode/javaparser_new_src/javaparser-core");


private static SourceFileInfoExtractor getSourceFileInfoExtractor() { private static SourceFileInfoExtractor getSourceFileInfoExtractor() {
CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver(); CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
combinedTypeSolver.add(new ReflectionTypeSolver()); combinedTypeSolver.add(new ReflectionTypeSolver());
combinedTypeSolver.add(new JavaParserTypeSolver(src)); combinedTypeSolver.add(new JavaParserTypeSolver(src));
combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath("src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources"))); combinedTypeSolver.add(new JavaParserTypeSolver(root.resolve("javaparser-generated-sources")));
SourceFileInfoExtractor sourceFileInfoExtractor = new SourceFileInfoExtractor(); SourceFileInfoExtractor sourceFileInfoExtractor = new SourceFileInfoExtractor();
sourceFileInfoExtractor.setTypeSolver(combinedTypeSolver); sourceFileInfoExtractor.setTypeSolver(combinedTypeSolver);
sourceFileInfoExtractor.setPrintFileName(false); sourceFileInfoExtractor.setPrintFileName(false);
Expand Down Expand Up @@ -73,12 +74,12 @@ private void parse(String fileName) throws IOException {
sourceFileInfoExtractor.solveMethodCalls(sourceFile); sourceFileInfoExtractor.solveMethodCalls(sourceFile);
String output = outErrStream.toString(); String output = outErrStream.toString();


File expectedOutput = new File("src/test/resources/javaparser_methodcalls_expected_output"); Path expectedOutput = root.resolve("expected_output");
Path path = adaptPath(expectedOutput.getPath() + "/" + fileName.replaceAll("/", "_") + ".txt"); Path path = expectedOutput.resolve(fileName.replaceAll("/", "_") + ".txt");
Path dstFile = path; Path dstFile = path;


if (isJava9()) { if (isJava9()) {
Path path9 = adaptPath(expectedOutput.getPath() + "/" + fileName.replaceAll("/", "_") + "_J9.txt"); Path path9 = expectedOutput.resolve(fileName.replaceAll("/", "_") + "_J9.txt");
Path dstFile9 = path9; Path dstFile9 = path9;
if (Files.exists(dstFile9)) { if (Files.exists(dstFile9)) {
path = path9; path = path9;
Expand All @@ -90,8 +91,8 @@ private void parse(String fileName) throws IOException {
System.err.println(output); System.err.println(output);
} }


assertTrue("No failures expected when analyzing " + path, 0 == sourceFileInfoExtractor.getKo()); assertEquals("No failures expected when analyzing " + path, 0, sourceFileInfoExtractor.getKo());
assertTrue("No UnsupportedOperationException expected when analyzing " + path, 0 == sourceFileInfoExtractor.getUnsupported()); assertEquals("No UnsupportedOperationException expected when analyzing " + path, 0, sourceFileInfoExtractor.getUnsupported());


if (!Files.exists(dstFile)) { if (!Files.exists(dstFile)) {
// If we need to update the file uncomment these lines // If we need to update the file uncomment these lines
Expand Down

0 comments on commit 1137d4a

Please sign in to comment.