From 19d7311066faea55611488e7774b1b09e8d0239d Mon Sep 17 00:00:00 2001 From: Andrea Peruffo Date: Fri, 30 Aug 2024 21:29:49 +0100 Subject: [PATCH] [chore] Remove unused imported folder from the test-gen plugin (#504) minor follow up cleanup. --- .../com/dylibso/chicory/maven/JavaTestGen.java | 4 +--- .../com/dylibso/chicory/maven/TestGenMojo.java | 15 +++------------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/test-gen-plugin/src/main/java/com/dylibso/chicory/maven/JavaTestGen.java b/test-gen-plugin/src/main/java/com/dylibso/chicory/maven/JavaTestGen.java index b2fefe98d..779b03e6d 100644 --- a/test-gen-plugin/src/main/java/com/dylibso/chicory/maven/JavaTestGen.java +++ b/test-gen-plugin/src/main/java/com/dylibso/chicory/maven/JavaTestGen.java @@ -25,7 +25,6 @@ import com.github.javaparser.ast.expr.StringLiteralExpr; import com.github.javaparser.ast.expr.VariableDeclarationExpr; import com.github.javaparser.ast.stmt.BlockStmt; -import com.github.javaparser.utils.SourceRoot; import com.github.javaparser.utils.StringEscapeUtils; import java.io.File; import java.util.ArrayList; @@ -69,8 +68,7 @@ public JavaTestGen( this.excludedUnlinkableWasts = excludedUnlinkableWasts; } - public CompilationUnit generate( - String name, Wast wast, File wasmFilesFolder, SourceRoot importsSourceRoot) { + public CompilationUnit generate(String name, Wast wast, File wasmFilesFolder) { var cu = new CompilationUnit("com.dylibso.chicory.test.gen"); var testName = "SpecV1" + capitalize(escapedCamelCase(name)) + "Test"; cu.setStorage(sourceTargetFolder.toPath().resolve(testName + ".java")); diff --git a/test-gen-plugin/src/main/java/com/dylibso/chicory/maven/TestGenMojo.java b/test-gen-plugin/src/main/java/com/dylibso/chicory/maven/TestGenMojo.java index 01afd4e24..87c73859a 100644 --- a/test-gen-plugin/src/main/java/com/dylibso/chicory/maven/TestGenMojo.java +++ b/test-gen-plugin/src/main/java/com/dylibso/chicory/maven/TestGenMojo.java @@ -63,12 +63,6 @@ public class TestGenMojo extends AbstractMojo { defaultValue = "${project.build.directory}/generated-test-sources/test-gen") private File sourceDestinationFolder; - /** - * Location of the imports sources. - */ - @Parameter(required = true, defaultValue = "${project.basedir}/src/test/java") - private File importsSourcesFolder; - @Parameter(required = true, defaultValue = "${project.build.directory}/compiled-wast") private File compiledWastTargetFolder; @@ -191,9 +185,8 @@ public void execute() throws MojoExecutionException { // generate the tests final SourceRoot dest = new SourceRoot(sourceDestinationFolder.toPath()); - final SourceRoot importSourceRoot = new SourceRoot(importsSourcesFolder.toPath()); - TestGenerator testGenerator = new TestGenerator(testGen, importSourceRoot, dest); + TestGenerator testGenerator = new TestGenerator(testGen, dest); includedWasts.parallelStream().forEach(testGenerator::generateTests); @@ -225,12 +218,10 @@ private static void validate(List items, String name, boolean requireSor private final class TestGenerator { private final JavaTestGen testGen; - private final SourceRoot importSourceRoot; private final SourceRoot dest; - private TestGenerator(JavaTestGen testGen, SourceRoot importSourceRoot, SourceRoot dest) { + private TestGenerator(JavaTestGen testGen, SourceRoot dest) { this.testGen = testGen; - this.importSourceRoot = importSourceRoot; this.dest = dest; } @@ -252,7 +243,7 @@ private void generateTests(String spec) { Wast2Json.builder().withFile(wastFile).withOutput(specFile).build().process(); var name = specFile.toPath().getParent().toFile().getName(); - var cu = testGen.generate(name, readWast(specFile), wasmFilesFolder, importSourceRoot); + var cu = testGen.generate(name, readWast(specFile), wasmFilesFolder); dest.add(cu); }