Skip to content

Commit

Permalink
Plugin support for JUnit5
Browse files Browse the repository at this point in the history
  • Loading branch information
SalomonBrys committed Jan 31, 2023
1 parent 3f39037 commit a9a17fb
Show file tree
Hide file tree
Showing 27 changed files with 413 additions and 13 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,21 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: ./gradlew --stacktrace publishToMavenLocal
shell: bash
- name: Check plugin with JVM (ubuntu)
- name: Check plugin with JVM JUnit4 (ubuntu)
if: matrix.os == 'ubuntu-latest'
working-directory: tests-projects/tests-jvm-junit4
run: ./gradlew --stacktrace check
shell: bash
- name: Check plugin with JVM JUnit5 (ubuntu)
if: matrix.os == 'ubuntu-latest'
working-directory: tests-projects/tests-jvm-junit5
run: ./gradlew --stacktrace check
shell: bash
working-directory: tests-projects/tests-Jvm
- name: Check plugin with Android (ubuntu)
if: matrix.os == 'ubuntu-latest'
working-directory: tests-projects/tests-android
run: ./gradlew --stacktrace check
shell: bash
working-directory: tests-projects/tests-Android
- name: Upload (ubuntu)
if: matrix.os == 'ubuntu-latest'
run: ./gradlew --stacktrace publishAllPublicationsToOssrhStagingRepository -Porg.kodein.sonatype.repositoryId=${{ needs.create-staging-repository.outputs.repository_id }}
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,21 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: ./gradlew --stacktrace publishToMavenLocal
shell: bash
- name: Check plugin with JVM (ubuntu)
- name: Check plugin with JVM JUnit4 (ubuntu)
if: matrix.os == 'ubuntu-latest'
working-directory: tests-projects/tests-jvm-junit4
run: ./gradlew --stacktrace check
shell: bash
- name: Check plugin with JVM JUnit5 (ubuntu)
if: matrix.os == 'ubuntu-latest'
working-directory: tests-projects/tests-jvm-junit5
run: ./gradlew --stacktrace check
shell: bash
working-directory: tests-projects/tests-Jvm
- name: Check plugin with Android (ubuntu)
if: matrix.os == 'ubuntu-latest'
working-directory: tests-projects/tests-android
run: ./gradlew --stacktrace check
shell: bash
working-directory: tests-projects/tests-Android
- name: Upload (ubuntu)
if: matrix.os == 'ubuntu-latest'
run: ./gradlew --stacktrace publishAllPublicationsToOssrhStagingRepository -PgitRef=${{ github.ref }} -Psnapshot=true
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,15 @@ jobs:
- name: Publish To Maven Local
run: ./gradlew --stacktrace publishToMavenLocal
shell: bash
- name: Check plugin with JVM
- name: Check plugin with JVM JUnit4
working-directory: tests-projects/tests-jvm-junit4
run: ./gradlew --stacktrace check
shell: bash
- name: Check plugin with JVM JUnit5
working-directory: tests-projects/tests-jvm-junit5
run: ./gradlew --stacktrace check
shell: bash
working-directory: tests-projects/tests-Jvm
- name: Check plugin with Android
working-directory: tests-projects/tests-android
run: ./gradlew --stacktrace check
shell: bash
working-directory: tests-projects/tests-Android
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package org.kodein.mock.gradle
import org.gradle.api.GradleException
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.internal.tasks.testing.junitplatform.JUnitPlatformTestFramework
import org.gradle.kotlin.dsl.*
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest


// The entire purpose of this Gradle plugin is to get around https://github.com/google/ksp/issues/567
Expand Down Expand Up @@ -39,11 +41,15 @@ class MocKMPGradlePlugin : Plugin<Project> {
}
}

private fun addRuntimeDependencies(sourceSet: KotlinSourceSet, ext: Extension) {
private fun addRuntimeDependencies(project: Project, sourceSet: KotlinSourceSet, ext: Extension) {
sourceSet.dependencies {
implementation("org.kodein.mock:mockmp-runtime:${BuildConfig.VERSION}")
if (ext.usesHelper) {
implementation("org.kodein.mock:mockmp-test-helper:${BuildConfig.VERSION}")
implementation(project.provider {
val isJunit5 = project.tasks.withType<KotlinJvmTest>().any { it.testFramework is JUnitPlatformTestFramework }
if (isJunit5) "org.kodein.mock:mockmp-test-helper-junit5:${BuildConfig.VERSION}"
else "org.kodein.mock:mockmp-test-helper:${BuildConfig.VERSION}"
})
}
}
}
Expand Down Expand Up @@ -73,7 +79,7 @@ class MocKMPGradlePlugin : Plugin<Project> {
project.afterEvaluate {
val commonTest = kotlin.sourceSets.getByName("commonTest")

addRuntimeDependencies(commonTest, ext)
addRuntimeDependencies(project, commonTest, ext)

// Adding KSP JVM result to COMMON source set
when (jvmTarget.preset!!.name) {
Expand All @@ -97,7 +103,7 @@ class MocKMPGradlePlugin : Plugin<Project> {

private fun executeOnMain(project: Project, ext: Extension) {
addKSPDependency(project, "kspCommonMainMetadata")
addRuntimeDependencies(project.kotlinExtension.sourceSets["commonMain"], ext)
addRuntimeDependencies(project, project.kotlinExtension.sourceSets["commonMain"], ext)
configureKsp(project, ext)
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
54 changes: 54 additions & 0 deletions tests-projects/tests-jvm-junit5/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
plugins {
alias(kodeinGlobals.plugins.kotlin.multiplatform)
id("org.kodein.mock.mockmp")
}

repositories {
mavenLocal()
mavenCentral()
}

kotlin {
jvm {
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
}
ios()

sourceSets {
val commonMain by getting {
kotlin.srcDir("$rootDir/../../tests/tests-junit4/src/commonMain/kotlin")
dependencies {
implementation(libs.datetime)
}
}
val commonTest by getting {
kotlin.srcDir("$rootDir/../../tests/tests-junit4/src/commonTest/kotlin")
dependencies {
implementation(libs.coroutines.test)
}
}

val jvmTest by getting {
dependencies {
implementation(kodeinGlobals.kotlin.test.junit5)
}
}
}
}

mockmp {
usesHelper = true
}

// Showing tests in Gradle command line
afterEvaluate {
tasks.withType<AbstractTestTask> {
testLogging {
events("passed", "skipped", "failed", "standard_out", "standard_error")
showExceptions = true
showStackTraces = true
}
}
}
3 changes: 3 additions & 0 deletions tests-projects/tests-jvm-junit5/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8

kotlin.code.style=official
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Tue May 24 12:07:09 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
185 changes: 185 additions & 0 deletions tests-projects/tests-jvm-junit5/gradlew
Original file line number Diff line number Diff line change
@@ -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" "$@"
Loading

0 comments on commit a9a17fb

Please sign in to comment.