From 37cdfd363dbc71c44716a6ac9265acc420e45e58 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 22 May 2024 11:35:36 -0700 Subject: [PATCH] Improved testing of integer-type arguments --- .../rife/bld/extension/CompileKotlinOptions.java | 11 +++++++++++ .../bld/extension/CompileKotlinOptionsTest.java | 15 ++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/rife/bld/extension/CompileKotlinOptions.java b/src/main/java/rife/bld/extension/CompileKotlinOptions.java index 343d1ba..778a9a5 100644 --- a/src/main/java/rife/bld/extension/CompileKotlinOptions.java +++ b/src/main/java/rife/bld/extension/CompileKotlinOptions.java @@ -65,6 +65,17 @@ public class CompileKotlinOptions { return this; } + /** + * Allow using declarations only from the specified version of Kotlin bundled libraries. + * + * @param version the api version + * @return this operation instance + */ + public CompileKotlinOptions apiVersion(int version) { + apiVersion_ = String.valueOf(version); + return this; + } + /** * Read the compiler options from the given files. *

diff --git a/src/test/java/rife/bld/extension/CompileKotlinOptionsTest.java b/src/test/java/rife/bld/extension/CompileKotlinOptionsTest.java index f19663d..6324765 100644 --- a/src/test/java/rife/bld/extension/CompileKotlinOptionsTest.java +++ b/src/test/java/rife/bld/extension/CompileKotlinOptionsTest.java @@ -19,6 +19,7 @@ package rife.bld.extension; import org.junit.jupiter.api.Test; import java.io.File; +import java.util.ArrayList; import java.util.List; import java.util.stream.IntStream; @@ -54,7 +55,7 @@ class CompileKotlinOptionsTest { @Test void argsTest() { - var args = new CompileKotlinOptions() + var options = new CompileKotlinOptions() .apiVersion("11") .argFile("file.txt", "file2.txt") .classpath("path1", "path2") @@ -76,8 +77,7 @@ class CompileKotlinOptionsTest { .progressive(true) .scriptTemplates("name", "name2") .verbose(true) - .wError(true) - .args(); + .wError(true); var matches = List.of( "-api-version", "11", @@ -105,8 +105,13 @@ class CompileKotlinOptionsTest { "-verbose", "-Werror"); - assertThat(args).hasSize(matches.size()); + var args = new ArrayList>(); + args.add(options.args()); + args.add(options.apiVersion(11).jvmTarget(11).args()); - IntStream.range(0, args.size()).forEach(i -> assertThat(args.get(i)).isEqualTo(matches.get(i))); + for (var a: args) { + assertThat(a).hasSize(matches.size()); + IntStream.range(0, a.size()).forEach(i -> assertThat(a.get(i)).isEqualTo(matches.get(i))); + } } }