diff --git a/README.md b/README.md index a3fffd2..4de7b2f 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ file in your `build.gradle`: ```groovy plugins { - id 'ch.fhnw.thga.frege' version '3.0.0-alpha' + id 'ch.fhnw.thga.frege' version '4.0.1-alpha' } frege @@ -46,6 +46,7 @@ Optional configuration parameters inside `build.gradle`: - outputDir : defaults to `/build/classes/main/frege` - compilerFlags : defaults to `['-O', '-make']` - compileItems : defaults to `[]` +- testModules : defaults to `[]` ### Added Tasks @@ -59,7 +60,7 @@ Then only the specified compile items and its dependencies get compiled. E.g.: `compileItems = [ 'my.mod.Mod1', my.mod.Mod2' ]`. - **runFrege**: Runs the Frege module specified by `mainModule`. Alternatively you can also pass the main module by command line, e.g: `gradle runFrege --mainModule=my.mod.Name`. -- **testFrege**: Tests all QuickCheck properties defined in the specified `mainModule`. +- **testFrege**: Tests all QuickCheck properties defined in the specified `testModules`. You can pass test args on the command line, e.g: `gradle testFrege --args="-v -n 1000 -p pred1`. Run `gradle testFrege --args=-h` to see all options. - **replFrege**: Takes care of all project dependencies of the specified `replModule` diff --git a/build.gradle b/build.gradle index 9baa197..504691a 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ dependencies def junit5Group = 'org.junit.jupiter' def junit5Version = '5.8.2' testImplementation group: junit5Group, name: 'junit-jupiter-api', version: junit5Version - testImplementation group: 'net.jqwik', name: 'jqwik', version: '1.6.3' + testImplementation group: 'net.jqwik', name: 'jqwik', version: '1.6.5' testRuntimeOnly group: junit5Group, name: 'junit-jupiter-engine', version: junit5Version testImplementation(enforcedPlatform("org.junit:junit-bom:${junit5Version}")) } diff --git a/gradle.properties b/gradle.properties index b990bfc..50b16c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group = ch.fhnw.thga -version = 3.0.2-alpha \ No newline at end of file +version = 4.0.1-alpha \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 744e882..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/TestFregeFunctionalTest.java b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/TestFregeFunctionalTest.java index 4a53fa0..318d2ab 100644 --- a/src/functionalTest/java/ch/fhnw/thga/gradleplugins/TestFregeFunctionalTest.java +++ b/src/functionalTest/java/ch/fhnw/thga/gradleplugins/TestFregeFunctionalTest.java @@ -28,13 +28,16 @@ public class TestFregeFunctionalTest { - private static final FregeSourceFile PROPERTY_TESTS_FR = new FregeSourceFile( - String.format( + private static final FregeSourceFile PROPERTY_TESTS_FR = new FregeSourceFile + ( + String.format + ( "%s/%s", DEFAULT_RELATIVE_SOURCE_DIR, "ch/fhnw/thga/PropertyTests.fr" ), - String.join(NEW_LINE, + String.join + (NEW_LINE, "module ch.fhnw.thga.PropertyTests where", EMPTY_LINE, "import Test.QuickCheck", @@ -45,95 +48,182 @@ public class TestFregeFunctionalTest ); @Nested - @IndicativeSentencesGeneration( + @IndicativeSentencesGeneration + ( separator = " -> ", generator = DisplayNameGenerator.ReplaceUnderscores.class ) class Test_frege_task_works { @Test - void given_frege_code_with_true_quick_check_property( - @TempDir File testProjectDir) + void given_single_frege_module_with_true_quick_check_property + (@TempDir File testProjectDir) throws Exception { - String mainBuildConfig = createFregeSection( + String mainBuildConfig = createFregeSection + ( FregeDTOBuilder - .builder() - .version("'3.25.84'") - .release("'3.25alpha'") - .mainModule("'ch.fhnw.thga.PropertyTests'") + .latestVersionBuilder() + .testModules("['ch.fhnw.thga.PropertyTests']") .build() ); Project project = FregeProjectBuilder - .builder() - .projectRoot(testProjectDir) - .buildFile(mainBuildConfig) - .fregeSourceFiles(() -> Stream.of(PROPERTY_TESTS_FR)) - .build(); + .builder() + .projectRoot(testProjectDir) + .buildFile(mainBuildConfig) + .fregeSourceFiles(() -> Stream.of(PROPERTY_TESTS_FR)) + .build(); - BuildResult result = runGradleTask( + BuildResult result = runGradleTask + ( testProjectDir, TEST_FREGE_TASK_NAME, "--args=-v -p p_pass" ); - assertTrue( + assertTrue + ( project .getTasks() .getByName(TEST_FREGE_TASK_NAME) instanceof TestFregeTask ); - assertEquals( + assertEquals + ( SUCCESS, result.task(":" + TEST_FREGE_TASK_NAME).getOutcome() ); assertTrue(result.getOutput().contains("OK")); assertTrue(result.getOutput().contains("Properties passed: 1, failed: 0")); } + + @Test + void given_multiple_frege_modules_with_true_quick_check_properties + (@TempDir File testProjectDir) + throws Exception + { + FregeSourceFile PROPERTY_TESTS1_FR = new FregeSourceFile + ( + String.format + ( + "%s/%s", + DEFAULT_RELATIVE_SOURCE_DIR, + "ch/fhnw/thga/PropertyTests1.fr" + ), + String.join + ( + NEW_LINE, + "module ch.fhnw.thga.PropertyTests1 where", + EMPTY_LINE, + "import Test.QuickCheck", + EMPTY_LINE, + "p_pass1 = property $ \\(n::Integer) -> odd n ^^ even n" + ) + ); + + FregeSourceFile PROPERTY_TESTS2_FR = new FregeSourceFile + ( + String.format + ( + "%s/%s", + DEFAULT_RELATIVE_SOURCE_DIR, + "ch/fhnw/thga/PropertyTests2.fr" + ), + String.join + ( + NEW_LINE, + "module ch.fhnw.thga.PropertyTests2 where", + EMPTY_LINE, + "import Test.QuickCheck", + EMPTY_LINE, + "f = reverse", + "g x = show x ++ show x ++ show x", + "p_commutativity = property $ \\(xs :: [Int]) -> ( map g (f xs) == f (map g xs) )" + ) + ); + String mainBuildConfig = createFregeSection + ( + FregeDTOBuilder + .latestVersionBuilder() + .testModules("['ch.fhnw.thga.PropertyTests1', 'ch.fhnw.thga.PropertyTests2']") + .build() + ); + + Project project = FregeProjectBuilder + .builder() + .projectRoot(testProjectDir) + .buildFile(mainBuildConfig) + .fregeSourceFiles(() -> Stream.of(PROPERTY_TESTS1_FR, PROPERTY_TESTS2_FR)) + .build(); + + BuildResult result = runGradleTask + ( + testProjectDir, + TEST_FREGE_TASK_NAME + ); + + assertTrue + ( + project + .getTasks() + .getByName(TEST_FREGE_TASK_NAME) + instanceof TestFregeTask + ); + assertEquals + ( + SUCCESS, + result.task(":" + TEST_FREGE_TASK_NAME).getOutcome() + ); + assertTrue(result.getOutput().contains("OK")); + assertTrue(result.getOutput().contains("Properties passed: 2, failed: 0")); + } } @Nested - @IndicativeSentencesGeneration( + @IndicativeSentencesGeneration + ( separator = " -> ", generator = DisplayNameGenerator.ReplaceUnderscores.class ) class Test_frege_task_fails { @Test - void given_frege_code_with_false_quick_check_property( - @TempDir File testProjectDir) + void given_single_frege_code_with_false_quick_check_property + (@TempDir File testProjectDir) throws Exception { - String mainBuildConfig = createFregeSection( + String mainBuildConfig = createFregeSection + ( FregeDTOBuilder - .builder() - .version("'3.25.84'") - .release("'3.25alpha'") - .mainModule("'ch.fhnw.thga.PropertyTests'") + .latestVersionBuilder() + .testModules("['ch.fhnw.thga.PropertyTests']") .build() ); Project project = FregeProjectBuilder - .builder() - .projectRoot(testProjectDir) - .buildFile(mainBuildConfig) - .fregeSourceFiles(() -> Stream.of(PROPERTY_TESTS_FR)) - .build(); + .builder() + .projectRoot(testProjectDir) + .buildFile(mainBuildConfig) + .fregeSourceFiles(() -> Stream.of(PROPERTY_TESTS_FR)) + .build(); - BuildResult result = runAndFailGradleTask( + BuildResult result = runAndFailGradleTask + ( testProjectDir, TEST_FREGE_TASK_NAME, "--args=-v -p p_fail" ); - assertTrue( + assertTrue + ( project .getTasks() .getByName(TEST_FREGE_TASK_NAME) instanceof TestFregeTask ); - assertEquals( + assertEquals + ( FAILED, result.task(":" + TEST_FREGE_TASK_NAME).getOutcome() ); diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java b/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java index 054e8d6..284ebd0 100644 --- a/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java +++ b/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java @@ -17,6 +17,7 @@ public abstract class FregeExtension public static final String DEFAULT_RELATIVE_SOURCE_DIR = "src/main/frege"; public static final List DEFAULT_COMPILER_FLAGS = List.of("-O", "-make"); public static final List DEFAULT_COMPILE_ITEMS = Collections.emptyList(); + public static final List DEFAULT_TEST_MODULES = Collections.emptyList(); public abstract Property getVersion(); @@ -35,6 +36,8 @@ public abstract class FregeExtension public abstract Property getReplModule(); public abstract ListProperty getCompileItems(); + + public abstract ListProperty getTestModules(); @Inject public FregeExtension(ProjectLayout projectLayout) @@ -51,5 +54,7 @@ public FregeExtension(ProjectLayout projectLayout) getCompilerFlags().convention(DEFAULT_COMPILER_FLAGS); getCompileItems().convention(DEFAULT_COMPILE_ITEMS); + + getTestModules().convention(DEFAULT_TEST_MODULES); } } diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java index dc73f1c..8a5a34f 100644 --- a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java +++ b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java @@ -116,12 +116,12 @@ public void apply(Project project) TestFregeTask.class, task -> { - task.getMainModule().set(extension.getMainModule()); + task.getTestModules().set(extension.getTestModules()); task.dependsOn(compileFregeTask.map ( compileTask -> { - compileTask.getFregeCompileItems().add(task.getMainModule()); + compileTask.getFregeCompileItems().set(task.getTestModules()); return compileTask; } ).get()); diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/TestFregeTask.java b/src/main/java/ch/fhnw/thga/gradleplugins/TestFregeTask.java index dbfb856..b2c1615 100644 --- a/src/main/java/ch/fhnw/thga/gradleplugins/TestFregeTask.java +++ b/src/main/java/ch/fhnw/thga/gradleplugins/TestFregeTask.java @@ -6,6 +6,7 @@ import org.gradle.api.file.DirectoryProperty; import org.gradle.api.file.RegularFileProperty; import org.gradle.api.model.ObjectFactory; +import org.gradle.api.provider.ListProperty; import org.gradle.api.provider.Property; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputDirectory; @@ -16,7 +17,8 @@ import org.gradle.api.tasks.Internal; import org.gradle.api.provider.Provider; -public abstract class TestFregeTask extends DefaultTask { +public abstract class TestFregeTask extends DefaultTask +{ private static final String TEST_MAIN_CLASS = "frege.tools.Quick"; private final JavaExec javaExec; @@ -27,21 +29,29 @@ public abstract class TestFregeTask extends DefaultTask { public abstract DirectoryProperty getFregeOutputDir(); @Input - @Option(option = "mainModule", - description = "The full name of the Frege module with a main function, e.g. 'my.mod.Name'") - public abstract Property getMainModule(); + public abstract ListProperty getTestModules(); @Input @Option(option = "args", description = "optional args passed to frege") public abstract Property getFregeArgs(); - @Internal - final Provider getAllArgs() - { - return getFregeArgs() - .map(args -> String.format("%s %s", args, getMainModule().get())); - } + @Internal + final Provider getTestModulesToString() + { + return getTestModules().map(testModules -> String.join(" ", testModules)); + } + + @Internal + final Provider getAllArgs() + { + return getFregeArgs() + .zip + ( + getTestModulesToString(), + (args, testModules) -> String.format("%s %s", args, testModules) + ); + } @Input public abstract Property getFregeDependencies(); diff --git a/src/test/java/ch/fhnw/thga/gradleplugins/Builder.java b/src/test/java/ch/fhnw/thga/gradleplugins/Builder.java index 90814ff..e4eb007 100644 --- a/src/test/java/ch/fhnw/thga/gradleplugins/Builder.java +++ b/src/test/java/ch/fhnw/thga/gradleplugins/Builder.java @@ -19,6 +19,8 @@ public interface Builder Builder replModule(String replModule); Builder compileItems(String compileItems); + + Builder testModules(String testModules); FregeDTO build(); } diff --git a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTO.java b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTO.java index e668f05..dd3c869 100644 --- a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTO.java +++ b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTO.java @@ -17,6 +17,7 @@ public class FregeDTO public final String compilerFlags; public final String replModule; public final String compileItems; + public final String testModules; public FregeDTO ( @@ -28,7 +29,8 @@ public class FregeDTO String mainModule, String compilerFlags, String replModule, - String compileItems + String compileItems, + String testModules ) { this.version = version; @@ -40,6 +42,7 @@ public class FregeDTO this.compilerFlags = compilerFlags; this.replModule = replModule; this.compileItems = compileItems; + this.testModules = testModules; } public String getVersion() diff --git a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java index 3cf4cd8..bba3599 100644 --- a/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java +++ b/src/test/java/ch/fhnw/thga/gradleplugins/FregeDTOBuilder.java @@ -11,6 +11,7 @@ public final class FregeDTOBuilder implements Builder private String compilerFlags = ""; private String replModule = ""; private String compileItems = ""; + private String testModules = ""; private FregeDTOBuilder() {} @@ -90,6 +91,13 @@ public Builder compileItems(String compileItems) return this; } + @Override + public Builder testModules(String testModules) + { + this.testModules = testModules; + return this; + } + public FregeDTO build() { return new FregeDTO @@ -102,7 +110,8 @@ public FregeDTO build() mainModule, compilerFlags, replModule, - compileItems + compileItems, + testModules ); } } diff --git a/src/test/java/ch/fhnw/thga/gradleplugins/GradleBuildFileConversionTest.java b/src/test/java/ch/fhnw/thga/gradleplugins/GradleBuildFileConversionTest.java index cfc60bb..5585f50 100644 --- a/src/test/java/ch/fhnw/thga/gradleplugins/GradleBuildFileConversionTest.java +++ b/src/test/java/ch/fhnw/thga/gradleplugins/GradleBuildFileConversionTest.java @@ -3,65 +3,74 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.stream.Stream; import java.util.stream.Collectors; +import java.util.stream.Stream; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayNameGenerator; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestInstance.Lifecycle; -@TestInstance(Lifecycle.PER_CLASS) -public class GradleBuildFileConversionTest { - private static FregeDTOBuilder fregeBuilder; - - private static String buildFilePluginString(String pluginId) { +public class GradleBuildFileConversionTest +{ + private static String buildFilePluginString(String pluginId) + { return String.format("id '%s'", pluginId); } - public static String createPluginsSection(Stream pluginIds) { - String plugins = pluginIds.map(pluginId -> buildFilePluginString(pluginId)).collect(Collectors.joining("\n ")); + public static String createPluginsSection(Stream pluginIds) + { + String plugins = pluginIds + .map(pluginId -> buildFilePluginString(pluginId)) + .collect(Collectors.joining("\n ")); return String.format("plugins {\n %s\n}\n", plugins); } - private void assertStringContainsSubStrings(String s, Stream subStrings) { - assertTrue(subStrings.allMatch(substring -> s.contains(substring))); - } - - @BeforeEach - void setup() { - fregeBuilder = FregeDTOBuilder.builder(); + private void assertStringContainsSubStrings(String s, Stream subStrings) + { + assertTrue(subStrings.allMatch(substring -> s.contains(substring.trim()))); } @Nested - @IndicativeSentencesGeneration(separator = " -> ", generator = DisplayNameGenerator.ReplaceUnderscores.class) - class Converting_Frege_DTO_to_build_file_key_value_pairs_works { - + @IndicativeSentencesGeneration + ( + separator = " -> ", + generator = DisplayNameGenerator.ReplaceUnderscores.class + ) + class Converting_Frege_DTO_to_build_file_key_value_pairs_works + { @Test - void given_single_version_property() { - FregeDTO fregeDTO = fregeBuilder.version("'3.25'").build(); + void given_single_version_property() + { + FregeDTO fregeDTO = FregeDTOBuilder.builder().version("'3.25'").build(); String expected = "version = '3.25'"; assertEquals(expected, fregeDTO.toBuildFile()); } @Test - void given_multiple_properties_in_non_deterministic_order() { - FregeDTO fregeDTO = fregeBuilder.version("'3.25'").release("'3.25alpha'") - .compilerDownloadDir("layout.projectDirectory.dir('dist')").build(); - String expected = "version = '3.25'\n release = '3.25alpha'\n compilerDownloadDir = layout.projectDirectory.dir('dist')"; + void given_multiple_properties_in_non_deterministic_order() + { + FregeDTO fregeDTO = FregeDTOBuilder + .builder() + .version("'3.25.84'") + .release("'3.25alpha'") + .build(); + String expected = "version = '3.25.84'\nrelease = '3.25alpha'"; assertStringContainsSubStrings(expected, fregeDTO.toBuildFile().lines()); } } @Nested - @IndicativeSentencesGeneration(separator = " -> ", generator = DisplayNameGenerator.ReplaceUnderscores.class) - class Creating_plugin_section_works { - + @IndicativeSentencesGeneration + ( + separator = " -> ", + generator = DisplayNameGenerator.ReplaceUnderscores.class + ) + class Creating_plugin_section_works + { @Test - void given_single_plugin_id() { + void given_single_plugin_id() + { String pluginId = "frege"; Stream pluginIds = Stream.of(pluginId); String expected = "plugins {\n" + " id '" + pluginId + "'\n" + "}\n"; @@ -69,11 +78,16 @@ void given_single_plugin_id() { } @Test - void given_multiple_plugin_ids() { + void given_multiple_plugin_ids() + { String fregeId = "frege"; String javaId = "java"; Stream pluginIds = Stream.of(fregeId, javaId); - String expected = "plugins {\n" + " id '" + fregeId + "'\n" + " id '" + javaId + "'\n" + "}\n"; + String expected = String.format + ( + "plugins {\n id '%s'\n id '%s'\n}\n", + fregeId, javaId + ); assertEquals(expected, createPluginsSection(pluginIds)); } }