From 17072b4d14dad00acac247508e35b52c0233170b Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 8 Jan 2016 08:28:42 +0000 Subject: Allow multiple source paths to be set --- src/test/java/org/zwobble/couscous/tests/JavaToInterpreterTests.java | 2 +- src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java | 3 ++- .../org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/test/java/org') diff --git a/src/test/java/org/zwobble/couscous/tests/JavaToInterpreterTests.java b/src/test/java/org/zwobble/couscous/tests/JavaToInterpreterTests.java index 49b1fbf..8008261 100644 --- a/src/test/java/org/zwobble/couscous/tests/JavaToInterpreterTests.java +++ b/src/test/java/org/zwobble/couscous/tests/JavaToInterpreterTests.java @@ -26,7 +26,7 @@ public class JavaToInterpreterTests extends CompilerTests { List arguments ) throws IOException, InterruptedException { JavaFrontend frontend = new JavaFrontend(); - List classNodes = frontend.readSourceDirectory(directory, directory); + List classNodes = frontend.readSourceDirectory(ImmutableList.of(directory), directory); Project project = JavaProject.of(classNodes); Interpreter interpreter = new Interpreter(project); diff --git a/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java b/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java index 2c8dfeb..d2d62b1 100644 --- a/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java +++ b/src/test/java/org/zwobble/couscous/tests/JavaToPythonTests.java @@ -1,5 +1,6 @@ package org.zwobble.couscous.tests; +import com.google.common.collect.ImmutableList; import org.junit.Test; import org.zwobble.couscous.CouscousCompiler; import org.zwobble.couscous.ast.TypeName; @@ -28,7 +29,7 @@ public class JavaToPythonTests extends CompilerTests { CouscousCompiler compiler = new CouscousCompiler( new JavaFrontend(), new PythonBackend(directoryPath, "couscous")); - compiler.compileDirectory(directory, directory); + compiler.compileDirectory(ImmutableList.of(directory), directory); return PythonMethodRunner.runFunction(directoryPath, type, methodName, arguments); } finally { deleteRecursively(directoryPath.toFile()); diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java index 2e61fe0..5548b2f 100644 --- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java +++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java @@ -1,5 +1,6 @@ package org.zwobble.couscous.tests.frontends.java; +import com.google.common.collect.ImmutableList; import org.junit.Test; import org.zwobble.couscous.ast.*; import org.zwobble.couscous.frontends.java.JavaReader; @@ -646,7 +647,7 @@ public class JavaReaderTests { Files.createDirectories(directoryPath.resolve("com/example")); Files.write(sourcePath, asList(javaClass)); - return JavaReader.readClassFromFile(directoryPath, sourcePath); + return JavaReader.readClassFromFile(ImmutableList.of(directoryPath), sourcePath); } finally { deleteRecursively(directoryPath.toFile()); } -- cgit v1.2.3