diff --git a/junit5/.gitignore b/junit5/.gitignore new file mode 100644 index 0000000..c9f7010 --- /dev/null +++ b/junit5/.gitignore @@ -0,0 +1,25 @@ +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/junit5/README.md b/junit5/README.md new file mode 100644 index 0000000..5ed7900 --- /dev/null +++ b/junit5/README.md @@ -0,0 +1,3 @@ +# Examples with JUnit 4 and JUnit 5 + +Have a look at [the code](/src/test/java/com/example/demo/) \ No newline at end of file diff --git a/junit5/build.gradle b/junit5/build.gradle new file mode 100644 index 0000000..61a806b --- /dev/null +++ b/junit5/build.gradle @@ -0,0 +1,25 @@ +buildscript { + repositories { + mavenCentral() + } +} + +apply plugin: 'java' + +version = '0.0.1-SNAPSHOT' +sourceCompatibility = 1.8 + +repositories { + mavenLocal() + mavenCentral() +} + +ext { + springCloudVersion = 'Dalston.SR2' +} + +dependencies { + testCompile 'org.junit.jupiter:junit-jupiter-engine:5.0.1' + testCompile 'junit:junit:4.12' +} + diff --git a/junit5/gradle/wrapper/gradle-wrapper.jar b/junit5/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1a958be Binary files /dev/null and b/junit5/gradle/wrapper/gradle-wrapper.jar differ diff --git a/junit5/gradle/wrapper/gradle-wrapper.properties b/junit5/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..90a06ce --- /dev/null +++ b/junit5/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip diff --git a/junit5/gradlew b/junit5/gradlew new file mode 100644 index 0000000..4453cce --- /dev/null +++ b/junit5/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## 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="" + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/junit5/gradlew.bat b/junit5/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/junit5/gradlew.bat @@ -0,0 +1,84 @@ +@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 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= + +@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/junit5/src/main/resources/application.yml b/junit5/src/main/resources/application.yml new file mode 100644 index 0000000..ff07c4b --- /dev/null +++ b/junit5/src/main/resources/application.yml @@ -0,0 +1,17 @@ +server.port: 8081 + +logging.level.com.example.demo.CustomerClient: DEBUG +logging.level.com.example.demo.AddressClient: DEBUG +logging.level.org.hibernate.SQL: DEBUG + +customers: + ribbon: + eureka: + enabled: false + listOfServers: localhost:8080 + +addresses: + ribbon: + eureka: + enabled: false + listOfServers: localhost:8080 \ No newline at end of file diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/ConnectionChecker.java b/junit5/src/test/java/com/example/demo/connectionchecking/ConnectionChecker.java new file mode 100644 index 0000000..3d95dbe --- /dev/null +++ b/junit5/src/test/java/com/example/demo/connectionchecking/ConnectionChecker.java @@ -0,0 +1,15 @@ +package com.example.demo.connectionchecking; + +public class ConnectionChecker { + + private String uri; + + public ConnectionChecker(String uri) { + this.uri = uri; + } + + public boolean connect() { + return true; + } + +} diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit4/AssumingConnection.java b/junit5/src/test/java/com/example/demo/connectionchecking/junit4/AssumingConnection.java new file mode 100644 index 0000000..61ed8ba --- /dev/null +++ b/junit5/src/test/java/com/example/demo/connectionchecking/junit4/AssumingConnection.java @@ -0,0 +1,31 @@ +package com.example.demo.connectionchecking.junit4; + +import com.example.demo.connectionchecking.ConnectionChecker; +import org.junit.AssumptionViolatedException; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +public class AssumingConnection implements TestRule { + + private ConnectionChecker checker; + + public AssumingConnection(ConnectionChecker checker) { + this.checker = checker; + } + + @Override + public Statement apply(Statement base, Description description) { + return new Statement() { + @Override + public void evaluate() throws Throwable { + if (!checker.connect()) { + throw new AssumptionViolatedException("Could not connect. Skipping test!"); + } else { + base.evaluate(); + } + } + }; + } + +} diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit4/ConnectionCheckingJunit4Test.java b/junit5/src/test/java/com/example/demo/connectionchecking/junit4/ConnectionCheckingJunit4Test.java new file mode 100644 index 0000000..d2d0ab1 --- /dev/null +++ b/junit5/src/test/java/com/example/demo/connectionchecking/junit4/ConnectionCheckingJunit4Test.java @@ -0,0 +1,19 @@ +package com.example.demo.connectionchecking.junit4; + + +import com.example.demo.connectionchecking.ConnectionChecker; +import org.junit.ClassRule; +import org.junit.Test; +import static org.junit.Assert.fail; + +public class ConnectionCheckingJunit4Test { + + @ClassRule + public static AssumingConnection assumingConnection = new AssumingConnection(new ConnectionChecker("http://my.integration.system")); + + @Test + public void testOnlyWhenConnected() { + fail("Booh!"); + } + +} diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnection.java b/junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnection.java new file mode 100644 index 0000000..0c7c2ef --- /dev/null +++ b/junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnection.java @@ -0,0 +1,14 @@ +package com.example.demo.connectionchecking.junit5; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +import org.junit.jupiter.api.extension.ExtendWith; + +@Retention(RetentionPolicy.RUNTIME) +@ExtendWith(AssumeConnectionCondition.class) +public @interface AssumeConnection { + + String uri(); + +} diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnectionCondition.java b/junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnectionCondition.java new file mode 100644 index 0000000..2239d51 --- /dev/null +++ b/junit5/src/test/java/com/example/demo/connectionchecking/junit5/AssumeConnectionCondition.java @@ -0,0 +1,28 @@ +package com.example.demo.connectionchecking.junit5; + +import java.util.Optional; + +import com.example.demo.connectionchecking.ConnectionChecker; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; +import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation; + +public class AssumeConnectionCondition implements ExecutionCondition { + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + Optional annotation = findAnnotation(context.getElement(), AssumeConnection.class); + if (annotation.isPresent()) { + String uri = annotation.get().uri(); + ConnectionChecker checker = new ConnectionChecker(uri); + if (!checker.connect()) { + return ConditionEvaluationResult.disabled(String.format("Could not connect to '%s'. Skipping test!", uri)); + } else { + return ConditionEvaluationResult.enabled(String.format("Successfully connected to '%s'. Continuing test!", uri)); + } + } + return ConditionEvaluationResult.enabled("No AssumeConnection annotation found. Continuing test."); + } + +} diff --git a/junit5/src/test/java/com/example/demo/connectionchecking/junit5/ConnectionCheckingJunit5Test.java b/junit5/src/test/java/com/example/demo/connectionchecking/junit5/ConnectionCheckingJunit5Test.java new file mode 100644 index 0000000..d9ac3dc --- /dev/null +++ b/junit5/src/test/java/com/example/demo/connectionchecking/junit5/ConnectionCheckingJunit5Test.java @@ -0,0 +1,14 @@ +package com.example.demo.connectionchecking.junit5; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.fail; + +@AssumeConnection(uri = "http://my.integration.system") +public class ConnectionCheckingJunit5Test { + + @Test + public void testOnlyWhenConnected() { + fail("Booh!"); + } + +} diff --git a/junit5/target/pacts/addressClient-customerServiceProvider.json b/junit5/target/pacts/addressClient-customerServiceProvider.json new file mode 100644 index 0000000..f8ba002 --- /dev/null +++ b/junit5/target/pacts/addressClient-customerServiceProvider.json @@ -0,0 +1,120 @@ +{ + "provider": { + "name": "customerServiceProvider" + }, + "consumer": { + "name": "addressClient" + }, + "interactions": [ + { + "description": "a request to the address collection resource", + "request": { + "method": "GET", + "path": "/addresses/" + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "application/hal+json" + }, + "body": { + "_embedded": { + "addresses": [ + { + "street": "Elm Street", + "_links": { + "self": { + "href": "http://localhost:8080/addresses/1" + }, + "address": { + "href": "http://localhost:8080/addresses/1" + }, + "customer": { + "href": "http://localhost:8080/addresses/1/customer" + } + } + }, + { + "street": "High Street", + "_links": { + "self": { + "href": "http://localhost:8080/addresses/2" + }, + "address": { + "href": "http://localhost:8080/addresses/2" + }, + "customer": { + "href": "http://localhost:8080/addresses/2/customer" + } + } + } + ] + }, + "_links": { + "self": { + "href": "http://localhost:8080/addresses{?page,size,sort}", + "templated": true + }, + "profile": { + "href": "http://localhost:8080/profile/addresses" + }, + "search": { + "href": "http://localhost:8080/addresses/search" + } + }, + "page": { + "size": 20, + "totalElements": 2, + "totalPages": 1, + "number": 0 + } + } + }, + "providerStates": [ + { + "name": "a collection of 2 addresses" + } + ] + }, + { + "description": "a request to the address resource", + "request": { + "method": "GET", + "path": "/addresses/1" + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "application/hal+json" + }, + "body": { + "street": "Elm Street", + "_links": { + "self": { + "href": "http://localhost:8080/addresses/1" + }, + "address": { + "href": "http://localhost:8080/addresses/1" + }, + "customer": { + "href": "http://localhost:8080/addresses/1/customer" + } + } + } + }, + "providerStates": [ + { + "name": "a single address" + } + ] + } + ], + "metadata": { + "pact-specification": { + "version": "3.0.0" + }, + "pact-jvm": { + "version": "3.5.2" + } + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index ab5e8ca..5ac08d5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,5 @@ include 'pact-spring-data-rest-provider' include 'sleuth-downstream-service' include 'sleuth-upstream-service' include 'rabbitmq-event-brokering' +include 'junit5'