diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index dd1352d..2e6373e 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -17,17 +17,17 @@ jobs: - name: Test use Gradle wrapper uses: ./ with: - build-root-directory: __tests__/data/basic + build-root-directory: __tests__/samples/basic arguments: test - name: Test custom wrapper location uses: ./ with: - build-root-directory: __tests__/data/basic - wrapper-directory: __tests__/data/basic + build-root-directory: __tests__/samples/basic + wrapper-directory: __tests__/samples/basic arguments: test - name: Test use defined Gradle version uses: ./ with: gradle-version: rc - build-root-directory: __tests__/data/basic + build-root-directory: __tests__/samples/basic arguments: test diff --git a/__tests__/cache-wrapper.test.ts b/__tests__/cache-wrapper.test.ts index 594a077..d4d6a45 100644 --- a/__tests__/cache-wrapper.test.ts +++ b/__tests__/cache-wrapper.test.ts @@ -6,7 +6,7 @@ describe('cache', () => { it('from wrapper properties file', async () => { const version = cacheWrapper.extractGradleWrapperSlugFrom( path.resolve( - '__tests__/data/basic/gradle/wrapper/gradle-wrapper.properties' + '__tests__/data/cache-wrapper-test/gradle-wrapper.properties' ) ) expect(version).toBe('6.6.1-bin') diff --git a/__tests__/crypto-utils.test.ts b/__tests__/crypto-utils.test.ts index 593ba07..854608c 100644 --- a/__tests__/crypto-utils.test.ts +++ b/__tests__/crypto-utils.test.ts @@ -5,7 +5,7 @@ describe('crypto-utils', () => { describe('can hash', () => { it('a directory', async () => { const hash = await cryptoUtils.hashFiles( - path.resolve('__tests__/data/basic/gradle') + path.resolve('__tests__/data/crypto-utils-test/gradle') ) expect(hash).toBe( process.platform === 'win32' @@ -15,7 +15,7 @@ describe('crypto-utils', () => { }) it('a directory with a glob', async () => { const hash = await cryptoUtils.hashFiles( - path.resolve('__tests__/data/basic/'), + path.resolve('__tests__/data/crypto-utils-test/'), ['gradle/**'] ) expect(hash).toBe( @@ -26,7 +26,7 @@ describe('crypto-utils', () => { }) it('a directory with globs', async () => { const hash = await cryptoUtils.hashFiles( - path.resolve('__tests__/data/basic/'), + path.resolve('__tests__/data/crypto-utils-test/'), ['**/*.gradle', 'gradle/**'] ) expect(hash).toBe( diff --git a/__tests__/data/basic/gradle/wrapper/gradle-wrapper.properties b/__tests__/data/cache-wrapper-test/gradle-wrapper.properties similarity index 100% rename from __tests__/data/basic/gradle/wrapper/gradle-wrapper.properties rename to __tests__/data/cache-wrapper-test/gradle-wrapper.properties diff --git a/__tests__/data/basic/.gitattributes b/__tests__/data/crypto-utils-test/.gitattributes similarity index 100% rename from __tests__/data/basic/.gitattributes rename to __tests__/data/crypto-utils-test/.gitattributes diff --git a/__tests__/data/basic/.gitignore b/__tests__/data/crypto-utils-test/.gitignore similarity index 100% rename from __tests__/data/basic/.gitignore rename to __tests__/data/crypto-utils-test/.gitignore diff --git a/__tests__/data/basic/build.gradle b/__tests__/data/crypto-utils-test/build.gradle similarity index 100% rename from __tests__/data/basic/build.gradle rename to __tests__/data/crypto-utils-test/build.gradle diff --git a/__tests__/data/basic/gradle/wrapper/gradle-wrapper.jar b/__tests__/data/crypto-utils-test/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from __tests__/data/basic/gradle/wrapper/gradle-wrapper.jar rename to __tests__/data/crypto-utils-test/gradle/wrapper/gradle-wrapper.jar diff --git a/__tests__/data/crypto-utils-test/gradle/wrapper/gradle-wrapper.properties b/__tests__/data/crypto-utils-test/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..12d38de --- /dev/null +++ b/__tests__/data/crypto-utils-test/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/__tests__/data/basic/gradlew b/__tests__/data/crypto-utils-test/gradlew similarity index 100% rename from __tests__/data/basic/gradlew rename to __tests__/data/crypto-utils-test/gradlew diff --git a/__tests__/data/basic/gradlew.bat b/__tests__/data/crypto-utils-test/gradlew.bat similarity index 100% rename from __tests__/data/basic/gradlew.bat rename to __tests__/data/crypto-utils-test/gradlew.bat diff --git a/__tests__/data/basic/settings.gradle b/__tests__/data/crypto-utils-test/settings.gradle similarity index 100% rename from __tests__/data/basic/settings.gradle rename to __tests__/data/crypto-utils-test/settings.gradle diff --git a/__tests__/data/basic/src/test/java/basic/BasicTest.java b/__tests__/data/crypto-utils-test/src/test/java/basic/BasicTest.java similarity index 100% rename from __tests__/data/basic/src/test/java/basic/BasicTest.java rename to __tests__/data/crypto-utils-test/src/test/java/basic/BasicTest.java diff --git a/__tests__/samples/basic/.gitattributes b/__tests__/samples/basic/.gitattributes new file mode 100644 index 0000000..00a51af --- /dev/null +++ b/__tests__/samples/basic/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/__tests__/samples/basic/.gitignore b/__tests__/samples/basic/.gitignore new file mode 100644 index 0000000..1b6985c --- /dev/null +++ b/__tests__/samples/basic/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/__tests__/samples/basic/build.gradle b/__tests__/samples/basic/build.gradle new file mode 100644 index 0000000..89e9f70 --- /dev/null +++ b/__tests__/samples/basic/build.gradle @@ -0,0 +1,11 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation('junit:junit:4.12') +} diff --git a/__tests__/samples/basic/gradle/wrapper/gradle-wrapper.jar b/__tests__/samples/basic/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..62d4c05 Binary files /dev/null and b/__tests__/samples/basic/gradle/wrapper/gradle-wrapper.jar differ diff --git a/__tests__/samples/basic/gradle/wrapper/gradle-wrapper.properties b/__tests__/samples/basic/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..05679dc --- /dev/null +++ b/__tests__/samples/basic/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/__tests__/samples/basic/gradlew b/__tests__/samples/basic/gradlew new file mode 100755 index 0000000..fbd7c51 --- /dev/null +++ b/__tests__/samples/basic/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + 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 +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 +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 + +# 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 + # 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\"" + fi + i=`expr $i + 1` + 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, 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" + +exec "$JAVACMD" "$@" diff --git a/__tests__/samples/basic/gradlew.bat b/__tests__/samples/basic/gradlew.bat new file mode 100644 index 0000000..5093609 --- /dev/null +++ b/__tests__/samples/basic/gradlew.bat @@ -0,0 +1,104 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/__tests__/samples/basic/settings.gradle b/__tests__/samples/basic/settings.gradle new file mode 100644 index 0000000..9461d56 --- /dev/null +++ b/__tests__/samples/basic/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'basic' diff --git a/__tests__/samples/basic/src/test/java/basic/BasicTest.java b/__tests__/samples/basic/src/test/java/basic/BasicTest.java new file mode 100644 index 0000000..88c889a --- /dev/null +++ b/__tests__/samples/basic/src/test/java/basic/BasicTest.java @@ -0,0 +1,10 @@ +package basic; + +import org.junit.Test; + +public class BasicTest { + @Test + public void test() { + assert true; + } +}