From f1c11281dc67e5c61a5d0c66cfdb6d6aca9c1eba Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Fri, 21 Jul 2017 09:26:37 -0600 Subject: [PATCH 01/29] Initial commit --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..4fa332f5c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +build +.gradle +.idea +*.iml +ci/variables.yml From ccd8f0b1fe79d4e0d81019c0b1344def30fed4c4 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Tue, 5 Sep 2017 08:25:20 +1000 Subject: [PATCH 02/29] Simple Spring Boot app --- build.gradle | 12 ++ gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 172 ++++++++++++++++++ gradlew.bat | 84 +++++++++ settings.gradle | 1 + .../pal/tracker/PalTrackerApplication.java | 12 ++ .../pal/tracker/WelcomeController.java | 13 ++ 7 files changed, 300 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java create mode 100644 src/main/java/io/pivotal/pal/tracker/WelcomeController.java diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..edb330bac --- /dev/null +++ b/build.gradle @@ -0,0 +1,12 @@ +plugins { + id "java" + id "org.springframework.boot" version "1.5.4.RELEASE" +} + +repositories { + mavenCentral() +} + +dependencies { + compile("org.springframework.boot:spring-boot-starter-web") +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..3b8ee0c29 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Sep 05 08:21:19 AEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..4453ccea3 --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..e95643d6a --- /dev/null +++ b/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/settings.gradle b/settings.gradle new file mode 100644 index 000000000..e31056948 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'pal-tracker' diff --git a/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java new file mode 100644 index 000000000..e33c3526e --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java @@ -0,0 +1,12 @@ +package io.pivotal.pal.tracker; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class PalTrackerApplication { + + public static void main(String[] args) { + SpringApplication.run(PalTrackerApplication.class, args); + } +} diff --git a/src/main/java/io/pivotal/pal/tracker/WelcomeController.java b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java new file mode 100644 index 000000000..4670637ec --- /dev/null +++ b/src/main/java/io/pivotal/pal/tracker/WelcomeController.java @@ -0,0 +1,13 @@ +package io.pivotal.pal.tracker; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class WelcomeController { + + @GetMapping("/") + public String sayHello() { + return "hello"; + } +} From 3e00b3c6a15ede4d2979490a49d335b542bdec70 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Tue, 5 Sep 2017 09:02:15 +1000 Subject: [PATCH 03/29] Kotlinise java no more --- build.gradle | 26 +++++++++++++++--- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54212 bytes .../pal/tracker/PalTrackerApplication.java | 12 -------- .../pal/tracker/WelcomeController.java | 13 --------- .../pal/tracker/PalTrackerApplication.kt | 11 ++++++++ .../pivotal/pal/tracker/WelcomeController.kt | 11 ++++++++ 6 files changed, 44 insertions(+), 29 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 src/main/java/io/pivotal/pal/tracker/PalTrackerApplication.java delete mode 100644 src/main/java/io/pivotal/pal/tracker/WelcomeController.java create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt diff --git a/build.gradle b/build.gradle index edb330bac..950607ae6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,30 @@ +buildscript { + ext.kotlin_version = '1.1.4-3' +} + plugins { - id "java" - id "org.springframework.boot" version "1.5.4.RELEASE" + id 'java' + id 'org.springframework.boot' version '1.5.4.RELEASE' + id 'org.jetbrains.kotlin.jvm' version '1.1.4-3' + id 'org.jetbrains.kotlin.plugin.spring' version '1.1.4-3' } repositories { mavenCentral() } +compileKotlin { + kotlinOptions { + jvmTarget = '1.8' + } +} +compileTestKotlin { + kotlinOptions { + jvmTarget = '1.8' + } +} + dependencies { - compile("org.springframework.boot:spring-boot-starter-web") -} \ No newline at end of file + compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile 'org.springframework.boot:spring-boot-starter-web' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c74aa66dcbd1184ca65ff1d1a2f3a0de2ce37e26 GIT binary patch literal 54212 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
  • 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 { + SpringApplication.run(PalTrackerApplication::class.java, *args) +} diff --git a/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt b/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt new file mode 100644 index 000000000..92b9de96a --- /dev/null +++ b/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt @@ -0,0 +1,11 @@ +package io.pivotal.pal.tracker + +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +class WelcomeController { + + @GetMapping("/") + fun sayHello() = "hello" +} From d08a3cd4c6176d64d006415fba3de338f489c7ef Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Thu, 20 Jul 2017 13:56:50 -0600 Subject: [PATCH 04/29] Add tests for deployment lab --- .../pal/tracker/EnvControllerTest.java | 28 +++++++++++++++++++ .../pal/tracker/WelcomeControllerTest.java | 16 +++++++++++ .../pal/trackerapi/WelcomeApiTest.java | 26 +++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java create mode 100644 src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java create mode 100644 src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java new file mode 100644 index 000000000..fda0f0f34 --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java @@ -0,0 +1,28 @@ +package test.pivotal.pal.tracker; + +import org.junit.Test; + +import java.util.Map; +import io.pivotal.pal.tracker.EnvController; + +import static org.assertj.core.api.Assertions.assertThat; + +public class EnvControllerTest { + @Test + public void getEnv() throws Exception { + EnvController controller = new EnvController( + "8675", + "12G", + "34", + "123.sesame.street" + ); + + Map env = controller.getEnv(); + + assertThat(env.get("PORT")).isEqualTo("8675"); + assertThat(env.get("MEMORY_LIMIT")).isEqualTo("12G"); + assertThat(env.get("CF_INSTANCE_INDEX")).isEqualTo("34"); + assertThat(env.get("CF_INSTANCE_ADDR")).isEqualTo("123.sesame.street"); + } + +} diff --git a/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java b/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java new file mode 100644 index 000000000..bfa8271a0 --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java @@ -0,0 +1,16 @@ +package test.pivotal.pal.tracker; + +import io.pivotal.pal.tracker.WelcomeController; +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +public class WelcomeControllerTest { + + @Test + public void itSaysHello() throws Exception { + WelcomeController controller = new WelcomeController("A welcome message"); + + assertThat(controller.sayHello()).isEqualTo("A welcome message"); + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java new file mode 100644 index 000000000..cc7091ed4 --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java @@ -0,0 +1,26 @@ +package test.pivotal.pal.trackerapi; + +import io.pivotal.pal.tracker.PalTrackerApplication; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class WelcomeApiTest { + + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void exampleTest() { + String body = this.restTemplate.getForObject("/", String.class); + assertThat(body).isEqualTo("Hello from test"); + } +} From 4e6840e7245365894aebf9680e0c07b0dd904657 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Tue, 5 Sep 2017 16:12:24 +1000 Subject: [PATCH 05/29] Cloud-foundring --- build.gradle | 10 +++++++ manifest.yml | 7 +++++ .../io/pivotal/pal/tracker/EnvController.kt | 21 ++++++++++++++ .../pivotal/pal/tracker/WelcomeController.kt | 5 ++-- .../pal/tracker/EnvControllerTest.java | 28 ------------------- .../pivotal/pal/tracker/EnvControllerTest.kt | 24 ++++++++++++++++ .../pal/tracker/WelcomeControllerTest.java | 16 ----------- .../pal/tracker/WelcomeControllerTest.kt | 15 ++++++++++ 8 files changed, 80 insertions(+), 46 deletions(-) create mode 100644 manifest.yml create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt delete mode 100644 src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java create mode 100644 src/test/java/test/pivotal/pal/tracker/EnvControllerTest.kt delete mode 100644 src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java create mode 100644 src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.kt diff --git a/build.gradle b/build.gradle index 950607ae6..ad1f04024 100644 --- a/build.gradle +++ b/build.gradle @@ -27,4 +27,14 @@ compileTestKotlin { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile 'org.springframework.boot:spring-boot-starter-web' + testCompile('org.springframework.boot:spring-boot-starter-test') } + +bootRun.environment([ + "WELCOME_MESSAGE": "hello", +]) + +test.environment([ + "WELCOME_MESSAGE": "Hello from test", +]) + diff --git a/manifest.yml b/manifest.yml new file mode 100644 index 000000000..7f06f91ee --- /dev/null +++ b/manifest.yml @@ -0,0 +1,7 @@ +--- +applications: +- name: pal-tracker + path: build/libs/pal-tracker.jar + random-route: true + env: + WELCOME_MESSAGE: Hello from Cloud Foundry \ No newline at end of file diff --git a/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt b/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt new file mode 100644 index 000000000..17f83c64d --- /dev/null +++ b/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt @@ -0,0 +1,21 @@ +package io.pivotal.pal.tracker + +import org.springframework.beans.factory.annotation.Value +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +class EnvController( + @Value("\${PORT:NOT SET}") private val port: String, + @Value("\${MEMORY_LIMIT:NOT SET}") private val memoryLimit: String , + @Value("\${CF_INSTANCE_INDEX:NOT SET}") private val cfInstanceIndex: String, + @Value("\${CF_INSTANCE_ADDR:NOT SET}") private val cfInstanceAddr: String) { + + @GetMapping("/env") + fun getEnv() = mapOf( + "PORT" to port, + "MEMORY_LIMIT" to memoryLimit, + "CF_INSTANCE_INDEX" to cfInstanceIndex, + "CF_INSTANCE_ADDR" to cfInstanceAddr + ) +} diff --git a/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt b/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt index 92b9de96a..f13a410b1 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/WelcomeController.kt @@ -1,11 +1,12 @@ package io.pivotal.pal.tracker +import org.springframework.beans.factory.annotation.Value import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RestController @RestController -class WelcomeController { +class WelcomeController(@Value("\${welcome_message}") private val message: String) { @GetMapping("/") - fun sayHello() = "hello" + fun sayHello() = message } diff --git a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java deleted file mode 100644 index fda0f0f34..000000000 --- a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package test.pivotal.pal.tracker; - -import org.junit.Test; - -import java.util.Map; -import io.pivotal.pal.tracker.EnvController; - -import static org.assertj.core.api.Assertions.assertThat; - -public class EnvControllerTest { - @Test - public void getEnv() throws Exception { - EnvController controller = new EnvController( - "8675", - "12G", - "34", - "123.sesame.street" - ); - - Map env = controller.getEnv(); - - assertThat(env.get("PORT")).isEqualTo("8675"); - assertThat(env.get("MEMORY_LIMIT")).isEqualTo("12G"); - assertThat(env.get("CF_INSTANCE_INDEX")).isEqualTo("34"); - assertThat(env.get("CF_INSTANCE_ADDR")).isEqualTo("123.sesame.street"); - } - -} diff --git a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.kt b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.kt new file mode 100644 index 000000000..5d420bcae --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.kt @@ -0,0 +1,24 @@ +package test.pivotal.pal.tracker + +import io.pivotal.pal.tracker.EnvController +import org.assertj.core.api.Assertions.assertThat +import org.junit.Test + +class EnvControllerTest { + @Test + fun getEnv() { + val controller = EnvController( + "8675", + "12G", + "34", + "123.sesame.street" + ) + + val env = controller.getEnv() + + assertThat(env["PORT"]).isEqualTo("8675") + assertThat(env["MEMORY_LIMIT"]).isEqualTo("12G") + assertThat(env["CF_INSTANCE_INDEX"]).isEqualTo("34") + assertThat(env["CF_INSTANCE_ADDR"]).isEqualTo("123.sesame.street") + } +} diff --git a/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java b/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java deleted file mode 100644 index bfa8271a0..000000000 --- a/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package test.pivotal.pal.tracker; - -import io.pivotal.pal.tracker.WelcomeController; -import org.junit.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -public class WelcomeControllerTest { - - @Test - public void itSaysHello() throws Exception { - WelcomeController controller = new WelcomeController("A welcome message"); - - assertThat(controller.sayHello()).isEqualTo("A welcome message"); - } -} diff --git a/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.kt b/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.kt new file mode 100644 index 000000000..e2b22b2b5 --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.kt @@ -0,0 +1,15 @@ +package test.pivotal.pal.tracker + +import io.pivotal.pal.tracker.WelcomeController +import org.assertj.core.api.Assertions.assertThat +import org.junit.Test + +class WelcomeControllerTest { + + @Test + fun itSaysHello() { + val controller = WelcomeController("A welcome message") + + assertThat(controller.sayHello()).isEqualTo("A welcome message") + } +} From a509dc4ebfe32be929850fdb9e57a15f84db33b0 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Tue, 5 Sep 2017 16:22:08 +1000 Subject: [PATCH 06/29] Avoid creating new env map every time the GET is called --- .../kotlin/io/pivotal/pal/tracker/EnvController.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt b/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt index 17f83c64d..dcb07a2ca 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/EnvController.kt @@ -6,16 +6,18 @@ import org.springframework.web.bind.annotation.RestController @RestController class EnvController( - @Value("\${PORT:NOT SET}") private val port: String, - @Value("\${MEMORY_LIMIT:NOT SET}") private val memoryLimit: String , - @Value("\${CF_INSTANCE_INDEX:NOT SET}") private val cfInstanceIndex: String, - @Value("\${CF_INSTANCE_ADDR:NOT SET}") private val cfInstanceAddr: String) { + @Value("\${PORT:NOT SET}") port: String, + @Value("\${MEMORY_LIMIT:NOT SET}") memoryLimit: String , + @Value("\${CF_INSTANCE_INDEX:NOT SET}") cfInstanceIndex: String, + @Value("\${CF_INSTANCE_ADDR:NOT SET}") cfInstanceAddr: String) { - @GetMapping("/env") - fun getEnv() = mapOf( + private val env: Map = mapOf( "PORT" to port, "MEMORY_LIMIT" to memoryLimit, "CF_INSTANCE_INDEX" to cfInstanceIndex, "CF_INSTANCE_ADDR" to cfInstanceAddr ) + + @GetMapping("/env") + fun getEnv() = env } From 95ec6d01142ded1180388e899b873d00fbca03c5 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Tue, 5 Sep 2017 18:47:55 +1000 Subject: [PATCH 07/29] learn to fly with concourse --- ci/build.yml | 22 ++++++++++++++++++++++ ci/pipeline.yml | 31 +++++++++++++++++++++++++++++++ ci/variables.example.yml | 9 +++++++++ manifest.yml | 2 -- 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 ci/build.yml create mode 100644 ci/pipeline.yml create mode 100644 ci/variables.example.yml diff --git a/ci/build.yml b/ci/build.yml new file mode 100644 index 000000000..e735e47d6 --- /dev/null +++ b/ci/build.yml @@ -0,0 +1,22 @@ +platform: linux + +image_resource: + type: docker-image + source: + repository: openjdk + tag: '8-jdk' + +inputs: + - name: pal-tracker + +outputs: + - name: build-output + +run: + path: bash + args: + - -exc + - | + cd pal-tracker + ./gradlew build + cp build/libs/pal-tracker.jar ../build-output \ No newline at end of file diff --git a/ci/pipeline.yml b/ci/pipeline.yml new file mode 100644 index 000000000..01d389043 --- /dev/null +++ b/ci/pipeline.yml @@ -0,0 +1,31 @@ +--- +resources: +- name: pal-tracker + type: git + source: + uri: {{github-repository}} + branch: master + private_key: {{github-private-key}} + +- name: deploy + type: cf + source: + api: {{cf-api-url}} + username: {{cf-username}} + password: {{cf-password}} + organization: {{cf-org}} + space: sandbox + +jobs: +- name: build-and-deploy + plan: + - get: pal-tracker + trigger: true + - task: build and test + file: pal-tracker/ci/build.yml + - put: deploy + params: + manifest: pal-tracker/manifest.yml + path: build-output/pal-tracker.jar + environment_variables: + WELCOME_MESSAGE: "Hello from Concourse" \ No newline at end of file diff --git a/ci/variables.example.yml b/ci/variables.example.yml new file mode 100644 index 000000000..649a717a6 --- /dev/null +++ b/ci/variables.example.yml @@ -0,0 +1,9 @@ +cf-api-url: CF_API_URL +cf-username: CF_USERNAME +cf-password: CF_PASSWORD +cf-org: CF_ORG +github-repository: git@github.com:GITHUB_USERNAME/pal-tracker.git +github-private-key: | + -----BEGIN RSA PRIVATE KEY----- + REPLACE WITH YOUR PRIVATE KEY HERE + -----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/manifest.yml b/manifest.yml index 7f06f91ee..2cefccc45 100644 --- a/manifest.yml +++ b/manifest.yml @@ -3,5 +3,3 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar random-route: true - env: - WELCOME_MESSAGE: Hello from Cloud Foundry \ No newline at end of file From 544adaee522ed1ccfcff723b8ba7e3878976a299 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Tue, 5 Sep 2017 18:55:45 +1000 Subject: [PATCH 08/29] Kotlinise test package --- .../test/pivotal/pal/tracker/EnvControllerTest.kt | 0 .../test/pivotal/pal/tracker/WelcomeControllerTest.kt | 0 .../test/pivotal/pal/trackerapi/WelcomeApiTest.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/test/{java => kotlin}/test/pivotal/pal/tracker/EnvControllerTest.kt (100%) rename src/test/{java => kotlin}/test/pivotal/pal/tracker/WelcomeControllerTest.kt (100%) rename src/test/{java => kotlin}/test/pivotal/pal/trackerapi/WelcomeApiTest.java (100%) diff --git a/src/test/java/test/pivotal/pal/tracker/EnvControllerTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/EnvControllerTest.kt similarity index 100% rename from src/test/java/test/pivotal/pal/tracker/EnvControllerTest.kt rename to src/test/kotlin/test/pivotal/pal/tracker/EnvControllerTest.kt diff --git a/src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/WelcomeControllerTest.kt similarity index 100% rename from src/test/java/test/pivotal/pal/tracker/WelcomeControllerTest.kt rename to src/test/kotlin/test/pivotal/pal/tracker/WelcomeControllerTest.kt diff --git a/src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java b/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.java similarity index 100% rename from src/test/java/test/pivotal/pal/trackerapi/WelcomeApiTest.java rename to src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.java From 0880bff3ce2f4c5c86872fcab03227071d63fd5f Mon Sep 17 00:00:00 2001 From: Dariusz Date: Tue, 5 Sep 2017 19:04:06 +1000 Subject: [PATCH 09/29] Add buildpack to manifest --- manifest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.yml b/manifest.yml index 2cefccc45..57fdd4cd2 100644 --- a/manifest.yml +++ b/manifest.yml @@ -2,4 +2,5 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar + buildpack: java-buildpack random-route: true From 7afc6aba2100583402343571cbe379f9bd284cf3 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Tue, 5 Sep 2017 19:10:38 +1000 Subject: [PATCH 10/29] Remove buildpack from manifest --- manifest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.yml b/manifest.yml index 57fdd4cd2..2cefccc45 100644 --- a/manifest.yml +++ b/manifest.yml @@ -2,5 +2,4 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar - buildpack: java-buildpack random-route: true From 322b7f9f4641b8e90b25a0bd99d6185b57da7783 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Wed, 6 Sep 2017 12:34:22 +1000 Subject: [PATCH 11/29] more pipes --- ci/build.yml | 5 +- ci/pipeline.yml | 66 ++++++++++++++++++++++--- ci/variables.example.yml | 5 +- manifest.yml => manifest-production.yml | 2 +- manifest-review.yml | 5 ++ 5 files changed, 72 insertions(+), 11 deletions(-) rename manifest.yml => manifest-production.yml (76%) create mode 100644 manifest-review.yml diff --git a/ci/build.yml b/ci/build.yml index e735e47d6..4c72d2f54 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -8,6 +8,7 @@ image_resource: inputs: - name: pal-tracker + - name: version outputs: - name: build-output @@ -18,5 +19,5 @@ run: - -exc - | cd pal-tracker - ./gradlew build - cp build/libs/pal-tracker.jar ../build-output \ No newline at end of file + ./gradlew -P version=$(cat ../version/number) build + cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 01d389043..c34c3b2a9 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -7,25 +7,77 @@ resources: branch: master private_key: {{github-private-key}} -- name: deploy +- name: pal-tracker-artifacts + type: s3 + source: + bucket: {{aws-bucket}} + regexp: releases/pal-tracker-(.*).jar + access_key_id: {{aws-access-key-id}} + secret_access_key: {{aws-secret-access-key}} + +- name: version + type: semver + source: + bucket: {{aws-bucket}} + key: pal-tracker/version + access_key_id: {{aws-access-key-id}} + secret_access_key: {{aws-secret-access-key}} + +- name: review-deployment + type: cf + source: + api: {{cf-api-url}} + username: {{cf-username}} + password: {{cf-password}} + organization: {{cf-org}} + space: review + +- name: production-deployment type: cf source: api: {{cf-api-url}} username: {{cf-username}} password: {{cf-password}} organization: {{cf-org}} - space: sandbox + space: production jobs: -- name: build-and-deploy +- name: build plan: - get: pal-tracker trigger: true + - get: version + params: {bump: patch} - task: build and test file: pal-tracker/ci/build.yml - - put: deploy + - put: pal-tracker-artifacts + params: + file: build-output/pal-tracker-*.jar + - put: version + params: + file: version/number + +- name: deploy-review + plan: + - get: pal-tracker + - get: pal-tracker-artifacts + trigger: true + passed: [build] + - put: review-deployment + params: + manifest: pal-tracker/manifest-review.yml + path: pal-tracker-artifacts/pal-tracker-*.jar + environment_variables: + WELCOME_MESSAGE: "Hello from the review environment" + +- name: deploy-production + plan: + - get: pal-tracker + - get: pal-tracker-artifacts + passed: [deploy-review] + - put: production-deployment params: - manifest: pal-tracker/manifest.yml - path: build-output/pal-tracker.jar + manifest: pal-tracker/manifest-production.yml + path: pal-tracker-artifacts/pal-tracker-*.jar environment_variables: - WELCOME_MESSAGE: "Hello from Concourse" \ No newline at end of file + WELCOME_MESSAGE: "Hello from the production environment" \ No newline at end of file diff --git a/ci/variables.example.yml b/ci/variables.example.yml index 649a717a6..c72926f28 100644 --- a/ci/variables.example.yml +++ b/ci/variables.example.yml @@ -6,4 +6,7 @@ github-repository: git@github.com:GITHUB_USERNAME/pal-tracker.git github-private-key: | -----BEGIN RSA PRIVATE KEY----- REPLACE WITH YOUR PRIVATE KEY HERE - -----END RSA PRIVATE KEY----- \ No newline at end of file + -----END RSA PRIVATE KEY----- +aws-access-key-id: +aws-secret-access-key: +aws-bucket: \ No newline at end of file diff --git a/manifest.yml b/manifest-production.yml similarity index 76% rename from manifest.yml rename to manifest-production.yml index 2cefccc45..56dd5cb9c 100644 --- a/manifest.yml +++ b/manifest-production.yml @@ -2,4 +2,4 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar - random-route: true + host: dl-pal-tracker diff --git a/manifest-review.yml b/manifest-review.yml new file mode 100644 index 000000000..25bdba914 --- /dev/null +++ b/manifest-review.yml @@ -0,0 +1,5 @@ +--- +applications: +- name: pal-tracker + path: build/libs/pal-tracker.jar + host: dl-pal-tracker-review From c0010ac7c5b55499a14d1a528fb6bbcbec904c8a Mon Sep 17 00:00:00 2001 From: Dariusz Date: Wed, 6 Sep 2017 12:34:22 +1000 Subject: [PATCH 12/29] more pipes --- ci/variables.example.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/variables.example.yml b/ci/variables.example.yml index c72926f28..fe86f4a03 100644 --- a/ci/variables.example.yml +++ b/ci/variables.example.yml @@ -2,11 +2,11 @@ cf-api-url: CF_API_URL cf-username: CF_USERNAME cf-password: CF_PASSWORD cf-org: CF_ORG +aws-access-key-id: +aws-secret-access-key: +aws-bucket: github-repository: git@github.com:GITHUB_USERNAME/pal-tracker.git github-private-key: | -----BEGIN RSA PRIVATE KEY----- REPLACE WITH YOUR PRIVATE KEY HERE -----END RSA PRIVATE KEY----- -aws-access-key-id: -aws-secret-access-key: -aws-bucket: \ No newline at end of file From d0c2d3850d9d322a68519eb1639ac3f7dca481fc Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Thu, 20 Jul 2017 15:04:20 -0600 Subject: [PATCH 13/29] Add tests for MVC lab --- .../InMemoryTimeEntryRepositoryTest.java | 71 +++++++++++ .../pal/tracker/TimeEntryControllerTest.java | 107 ++++++++++++++++ .../pal/trackerapi/TimeEntryApiTest.java | 119 ++++++++++++++++++ 3 files changed, 297 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java create mode 100644 src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java create mode 100644 src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java new file mode 100644 index 000000000..95e810cad --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java @@ -0,0 +1,71 @@ +package test.pivotal.pal.tracker; + +import io.pivotal.pal.tracker.InMemoryTimeEntryRepository; +import io.pivotal.pal.tracker.TimeEntry; + +import org.junit.Test; + +import java.util.List; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; + +public class InMemoryTimeEntryRepositoryTest { + @Test + public void create() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + TimeEntry createdTimeEntry = repo.create(new TimeEntry(123, 456, "today", 8)); + + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + assertThat(createdTimeEntry).isEqualTo(expected); + + TimeEntry readEntry = repo.find(createdTimeEntry.getId()); + assertThat(readEntry).isEqualTo(expected); + } + + @Test + public void find() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + repo.create(new TimeEntry(123, 456, "today", 8)); + + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + TimeEntry readEntry = repo.find(1L); + assertThat(readEntry).isEqualTo(expected); + } + + @Test + public void list() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + repo.create(new TimeEntry(123, 456, "today", 8)); + repo.create(new TimeEntry(789, 654, "yesterday", 4)); + + List expected = asList( + new TimeEntry(1L, 123, 456, "today", 8), + new TimeEntry(2L, 789, 654, "yesterday", 4) + ); + assertThat(repo.list()).isEqualTo(expected); + } + + @Test + public void update() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); + + TimeEntry updatedEntry = repo.update( + created.getId(), + new TimeEntry(321, 654, "tomorrow", 5)); + + TimeEntry expected = new TimeEntry(created.getId(), 321, 654, "tomorrow", 5); + assertThat(updatedEntry).isEqualTo(expected); + assertThat(repo.find(created.getId())).isEqualTo(expected); + } + + @Test + public void delete() throws Exception { + InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); + TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); + + repo.delete(created.getId()); + assertThat(repo.list()).isEmpty(); + } +} diff --git a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java new file mode 100644 index 000000000..a6f1100b5 --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java @@ -0,0 +1,107 @@ +package test.pivotal.pal.tracker; + +import io.pivotal.pal.tracker.TimeEntryRepository; +import io.pivotal.pal.tracker.TimeEntryController; +import io.pivotal.pal.tracker.TimeEntry; +import org.junit.Before; +import org.junit.Test; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +import java.util.List; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class TimeEntryControllerTest { + private TimeEntryRepository timeEntryRepository; + private TimeEntryController controller; + + @Before + public void setUp() throws Exception { + timeEntryRepository = mock(TimeEntryRepository.class); + controller = new TimeEntryController(timeEntryRepository); + } + + @Test + public void testCreate() throws Exception { + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + doReturn(expected) + .when(timeEntryRepository) + .create(any(TimeEntry.class)); + + ResponseEntity response = controller.create(new TimeEntry(123, 456, "today", 8)); + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testRead() throws Exception { + TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); + doReturn(expected) + .when(timeEntryRepository) + .find(1L); + + ResponseEntity response = controller.read(1L); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testRead_NotFound() throws Exception { + doReturn(null) + .when(timeEntryRepository) + .find(1L); + + ResponseEntity response = controller.read(1L); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + @Test + public void testList() throws Exception { + List expected = asList( + new TimeEntry(1, 123, 456, "today", 8), + new TimeEntry(2, 789, 321, "yesterday", 4) + ); + doReturn(expected).when(timeEntryRepository).list(); + + ResponseEntity> response = controller.list(); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testUpdate() throws Exception { + TimeEntry expected = new TimeEntry(1, 987, 654, "yesterday", 4); + doReturn(expected) + .when(timeEntryRepository) + .update(eq(1L), any(TimeEntry.class)); + + ResponseEntity response = controller.update(1L, expected); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(response.getBody()).isEqualTo(expected); + } + + @Test + public void testUpdate_NotFound() throws Exception { + doReturn(null) + .when(timeEntryRepository) + .update(eq(1L), any(TimeEntry.class)); + + ResponseEntity response = controller.update(1L, new TimeEntry()); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + @Test + public void testDelete() throws Exception { + ResponseEntity response = controller.delete(1L); + verify(timeEntryRepository).delete(1L); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java new file mode 100644 index 000000000..36dd6c687 --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java @@ -0,0 +1,119 @@ +package test.pivotal.pal.trackerapi; + +import com.jayway.jsonpath.DocumentContext; +import io.pivotal.pal.tracker.PalTrackerApplication; +import io.pivotal.pal.tracker.TimeEntry; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.Collection; + +import static com.jayway.jsonpath.JsonPath.parse; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class TimeEntryApiTest { + + @Autowired + private TestRestTemplate restTemplate; + + private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); + + @Test + public void testCreate() throws Exception { + ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); + + + assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED); + + DocumentContext createJson = parse(createResponse.getBody()); + assertThat(createJson.read("$.id", Long.class)).isGreaterThan(0); + assertThat(createJson.read("$.projectId", Long.class)).isEqualTo(123L); + assertThat(createJson.read("$.userId", Long.class)).isEqualTo(456L); + assertThat(createJson.read("$.date", String.class)).isEqualTo("today"); + assertThat(createJson.read("$.hours", Long.class)).isEqualTo(8); + } + + @Test + public void testList() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity listResponse = restTemplate.getForEntity("/time-entries", String.class); + + + assertThat(listResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext listJson = parse(listResponse.getBody()); + + Collection timeEntries = listJson.read("$[*]", Collection.class); + assertThat(timeEntries.size()).isEqualTo(1); + + Long readId = listJson.read("$[0].id", Long.class); + assertThat(readId).isEqualTo(id); + } + + @Test + public void testRead() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity readResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); + + + assertThat(readResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + DocumentContext readJson = parse(readResponse.getBody()); + assertThat(readJson.read("$.id", Long.class)).isEqualTo(id); + assertThat(readJson.read("$.projectId", Long.class)).isEqualTo(123L); + assertThat(readJson.read("$.userId", Long.class)).isEqualTo(456L); + assertThat(readJson.read("$.date", String.class)).isEqualTo("today"); + assertThat(readJson.read("$.hours", Long.class)).isEqualTo(8); + } + + @Test + public void testUpdate() throws Exception { + Long id = createTimeEntry(); + TimeEntry updatedTimeEntry = new TimeEntry(2, 3, "tomorrow", 9); + + + ResponseEntity updateResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.PUT, new HttpEntity<>(updatedTimeEntry, null), String.class); + + + assertThat(updateResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext updateJson = parse(updateResponse.getBody()); + assertThat(updateJson.read("$.id", Long.class)).isEqualTo(id); + assertThat(updateJson.read("$.projectId", Long.class)).isEqualTo(2L); + assertThat(updateJson.read("$.userId", Long.class)).isEqualTo(3L); + assertThat(updateJson.read("$.date", String.class)).isEqualTo("tomorrow"); + assertThat(updateJson.read("$.hours", Long.class)).isEqualTo(9); + } + + @Test + public void testDelete() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity deleteResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.DELETE, null, String.class); + + + assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + + ResponseEntity deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); + assertThat(deletedReadResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + private Long createTimeEntry() { + return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry.class).getId(); + } +} From 896b656bfaaa75f0dcf1e8260916baed12d268d2 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Wed, 6 Sep 2017 16:33:49 +1000 Subject: [PATCH 14/29] gitignore out directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4fa332f5c..019b70b33 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ build .gradle .idea *.iml +out ci/variables.yml From e5e5c9defed222a669e9c4f721363b22ad2ab9b0 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Wed, 6 Sep 2017 16:35:03 +1000 Subject: [PATCH 15/29] Add time entry stuff kotlinising still to come... --- .../tracker/InMemoryTimeEntryRepository.kt | 32 ++++++++++ .../pal/tracker/PalTrackerApplication.kt | 8 ++- .../io/pivotal/pal/tracker/TimeEntry.kt | 62 +++++++++++++++++++ .../pal/tracker/TimeEntryController.kt | 56 +++++++++++++++++ .../pal/tracker/TimeEntryRepository.kt | 9 +++ 5 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt diff --git a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt new file mode 100644 index 000000000..92fbcac2e --- /dev/null +++ b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt @@ -0,0 +1,32 @@ +package io.pivotal.pal.tracker + +import java.util.* + +class InMemoryTimeEntryRepository : TimeEntryRepository { + + private val timeEntries = HashMap() + + override fun create(timeEntry: TimeEntry): TimeEntry { + timeEntry.id = (timeEntries.size + 1).toLong() + timeEntries.put(timeEntry.id, timeEntry) + return timeEntry + } + + override fun find(id: Long): TimeEntry? { + return timeEntries.get(id) + } + + override fun list(): List { + return ArrayList(timeEntries.values) + } + + override fun update(id: Long, timeEntry: TimeEntry): TimeEntry { + timeEntries.replace(id, timeEntry) + timeEntry.id = id + return timeEntry + } + + override fun delete(id: Long) { + timeEntries.remove(id) + } +} \ No newline at end of file diff --git a/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt b/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt index efa93dbef..083cc5d6b 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt @@ -2,9 +2,15 @@ package io.pivotal.pal.tracker import org.springframework.boot.SpringApplication import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.context.annotation.Bean @SpringBootApplication -class PalTrackerApplication +class PalTrackerApplication { + @Bean + fun timeEntryRepository(): TimeEntryRepository { + return InMemoryTimeEntryRepository() + } +} fun main(args: Array) { SpringApplication.run(PalTrackerApplication::class.java, *args) diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt new file mode 100644 index 000000000..23604f1e1 --- /dev/null +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt @@ -0,0 +1,62 @@ +package io.pivotal.pal.tracker + +class TimeEntry { + var id: Long = 0 + var projectId: Long = 0 + private set + var userId: Long = 0 + private set + var date: String? = null + private set + var hours: Int = 0 + private set + + constructor() {} + + constructor(projectId: Long, userId: Long, date: String, hours: Int) { + this.projectId = projectId + this.userId = userId + this.date = date + this.hours = hours + } + + constructor(id: Long, projectId: Long, userId: Long, date: String, hours: Int) { + this.id = id + this.projectId = projectId + this.userId = userId + this.date = date + this.hours = hours + } + + override fun equals(o: Any?): Boolean { + if (this === o) return true + if (o == null || javaClass != o.javaClass) return false + + val timeEntry = o as TimeEntry? + + if (id != timeEntry!!.id) return false + if (projectId != timeEntry.projectId) return false + if (userId != timeEntry.userId) return false + if (hours != timeEntry.hours) return false + return if (date != null) date == timeEntry.date else timeEntry.date == null + } + + override fun hashCode(): Int { + var result = (id xor id.ushr(32)).toInt() + result = 31 * result + (projectId xor projectId.ushr(32)).toInt() + result = 31 * result + (userId xor userId.ushr(32)).toInt() + result = 31 * result + if (date != null) date!!.hashCode() else 0 + result = 31 * result + hours + return result + } + + override fun toString(): String { + return "TimeEntry{" + + "id=" + id + + ", projectId=" + projectId + + ", userId=" + userId + + ", date='" + date + '\'' + + ", hours=" + hours + + '}' + } +} \ No newline at end of file diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt new file mode 100644 index 000000000..dc195dd65 --- /dev/null +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt @@ -0,0 +1,56 @@ +package io.pivotal.pal.tracker + +import org.springframework.http.HttpStatus +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.DeleteMapping +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.PutMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/time-entries") +class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { + + @PostMapping + fun create(@RequestBody timeEntry: TimeEntry): ResponseEntity { + val createdTimeEntry = timeEntriesRepo.create(timeEntry) + + return ResponseEntity(createdTimeEntry, HttpStatus.CREATED) + } + + @GetMapping("{id}") + fun read(@PathVariable id: Long): ResponseEntity { + val timeEntry = timeEntriesRepo.find(id) + return if (timeEntry != null) { + ResponseEntity(timeEntry, HttpStatus.OK) + } else { + ResponseEntity(HttpStatus.NOT_FOUND) + } + } + + @GetMapping + fun list(): ResponseEntity> { + return ResponseEntity(timeEntriesRepo.list(), HttpStatus.OK) + } + + @PutMapping("{id}") + fun update(@PathVariable id: Long, @RequestBody timeEntry: TimeEntry): ResponseEntity { + val updatedTimeEntry = timeEntriesRepo.update(id, timeEntry) + return if (updatedTimeEntry != null) { + ResponseEntity(updatedTimeEntry, HttpStatus.OK) + } else { + ResponseEntity(HttpStatus.NOT_FOUND) + } + } + + @DeleteMapping("{id}") + fun delete(@PathVariable id: Long): ResponseEntity { + timeEntriesRepo.delete(id) + + return ResponseEntity(HttpStatus.NO_CONTENT) + } +} \ No newline at end of file diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt new file mode 100644 index 000000000..c268531e9 --- /dev/null +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt @@ -0,0 +1,9 @@ +package io.pivotal.pal.tracker + +interface TimeEntryRepository { + fun create(timeEntry: TimeEntry): TimeEntry + fun find(id: Long): TimeEntry? + fun list(): List + fun update(id: Long, timeEntry: TimeEntry): TimeEntry + fun delete(id: Long) +} \ No newline at end of file From 3c7e0aa43bea66cdcd89a0682f7230e5330a9fc4 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Wed, 6 Sep 2017 19:08:43 +1000 Subject: [PATCH 16/29] add database migrations --- databases/tracker/create_databases.sql | 9 +++++++++ databases/tracker/migrations/V1__initial_schema.sql | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 databases/tracker/create_databases.sql create mode 100644 databases/tracker/migrations/V1__initial_schema.sql diff --git a/databases/tracker/create_databases.sql b/databases/tracker/create_databases.sql new file mode 100644 index 000000000..e99807019 --- /dev/null +++ b/databases/tracker/create_databases.sql @@ -0,0 +1,9 @@ +DROP DATABASE IF EXISTS tracker_dev; +DROP DATABASE IF EXISTS tracker_test; + +CREATE USER 'tracker'@'localhost' + IDENTIFIED BY ''; +GRANT ALL PRIVILEGES ON *.* TO 'tracker' @'localhost'; + +CREATE DATABASE tracker_dev; +CREATE DATABASE tracker_test; diff --git a/databases/tracker/migrations/V1__initial_schema.sql b/databases/tracker/migrations/V1__initial_schema.sql new file mode 100644 index 000000000..eaaa0c152 --- /dev/null +++ b/databases/tracker/migrations/V1__initial_schema.sql @@ -0,0 +1,11 @@ +CREATE TABLE time_entries ( + id BIGINT(20) NOT NULL AUTO_INCREMENT, + project_id BIGINT(20), + user_id BIGINT(20), + date VARCHAR(255), + hours INT, + + PRIMARY KEY (id) +) + ENGINE = innodb + DEFAULT CHARSET = utf8; \ No newline at end of file From b5f39d6f3ddd911e734ceb6cba9b751702a5093e Mon Sep 17 00:00:00 2001 From: Dariusz Date: Thu, 7 Sep 2017 10:25:21 +1000 Subject: [PATCH 17/29] kotlinise spring mvc --- build.gradle | 1 + .../tracker/InMemoryTimeEntryRepository.kt | 25 +++--- .../pal/tracker/PalTrackerApplication.kt | 4 +- .../io/pivotal/pal/tracker/TimeEntry.kt | 76 ++++--------------- .../pal/tracker/TimeEntryControllerTest.java | 8 +- 5 files changed, 33 insertions(+), 81 deletions(-) diff --git a/build.gradle b/build.gradle index ad1f04024..95cf87da1 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,7 @@ compileTestKotlin { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile 'org.springframework.boot:spring-boot-starter-web' + compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0' testCompile('org.springframework.boot:spring-boot-starter-test') } diff --git a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt index 92fbcac2e..5c291dba4 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt @@ -1,32 +1,29 @@ package io.pivotal.pal.tracker -import java.util.* +import java.util.ArrayList +import java.util.HashMap class InMemoryTimeEntryRepository : TimeEntryRepository { private val timeEntries = HashMap() override fun create(timeEntry: TimeEntry): TimeEntry { - timeEntry.id = (timeEntries.size + 1).toLong() - timeEntries.put(timeEntry.id, timeEntry) - return timeEntry + val updatedTimeEntry = timeEntry.copy(id = (timeEntries.size + 1).toLong()) + timeEntries[updatedTimeEntry.id!!] = updatedTimeEntry + return updatedTimeEntry } - override fun find(id: Long): TimeEntry? { - return timeEntries.get(id) - } + override fun find(id: Long) = timeEntries[id] - override fun list(): List { - return ArrayList(timeEntries.values) - } + override fun list() = ArrayList(timeEntries.values) override fun update(id: Long, timeEntry: TimeEntry): TimeEntry { - timeEntries.replace(id, timeEntry) - timeEntry.id = id - return timeEntry + val updatedTimeEntry = timeEntry.copy(id = id) + timeEntries.replace(id, updatedTimeEntry) + return updatedTimeEntry } override fun delete(id: Long) { timeEntries.remove(id) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt b/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt index 083cc5d6b..c0f9e6ca6 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt @@ -7,9 +7,7 @@ import org.springframework.context.annotation.Bean @SpringBootApplication class PalTrackerApplication { @Bean - fun timeEntryRepository(): TimeEntryRepository { - return InMemoryTimeEntryRepository() - } + fun timeEntryRepository() = InMemoryTimeEntryRepository() } fun main(args: Array) { diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt index 23604f1e1..21dd2f8a8 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt @@ -1,62 +1,18 @@ package io.pivotal.pal.tracker -class TimeEntry { - var id: Long = 0 - var projectId: Long = 0 - private set - var userId: Long = 0 - private set - var date: String? = null - private set - var hours: Int = 0 - private set - - constructor() {} - - constructor(projectId: Long, userId: Long, date: String, hours: Int) { - this.projectId = projectId - this.userId = userId - this.date = date - this.hours = hours - } - - constructor(id: Long, projectId: Long, userId: Long, date: String, hours: Int) { - this.id = id - this.projectId = projectId - this.userId = userId - this.date = date - this.hours = hours - } - - override fun equals(o: Any?): Boolean { - if (this === o) return true - if (o == null || javaClass != o.javaClass) return false - - val timeEntry = o as TimeEntry? - - if (id != timeEntry!!.id) return false - if (projectId != timeEntry.projectId) return false - if (userId != timeEntry.userId) return false - if (hours != timeEntry.hours) return false - return if (date != null) date == timeEntry.date else timeEntry.date == null - } - - override fun hashCode(): Int { - var result = (id xor id.ushr(32)).toInt() - result = 31 * result + (projectId xor projectId.ushr(32)).toInt() - result = 31 * result + (userId xor userId.ushr(32)).toInt() - result = 31 * result + if (date != null) date!!.hashCode() else 0 - result = 31 * result + hours - return result - } - - override fun toString(): String { - return "TimeEntry{" + - "id=" + id + - ", projectId=" + projectId + - ", userId=" + userId + - ", date='" + date + '\'' + - ", hours=" + hours + - '}' - } -} \ No newline at end of file +data class TimeEntry( + val id: Long?, + val projectId: Long, + val userId: Long, + val date: String?, + val hours: Int +) { + + constructor(projectId: Long, userId: Long, date: String, hours: Int) : this( + id = null, + projectId = projectId, + userId = userId, + date = date, + hours = hours + ) +} diff --git a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java index a6f1100b5..aac3ac77d 100644 --- a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java +++ b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java @@ -66,8 +66,8 @@ public void testRead_NotFound() throws Exception { @Test public void testList() throws Exception { List expected = asList( - new TimeEntry(1, 123, 456, "today", 8), - new TimeEntry(2, 789, 321, "yesterday", 4) + new TimeEntry(1L, 123, 456, "today", 8), + new TimeEntry(2L, 789, 321, "yesterday", 4) ); doReturn(expected).when(timeEntryRepository).list(); @@ -78,7 +78,7 @@ public void testList() throws Exception { @Test public void testUpdate() throws Exception { - TimeEntry expected = new TimeEntry(1, 987, 654, "yesterday", 4); + TimeEntry expected = new TimeEntry(1L, 987, 654, "yesterday", 4); doReturn(expected) .when(timeEntryRepository) .update(eq(1L), any(TimeEntry.class)); @@ -94,7 +94,7 @@ public void testUpdate_NotFound() throws Exception { .when(timeEntryRepository) .update(eq(1L), any(TimeEntry.class)); - ResponseEntity response = controller.update(1L, new TimeEntry()); + ResponseEntity response = controller.update(1L, new TimeEntry(1L, 123, 456, "today", 8)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); } From 796555024a191b2e163aec11eb7c025e0446bdf0 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Thu, 7 Sep 2017 12:09:47 +1000 Subject: [PATCH 18/29] slightly better kotlin now ... still a few things to make it more idiomatic --- build.gradle | 3 +- .../tracker/InMemoryTimeEntryRepository.kt | 2 +- .../pal/tracker/TimeEntryController.kt | 6 +- .../pal/tracker/TimeEntryRepository.kt | 2 +- .../InMemoryTimeEntryRepositoryTest.java | 71 ----------- .../pal/tracker/TimeEntryControllerTest.java | 107 ---------------- .../pal/trackerapi/TimeEntryApiTest.java | 119 ------------------ .../InMemoryTimeEntryRepositoryTest.kt | 68 ++++++++++ .../pal/tracker/TimeEntryControllerTest.kt | 104 +++++++++++++++ .../pal/trackerapi/TimeEntryApiTest.kt | 105 ++++++++++++++++ 10 files changed, 283 insertions(+), 304 deletions(-) delete mode 100644 src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java delete mode 100644 src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java delete mode 100644 src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java create mode 100644 src/test/kotlin/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.kt create mode 100644 src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt create mode 100644 src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt diff --git a/build.gradle b/build.gradle index 95cf87da1..64de00ed1 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,8 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile 'org.springframework.boot:spring-boot-starter-web' compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0' - testCompile('org.springframework.boot:spring-boot-starter-test') + testCompile 'com.nhaarman:mockito-kotlin:1.5.0' + testCompile 'org.springframework.boot:spring-boot-starter-test' } bootRun.environment([ diff --git a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt index 5c291dba4..a74a33969 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt @@ -17,7 +17,7 @@ class InMemoryTimeEntryRepository : TimeEntryRepository { override fun list() = ArrayList(timeEntries.values) - override fun update(id: Long, timeEntry: TimeEntry): TimeEntry { + override fun update(id: Long, timeEntry: TimeEntry): TimeEntry? { val updatedTimeEntry = timeEntry.copy(id = id) timeEntries.replace(id, updatedTimeEntry) return updatedTimeEntry diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt index dc195dd65..38cec5441 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt @@ -33,9 +33,7 @@ class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { } @GetMapping - fun list(): ResponseEntity> { - return ResponseEntity(timeEntriesRepo.list(), HttpStatus.OK) - } + fun list() = ResponseEntity(timeEntriesRepo.list(), HttpStatus.OK) @PutMapping("{id}") fun update(@PathVariable id: Long, @RequestBody timeEntry: TimeEntry): ResponseEntity { @@ -53,4 +51,4 @@ class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { return ResponseEntity(HttpStatus.NO_CONTENT) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt index c268531e9..142847da3 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt @@ -4,6 +4,6 @@ interface TimeEntryRepository { fun create(timeEntry: TimeEntry): TimeEntry fun find(id: Long): TimeEntry? fun list(): List - fun update(id: Long, timeEntry: TimeEntry): TimeEntry + fun update(id: Long, timeEntry: TimeEntry): TimeEntry? fun delete(id: Long) } \ No newline at end of file diff --git a/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java deleted file mode 100644 index 95e810cad..000000000 --- a/src/test/java/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package test.pivotal.pal.tracker; - -import io.pivotal.pal.tracker.InMemoryTimeEntryRepository; -import io.pivotal.pal.tracker.TimeEntry; - -import org.junit.Test; - -import java.util.List; - -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; - -public class InMemoryTimeEntryRepositoryTest { - @Test - public void create() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - TimeEntry createdTimeEntry = repo.create(new TimeEntry(123, 456, "today", 8)); - - TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); - assertThat(createdTimeEntry).isEqualTo(expected); - - TimeEntry readEntry = repo.find(createdTimeEntry.getId()); - assertThat(readEntry).isEqualTo(expected); - } - - @Test - public void find() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - repo.create(new TimeEntry(123, 456, "today", 8)); - - TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); - TimeEntry readEntry = repo.find(1L); - assertThat(readEntry).isEqualTo(expected); - } - - @Test - public void list() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - repo.create(new TimeEntry(123, 456, "today", 8)); - repo.create(new TimeEntry(789, 654, "yesterday", 4)); - - List expected = asList( - new TimeEntry(1L, 123, 456, "today", 8), - new TimeEntry(2L, 789, 654, "yesterday", 4) - ); - assertThat(repo.list()).isEqualTo(expected); - } - - @Test - public void update() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); - - TimeEntry updatedEntry = repo.update( - created.getId(), - new TimeEntry(321, 654, "tomorrow", 5)); - - TimeEntry expected = new TimeEntry(created.getId(), 321, 654, "tomorrow", 5); - assertThat(updatedEntry).isEqualTo(expected); - assertThat(repo.find(created.getId())).isEqualTo(expected); - } - - @Test - public void delete() throws Exception { - InMemoryTimeEntryRepository repo = new InMemoryTimeEntryRepository(); - TimeEntry created = repo.create(new TimeEntry(123, 456, "today", 8)); - - repo.delete(created.getId()); - assertThat(repo.list()).isEmpty(); - } -} diff --git a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java b/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java deleted file mode 100644 index aac3ac77d..000000000 --- a/src/test/java/test/pivotal/pal/tracker/TimeEntryControllerTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package test.pivotal.pal.tracker; - -import io.pivotal.pal.tracker.TimeEntryRepository; -import io.pivotal.pal.tracker.TimeEntryController; -import io.pivotal.pal.tracker.TimeEntry; -import org.junit.Before; -import org.junit.Test; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -import java.util.List; - -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - -public class TimeEntryControllerTest { - private TimeEntryRepository timeEntryRepository; - private TimeEntryController controller; - - @Before - public void setUp() throws Exception { - timeEntryRepository = mock(TimeEntryRepository.class); - controller = new TimeEntryController(timeEntryRepository); - } - - @Test - public void testCreate() throws Exception { - TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); - doReturn(expected) - .when(timeEntryRepository) - .create(any(TimeEntry.class)); - - ResponseEntity response = controller.create(new TimeEntry(123, 456, "today", 8)); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED); - assertThat(response.getBody()).isEqualTo(expected); - } - - @Test - public void testRead() throws Exception { - TimeEntry expected = new TimeEntry(1L, 123, 456, "today", 8); - doReturn(expected) - .when(timeEntryRepository) - .find(1L); - - ResponseEntity response = controller.read(1L); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(response.getBody()).isEqualTo(expected); - } - - @Test - public void testRead_NotFound() throws Exception { - doReturn(null) - .when(timeEntryRepository) - .find(1L); - - ResponseEntity response = controller.read(1L); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - } - - @Test - public void testList() throws Exception { - List expected = asList( - new TimeEntry(1L, 123, 456, "today", 8), - new TimeEntry(2L, 789, 321, "yesterday", 4) - ); - doReturn(expected).when(timeEntryRepository).list(); - - ResponseEntity> response = controller.list(); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(response.getBody()).isEqualTo(expected); - } - - @Test - public void testUpdate() throws Exception { - TimeEntry expected = new TimeEntry(1L, 987, 654, "yesterday", 4); - doReturn(expected) - .when(timeEntryRepository) - .update(eq(1L), any(TimeEntry.class)); - - ResponseEntity response = controller.update(1L, expected); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(response.getBody()).isEqualTo(expected); - } - - @Test - public void testUpdate_NotFound() throws Exception { - doReturn(null) - .when(timeEntryRepository) - .update(eq(1L), any(TimeEntry.class)); - - ResponseEntity response = controller.update(1L, new TimeEntry(1L, 123, 456, "today", 8)); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - } - - @Test - public void testDelete() throws Exception { - ResponseEntity response = controller.delete(1L); - verify(timeEntryRepository).delete(1L); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); - } -} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java deleted file mode 100644 index 36dd6c687..000000000 --- a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java +++ /dev/null @@ -1,119 +0,0 @@ -package test.pivotal.pal.trackerapi; - -import com.jayway.jsonpath.DocumentContext; -import io.pivotal.pal.tracker.PalTrackerApplication; -import io.pivotal.pal.tracker.TimeEntry; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.Collection; - -import static com.jayway.jsonpath.JsonPath.parse; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) -public class TimeEntryApiTest { - - @Autowired - private TestRestTemplate restTemplate; - - private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); - - @Test - public void testCreate() throws Exception { - ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); - - - assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED); - - DocumentContext createJson = parse(createResponse.getBody()); - assertThat(createJson.read("$.id", Long.class)).isGreaterThan(0); - assertThat(createJson.read("$.projectId", Long.class)).isEqualTo(123L); - assertThat(createJson.read("$.userId", Long.class)).isEqualTo(456L); - assertThat(createJson.read("$.date", String.class)).isEqualTo("today"); - assertThat(createJson.read("$.hours", Long.class)).isEqualTo(8); - } - - @Test - public void testList() throws Exception { - Long id = createTimeEntry(); - - - ResponseEntity listResponse = restTemplate.getForEntity("/time-entries", String.class); - - - assertThat(listResponse.getStatusCode()).isEqualTo(HttpStatus.OK); - - DocumentContext listJson = parse(listResponse.getBody()); - - Collection timeEntries = listJson.read("$[*]", Collection.class); - assertThat(timeEntries.size()).isEqualTo(1); - - Long readId = listJson.read("$[0].id", Long.class); - assertThat(readId).isEqualTo(id); - } - - @Test - public void testRead() throws Exception { - Long id = createTimeEntry(); - - - ResponseEntity readResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); - - - assertThat(readResponse.getStatusCode()).isEqualTo(HttpStatus.OK); - DocumentContext readJson = parse(readResponse.getBody()); - assertThat(readJson.read("$.id", Long.class)).isEqualTo(id); - assertThat(readJson.read("$.projectId", Long.class)).isEqualTo(123L); - assertThat(readJson.read("$.userId", Long.class)).isEqualTo(456L); - assertThat(readJson.read("$.date", String.class)).isEqualTo("today"); - assertThat(readJson.read("$.hours", Long.class)).isEqualTo(8); - } - - @Test - public void testUpdate() throws Exception { - Long id = createTimeEntry(); - TimeEntry updatedTimeEntry = new TimeEntry(2, 3, "tomorrow", 9); - - - ResponseEntity updateResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.PUT, new HttpEntity<>(updatedTimeEntry, null), String.class); - - - assertThat(updateResponse.getStatusCode()).isEqualTo(HttpStatus.OK); - - DocumentContext updateJson = parse(updateResponse.getBody()); - assertThat(updateJson.read("$.id", Long.class)).isEqualTo(id); - assertThat(updateJson.read("$.projectId", Long.class)).isEqualTo(2L); - assertThat(updateJson.read("$.userId", Long.class)).isEqualTo(3L); - assertThat(updateJson.read("$.date", String.class)).isEqualTo("tomorrow"); - assertThat(updateJson.read("$.hours", Long.class)).isEqualTo(9); - } - - @Test - public void testDelete() throws Exception { - Long id = createTimeEntry(); - - - ResponseEntity deleteResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.DELETE, null, String.class); - - - assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); - - ResponseEntity deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); - assertThat(deletedReadResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - } - - private Long createTimeEntry() { - return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry.class).getId(); - } -} diff --git a/src/test/kotlin/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.kt new file mode 100644 index 000000000..f2808b835 --- /dev/null +++ b/src/test/kotlin/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.kt @@ -0,0 +1,68 @@ +package test.pivotal.pal.tracker + +import io.pivotal.pal.tracker.InMemoryTimeEntryRepository +import io.pivotal.pal.tracker.TimeEntry +import org.assertj.core.api.Assertions.assertThat +import org.junit.Test +import java.util.Arrays.asList + +class InMemoryTimeEntryRepositoryTest { + + @Test + fun create() { + val repo = InMemoryTimeEntryRepository() + val createdTimeEntry = repo.create(TimeEntry(123, 456, "today", 8)) + + val expected = TimeEntry(1L, 123, 456, "today", 8) + assertThat(createdTimeEntry).isEqualTo(expected) + + val readEntry = repo.find(createdTimeEntry.id!!) + assertThat(readEntry).isEqualTo(expected) + } + + @Test + fun find() { + val repo = InMemoryTimeEntryRepository() + repo.create(TimeEntry(123, 456, "today", 8)) + + val expected = TimeEntry(1L, 123, 456, "today", 8) + val readEntry = repo.find(1L) + assertThat(readEntry).isEqualTo(expected) + } + + @Test + fun list() { + val repo = InMemoryTimeEntryRepository() + repo.create(TimeEntry(123, 456, "today", 8)) + repo.create(TimeEntry(789, 654, "yesterday", 4)) + + val expected = asList( + TimeEntry(1L, 123, 456, "today", 8), + TimeEntry(2L, 789, 654, "yesterday", 4) + ) + assertThat(repo.list()).isEqualTo(expected) + } + + @Test + fun update() { + val repo = InMemoryTimeEntryRepository() + val (id) = repo.create(TimeEntry(123, 456, "today", 8)) + + val updatedEntry = repo.update( + id!!, + TimeEntry(321, 654, "tomorrow", 5)) + + val expected = TimeEntry(id, 321, 654, "tomorrow", 5) + assertThat(updatedEntry).isEqualTo(expected) + assertThat(repo.find(id)).isEqualTo(expected) + } + + @Test + fun delete() { + val repo = InMemoryTimeEntryRepository() + val (id) = repo.create(TimeEntry(123, 456, "today", 8)) + + repo.delete(id!!) + assertThat(repo.list()).isEmpty() + } +} diff --git a/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt new file mode 100644 index 000000000..b8fd7e283 --- /dev/null +++ b/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt @@ -0,0 +1,104 @@ +package test.pivotal.pal.tracker + +import com.nhaarman.mockito_kotlin.any +import com.nhaarman.mockito_kotlin.doReturn +import com.nhaarman.mockito_kotlin.eq +import com.nhaarman.mockito_kotlin.mock +import com.nhaarman.mockito_kotlin.verify +import io.pivotal.pal.tracker.TimeEntry +import io.pivotal.pal.tracker.TimeEntryController +import io.pivotal.pal.tracker.TimeEntryRepository +import org.assertj.core.api.Assertions.assertThat +import org.junit.Before +import org.junit.Test +import org.springframework.http.HttpStatus +import java.util.Arrays.asList + +class TimeEntryControllerTest { + + private lateinit var timeEntryRepository: TimeEntryRepository + private lateinit var controller: TimeEntryController + + @Before + fun setUp() { + timeEntryRepository = mock() + controller = TimeEntryController(timeEntryRepository) + } + + @Test + fun testCreate() { + val expected = TimeEntry(1L, 123, 456, "today", 8) + doReturn(expected) + .`when`(timeEntryRepository) + .create(any()) + + val response = controller.create(TimeEntry(123, 456, "today", 8)) + + assertThat(response.statusCode).isEqualTo(HttpStatus.CREATED) + assertThat(response.body).isEqualTo(expected) + } + + @Test + fun testRead() { + val expected = TimeEntry(1L, 123, 456, "today", 8) + doReturn(expected) + .`when`(timeEntryRepository) + .find(1L) + + val response = controller.read(1L) + assertThat(response.statusCode).isEqualTo(HttpStatus.OK) + assertThat(response.body).isEqualTo(expected) + } + + @Test + fun testRead_NotFound() { + doReturn(null) + .`when`(timeEntryRepository) + .find(1L) + + val response = controller.read(1L) + assertThat(response.statusCode).isEqualTo(HttpStatus.NOT_FOUND) + } + + @Test + fun testList() { + val expected = asList( + TimeEntry(1L, 123, 456, "today", 8), + TimeEntry(2L, 789, 321, "yesterday", 4) + ) + doReturn(expected).`when`(timeEntryRepository).list() + + val response = controller.list() + assertThat(response.statusCode).isEqualTo(HttpStatus.OK) + assertThat(response.body).isEqualTo(expected) + } + + @Test + fun testUpdate() { + val expected = TimeEntry(1L, 987, 654, "yesterday", 4) + doReturn(expected) + .`when`(timeEntryRepository) + .update(eq(1L), any()) + + val response = controller.update(1L, expected) + assertThat(response.statusCode).isEqualTo(HttpStatus.OK) + assertThat(response.body).isEqualTo(expected) + } + + @Test + fun testUpdate_NotFound() { + doReturn(null) + .`when`(timeEntryRepository) + .update(eq(1L), any()) + + val response = controller.update(1L, TimeEntry(1L, 123, 456, "today", 8)) + assertThat(response.statusCode).isEqualTo(HttpStatus.NOT_FOUND) + } + + @Test + fun testDelete() { + val response = controller.delete(1L) + verify(timeEntryRepository).delete(1L) + assertThat(response.statusCode).isEqualTo(HttpStatus.NO_CONTENT) + } +} diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt new file mode 100644 index 000000000..7321b38ed --- /dev/null +++ b/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt @@ -0,0 +1,105 @@ +package test.pivotal.pal.trackerapi + +import com.jayway.jsonpath.JsonPath.parse +import io.pivotal.pal.tracker.PalTrackerApplication +import io.pivotal.pal.tracker.TimeEntry +import org.assertj.core.api.Assertions.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.http.HttpEntity +import org.springframework.http.HttpMethod +import org.springframework.http.HttpStatus +import org.springframework.test.context.junit4.SpringRunner + +@RunWith(SpringRunner::class) +@SpringBootTest(classes = arrayOf(PalTrackerApplication::class), webEnvironment = RANDOM_PORT) +class TimeEntryApiTest { + + @Autowired + private lateinit var restTemplate: TestRestTemplate + + private val timeEntry = TimeEntry(123, 456, "today", 8) + + @Test + fun testCreate() { + val createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String::class.java) + + assertThat(createResponse.statusCode).isEqualTo(HttpStatus.CREATED) + + val createJson = parse(createResponse.body) + assertThat(createJson.read("$.id", Long::class.java)).isGreaterThan(0) + assertThat(createJson.read("$.projectId", Long::class.java)).isEqualTo(123L) + assertThat(createJson.read("$.userId", Long::class.java)).isEqualTo(456L) + assertThat(createJson.read("$.date", String::class.java)).isEqualTo("today") + assertThat(createJson.read("$.hours", Long::class.java)).isEqualTo(8) + } + + @Test + fun testList() { + val id = createTimeEntry() + + val listResponse = restTemplate.getForEntity("/time-entries", String::class.java) + + assertThat(listResponse.statusCode).isEqualTo(HttpStatus.OK) + + val listJson = parse(listResponse.body) + + val timeEntries = listJson.read("$[*]", Collection::class.java) + assertThat(timeEntries.size).isEqualTo(1) + + val readId = listJson.read("$[0].id", Long::class.java) + assertThat(readId).isEqualTo(id) + } + + @Test + fun testRead() { + val id = createTimeEntry() + + val readResponse = this.restTemplate.getForEntity("/time-entries/" + id!!, String::class.java) + + assertThat(readResponse.statusCode).isEqualTo(HttpStatus.OK) + val readJson = parse(readResponse.body) + assertThat(readJson.read("$.id", Long::class.java)).isEqualTo(id) + assertThat(readJson.read("$.projectId", Long::class.java)).isEqualTo(123L) + assertThat(readJson.read("$.userId", Long::class.java)).isEqualTo(456L) + assertThat(readJson.read("$.date", String::class.java)).isEqualTo("today") + assertThat(readJson.read("$.hours", Long::class.java)).isEqualTo(8) + } + + @Test + fun testUpdate() { + val id = createTimeEntry() + val updatedTimeEntry = TimeEntry(2, 3, "tomorrow", 9) + + val updateResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.PUT, HttpEntity(updatedTimeEntry, null), String::class.java) + + assertThat(updateResponse.statusCode).isEqualTo(HttpStatus.OK) + + val updateJson = parse(updateResponse.body) + assertThat(updateJson.read("$.id", Long::class.java)).isEqualTo(id) + assertThat(updateJson.read("$.projectId", Long::class.java)).isEqualTo(2L) + assertThat(updateJson.read("$.userId", Long::class.java)).isEqualTo(3L) + assertThat(updateJson.read("$.date", String::class.java)).isEqualTo("tomorrow") + assertThat(updateJson.read("$.hours", Long::class.java)).isEqualTo(9) + } + + @Test + fun testDelete() { + val id = createTimeEntry() + + val deleteResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.DELETE, null, String::class.java) + + assertThat(deleteResponse.statusCode).isEqualTo(HttpStatus.NO_CONTENT) + + val deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String::class.java) + assertThat(deletedReadResponse.statusCode).isEqualTo(HttpStatus.NOT_FOUND) + } + + private fun createTimeEntry(): Long? { + return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry::class.java).id + } +} From 0ca0c8af6ae933b3711f66deb198706d54970a8f Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Wed, 26 Jul 2017 11:45:04 -0600 Subject: [PATCH 19/29] Add tests for JDBC lab --- .../tracker/JdbcTimeEntryRepositoryTest.java | 154 ++++++++++++++++++ .../pal/trackerapi/TimeEntryApiTest.java | 131 +++++++++++++++ 2 files changed, 285 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java create mode 100644 src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java diff --git a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java new file mode 100644 index 000000000..b4aeb0bed --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java @@ -0,0 +1,154 @@ +package test.pivotal.pal.tracker; + + +import com.mysql.cj.jdbc.MysqlDataSource; +import io.pivotal.pal.tracker.JdbcTimeEntryRepository; +import io.pivotal.pal.tracker.TimeEntry; +import io.pivotal.pal.tracker.TimeEntryRepository; +import org.junit.Before; +import org.junit.Test; +import org.springframework.jdbc.core.JdbcTemplate; + +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; + +public class JdbcTimeEntryRepositoryTest { + private TimeEntryRepository subject; + private JdbcTemplate jdbcTemplate; + + @Before + public void setUp() throws Exception { + MysqlDataSource dataSource = new MysqlDataSource(); + dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); + + subject = new JdbcTimeEntryRepository(dataSource); + + jdbcTemplate = new JdbcTemplate(dataSource); + jdbcTemplate.execute("DELETE FROM time_entries"); + } + + @Test + public void createInsertsATimeEntryRecord() throws Exception { + TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); + TimeEntry entry = subject.create(newTimeEntry); + + Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry.getId()); + + assertThat(foundEntry.get("id")).isEqualTo(entry.getId()); + assertThat(foundEntry.get("project_id")).isEqualTo(123L); + assertThat(foundEntry.get("user_id")).isEqualTo(321L); + assertThat(foundEntry.get("date")).isEqualTo("today"); + assertThat(foundEntry.get("hours")).isEqualTo(8); + } + + @Test + public void createReturnsTheCreatedTimeEntry() throws Exception { + TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); + TimeEntry entry = subject.create(newTimeEntry); + + assertThat(entry.getId()).isNotNull(); + assertThat(entry.getProjectId()).isEqualTo(123); + assertThat(entry.getUserId()).isEqualTo(321); + assertThat(entry.getDate()).isEqualTo("today"); + assertThat(entry.getHours()).isEqualTo(8); + } + + @Test + public void findFindsATimeEntry() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (999, 123, 321, 'today', 8)" + ); + + TimeEntry timeEntry = subject.find(999L); + + assertThat(timeEntry.getId()).isEqualTo(999L); + assertThat(timeEntry.getProjectId()).isEqualTo(123L); + assertThat(timeEntry.getUserId()).isEqualTo(321L); + assertThat(timeEntry.getDate()).isEqualTo("today"); + assertThat(timeEntry.getHours()).isEqualTo(8); + } + + @Test + public void findReturnsNullWhenNotFound() throws Exception { + TimeEntry timeEntry = subject.find(999L); + + assertThat(timeEntry).isNull(); + } + + @Test + public void listFindsAllTimeEntries() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (999, 123, 321, 'today', 8), (888, 456, 678, 'yesterday', 9)" + ); + + List timeEntries = subject.list(); + assertThat(timeEntries.size()).isEqualTo(2); + + TimeEntry timeEntry = timeEntries.get(0); + assertThat(timeEntry.getId()).isEqualTo(888L); + assertThat(timeEntry.getProjectId()).isEqualTo(456L); + assertThat(timeEntry.getUserId()).isEqualTo(678L); + assertThat(timeEntry.getDate()).isEqualTo("yesterday"); + assertThat(timeEntry.getHours()).isEqualTo(9); + + timeEntry = timeEntries.get(1); + assertThat(timeEntry.getId()).isEqualTo(999L); + assertThat(timeEntry.getProjectId()).isEqualTo(123L); + assertThat(timeEntry.getUserId()).isEqualTo(321L); + assertThat(timeEntry.getDate()).isEqualTo("today"); + assertThat(timeEntry.getHours()).isEqualTo(8); + } + + @Test + public void updateReturnsTheUpdatedRecord() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (1000, 123, 321, 'today', 8)"); + + TimeEntry timeEntryUpdates = new TimeEntry(456, 987, "tomorrow", 10); + + TimeEntry updatedTimeEntry = subject.update(1000L, timeEntryUpdates); + + assertThat(updatedTimeEntry.getId()).isEqualTo(1000L); + assertThat(updatedTimeEntry.getProjectId()).isEqualTo(456L); + assertThat(updatedTimeEntry.getUserId()).isEqualTo(987L); + assertThat(updatedTimeEntry.getDate()).isEqualTo("tomorrow"); + assertThat(updatedTimeEntry.getHours()).isEqualTo(10); + } + + @Test + public void updateUpdatesTheRecord() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (1000, 123, 321, 'today', 8)"); + + TimeEntry updatedTimeEntry = new TimeEntry(456, 322, "tomorrow", 10); + + TimeEntry timeEntry = subject.update(1000L, updatedTimeEntry); + + Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", timeEntry.getId()); + + assertThat(foundEntry.get("id")).isEqualTo(timeEntry.getId()); + assertThat(foundEntry.get("project_id")).isEqualTo(456L); + assertThat(foundEntry.get("user_id")).isEqualTo(322L); + assertThat(foundEntry.get("date")).isEqualTo("tomorrow"); + assertThat(foundEntry.get("hours")).isEqualTo(10); + } + + @Test + public void deleteRemovesTheRecord() throws Exception { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + + "VALUES (999, 123, 321, 'today', 8)" + ); + + subject.delete(999L); + + Map foundEntry = jdbcTemplate.queryForMap("Select count(*) count from time_entries where id = ?", 999); + assertThat(foundEntry.get("count")).isEqualTo(0L); + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java new file mode 100644 index 000000000..a07c3fad8 --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java @@ -0,0 +1,131 @@ +package test.pivotal.pal.trackerapi; + +import com.jayway.jsonpath.DocumentContext; +import com.mysql.cj.jdbc.MysqlDataSource; +import io.pivotal.pal.tracker.PalTrackerApplication; +import io.pivotal.pal.tracker.TimeEntry; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.Collection; + +import static com.jayway.jsonpath.JsonPath.parse; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class TimeEntryApiTest { + + @Autowired + private TestRestTemplate restTemplate; + + private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); + + @Before + public void setUp() throws Exception { + MysqlDataSource dataSource = new MysqlDataSource(); + dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); + + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); + jdbcTemplate.execute("TRUNCATE time_entries"); + } + + @Test + public void testCreate() throws Exception { + ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); + + + assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED); + + DocumentContext createJson = parse(createResponse.getBody()); + assertThat(createJson.read("$.id", Long.class)).isGreaterThan(0); + assertThat(createJson.read("$.projectId", Long.class)).isEqualTo(123L); + assertThat(createJson.read("$.userId", Long.class)).isEqualTo(456L); + assertThat(createJson.read("$.date", String.class)).isEqualTo("today"); + assertThat(createJson.read("$.hours", Long.class)).isEqualTo(8); + } + + @Test + public void testList() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity listResponse = restTemplate.getForEntity("/time-entries", String.class); + + + assertThat(listResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext listJson = parse(listResponse.getBody()); + + Collection timeEntries = listJson.read("$[*]", Collection.class); + assertThat(timeEntries.size()).isEqualTo(1); + + Long readId = listJson.read("$[0].id", Long.class); + assertThat(readId).isEqualTo(id); + } + + @Test + public void testRead() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity readResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); + + + assertThat(readResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + DocumentContext readJson = parse(readResponse.getBody()); + assertThat(readJson.read("$.id", Long.class)).isEqualTo(id); + assertThat(readJson.read("$.projectId", Long.class)).isEqualTo(123L); + assertThat(readJson.read("$.userId", Long.class)).isEqualTo(456L); + assertThat(readJson.read("$.date", String.class)).isEqualTo("today"); + assertThat(readJson.read("$.hours", Long.class)).isEqualTo(8); + } + + @Test + public void testUpdate() throws Exception { + Long id = createTimeEntry(); + TimeEntry updatedTimeEntry = new TimeEntry(2, 3, "tomorrow", 9); + + + ResponseEntity updateResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.PUT, new HttpEntity<>(updatedTimeEntry, null), String.class); + + + assertThat(updateResponse.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext updateJson = parse(updateResponse.getBody()); + assertThat(updateJson.read("$.id", Long.class)).isEqualTo(id); + assertThat(updateJson.read("$.projectId", Long.class)).isEqualTo(2L); + assertThat(updateJson.read("$.userId", Long.class)).isEqualTo(3L); + assertThat(updateJson.read("$.date", String.class)).isEqualTo("tomorrow"); + assertThat(updateJson.read("$.hours", Long.class)).isEqualTo(9); + } + + @Test + public void testDelete() throws Exception { + Long id = createTimeEntry(); + + + ResponseEntity deleteResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.DELETE, null, String.class); + + + assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + + ResponseEntity deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); + assertThat(deletedReadResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); + } + + private Long createTimeEntry() { + return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry.class).getId(); + } +} From 1db7d1f524a5e3267b8df8e8bab4bae75c877d59 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Thu, 7 Sep 2017 12:44:48 +1000 Subject: [PATCH 20/29] jdbc rules --- build.gradle | 19 ++++ ci/build.yml | 21 +++- manifest-production.yml | 2 + manifest-review.yml | 2 + .../pal/tracker/JdbcTimeEntryRepository.kt | 81 ++++++++++++++ .../pal/tracker/PalTrackerApplication.kt | 6 +- .../pal/tracker/TimeEntryController.kt | 2 +- .../pal/tracker/TimeEntryRepository.kt | 2 +- .../pal/trackerapi/TimeEntryApiTest.kt | 105 ------------------ 9 files changed, 127 insertions(+), 113 deletions(-) create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt delete mode 100644 src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt diff --git a/build.gradle b/build.gradle index 64de00ed1..457dae6f4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import org.flywaydb.gradle.task.FlywayMigrateTask + buildscript { ext.kotlin_version = '1.1.4-3' } @@ -7,6 +9,7 @@ plugins { id 'org.springframework.boot' version '1.5.4.RELEASE' id 'org.jetbrains.kotlin.jvm' version '1.1.4-3' id 'org.jetbrains.kotlin.plugin.spring' version '1.1.4-3' + id "org.flywaydb.flyway" version "4.2.0" } repositories { @@ -28,15 +31,31 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile 'org.springframework.boot:spring-boot-starter-web' compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0' + compile 'org.springframework.boot:spring-boot-starter-jdbc' + compile 'mysql:mysql-connector-java:6.0.6' testCompile 'com.nhaarman:mockito-kotlin:1.5.0' testCompile 'org.springframework.boot:spring-boot-starter-test' } +def developmentDbUrl = "jdbc:mysql://localhost:3306/tracker_dev?user=tracker&useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false" bootRun.environment([ "WELCOME_MESSAGE": "hello", + "SPRING_DATASOURCE_URL": developmentDbUrl, ]) +def testDbUrl = "jdbc:mysql://localhost:3306/tracker_test?user=tracker&useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false" test.environment([ "WELCOME_MESSAGE": "Hello from test", + "SPRING_DATASOURCE_URL": testDbUrl, ]) +flyway { + url = developmentDbUrl + user = "tracker" + password = "" + locations = ["filesystem:databases/tracker/migrations"] +} + +task testMigrate(type: FlywayMigrateTask) { + url = testDbUrl +} diff --git a/ci/build.yml b/ci/build.yml index 4c72d2f54..b01d4da2d 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -18,6 +18,25 @@ run: args: - -exc - | + + function stop_mysql { + service mysql stop + } + trap stop_mysql EXIT + + export DEBIAN_FRONTEND="noninteractive" + + apt-get update + apt-get install -y software-properties-common + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db + apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 + add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.2/ubuntu trusty main' + + apt-get -y install mariadb-server + service mysql start + cd pal-tracker - ./gradlew -P version=$(cat ../version/number) build + + mysql -uroot < databases/tracker/create_databases.sql + ./gradlew -P version=$(cat ../version/number) testMigrate build cp build/libs/pal-tracker-*.jar ../build-output \ No newline at end of file diff --git a/manifest-production.yml b/manifest-production.yml index 56dd5cb9c..b0ff13496 100644 --- a/manifest-production.yml +++ b/manifest-production.yml @@ -3,3 +3,5 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar host: dl-pal-tracker + services: + - tracker-database diff --git a/manifest-review.yml b/manifest-review.yml index 25bdba914..f1f7fe419 100644 --- a/manifest-review.yml +++ b/manifest-review.yml @@ -3,3 +3,5 @@ applications: - name: pal-tracker path: build/libs/pal-tracker.jar host: dl-pal-tracker-review + services: + - tracker-database diff --git a/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt new file mode 100644 index 000000000..61e3bfb6e --- /dev/null +++ b/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt @@ -0,0 +1,81 @@ +package io.pivotal.pal.tracker + +import org.springframework.jdbc.core.JdbcTemplate +import org.springframework.jdbc.core.ResultSetExtractor +import org.springframework.jdbc.core.RowMapper +import org.springframework.jdbc.support.GeneratedKeyHolder +import org.springframework.stereotype.Component +import java.sql.ResultSet +import java.sql.Statement.RETURN_GENERATED_KEYS +import javax.sql.DataSource + +@Component +class JdbcTimeEntryRepository(dataSource: DataSource) : TimeEntryRepository { + + private val jdbcTemplate: JdbcTemplate = JdbcTemplate(dataSource) + + override fun create(timeEntry: TimeEntry): TimeEntry? { + val generatedKeyHolder = GeneratedKeyHolder() + + jdbcTemplate.update({ connection -> + val statement = connection.prepareStatement( + "INSERT INTO time_entries (project_id, user_id, date, hours) " + "VALUES (?, ?, ?, ?)", + RETURN_GENERATED_KEYS + ) + + statement.setLong(1, timeEntry.projectId) + statement.setLong(2, timeEntry.userId) + statement.setString(3, timeEntry.date) + statement.setInt(4, timeEntry.hours) + + statement + }, generatedKeyHolder) + + return find(generatedKeyHolder.key.toLong()) + } + + override fun find(id: Long): TimeEntry? { + return jdbcTemplate.query( + "SELECT id, project_id, user_id, date, hours FROM time_entries WHERE id = ?", + arrayOf(id), + TimeEntryExtractor()) + } + + override fun list(): List { + return jdbcTemplate.query("SELECT id, project_id, user_id, date, hours FROM time_entries", TimeEntryRowMapper()) + } + + override fun update(id: Long, timeEntry: TimeEntry): TimeEntry? { + jdbcTemplate.update("UPDATE time_entries " + + "SET project_id = ?, user_id = ?, date = ?, hours = ? " + + "WHERE id = ?", + timeEntry.projectId, + timeEntry.userId, + timeEntry.date, + timeEntry.hours, + id) + + return find(id) + } + + override fun delete(id: Long) { + jdbcTemplate.update("DELETE FROM time_entries WHERE id = ?", id) + } +} + +class TimeEntryRowMapper : RowMapper { + override fun mapRow(rs: ResultSet, rowNum: Int) = TimeEntry( + rs.getLong("id"), + rs.getLong("project_id"), + rs.getLong("user_id"), + rs.getString("date"), + rs.getInt("hours") + ) +} + +class TimeEntryExtractor : ResultSetExtractor { + override fun extractData(rs: ResultSet): TimeEntry? { + val mapper = TimeEntryRowMapper() + return if (rs.next()) mapper.mapRow(rs, 1) else null + } +} \ No newline at end of file diff --git a/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt b/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt index c0f9e6ca6..efa93dbef 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/PalTrackerApplication.kt @@ -2,13 +2,9 @@ package io.pivotal.pal.tracker import org.springframework.boot.SpringApplication import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.context.annotation.Bean @SpringBootApplication -class PalTrackerApplication { - @Bean - fun timeEntryRepository() = InMemoryTimeEntryRepository() -} +class PalTrackerApplication fun main(args: Array) { SpringApplication.run(PalTrackerApplication::class.java, *args) diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt index 38cec5441..84eb579cc 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt @@ -19,7 +19,7 @@ class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { fun create(@RequestBody timeEntry: TimeEntry): ResponseEntity { val createdTimeEntry = timeEntriesRepo.create(timeEntry) - return ResponseEntity(createdTimeEntry, HttpStatus.CREATED) + return ResponseEntity(createdTimeEntry!!, HttpStatus.CREATED) } @GetMapping("{id}") diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt index 142847da3..1e0bb07b9 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt @@ -1,7 +1,7 @@ package io.pivotal.pal.tracker interface TimeEntryRepository { - fun create(timeEntry: TimeEntry): TimeEntry + fun create(timeEntry: TimeEntry): TimeEntry? fun find(id: Long): TimeEntry? fun list(): List fun update(id: Long, timeEntry: TimeEntry): TimeEntry? diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt deleted file mode 100644 index 7321b38ed..000000000 --- a/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt +++ /dev/null @@ -1,105 +0,0 @@ -package test.pivotal.pal.trackerapi - -import com.jayway.jsonpath.JsonPath.parse -import io.pivotal.pal.tracker.PalTrackerApplication -import io.pivotal.pal.tracker.TimeEntry -import org.assertj.core.api.Assertions.assertThat -import org.junit.Test -import org.junit.runner.RunWith -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.web.client.TestRestTemplate -import org.springframework.http.HttpEntity -import org.springframework.http.HttpMethod -import org.springframework.http.HttpStatus -import org.springframework.test.context.junit4.SpringRunner - -@RunWith(SpringRunner::class) -@SpringBootTest(classes = arrayOf(PalTrackerApplication::class), webEnvironment = RANDOM_PORT) -class TimeEntryApiTest { - - @Autowired - private lateinit var restTemplate: TestRestTemplate - - private val timeEntry = TimeEntry(123, 456, "today", 8) - - @Test - fun testCreate() { - val createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String::class.java) - - assertThat(createResponse.statusCode).isEqualTo(HttpStatus.CREATED) - - val createJson = parse(createResponse.body) - assertThat(createJson.read("$.id", Long::class.java)).isGreaterThan(0) - assertThat(createJson.read("$.projectId", Long::class.java)).isEqualTo(123L) - assertThat(createJson.read("$.userId", Long::class.java)).isEqualTo(456L) - assertThat(createJson.read("$.date", String::class.java)).isEqualTo("today") - assertThat(createJson.read("$.hours", Long::class.java)).isEqualTo(8) - } - - @Test - fun testList() { - val id = createTimeEntry() - - val listResponse = restTemplate.getForEntity("/time-entries", String::class.java) - - assertThat(listResponse.statusCode).isEqualTo(HttpStatus.OK) - - val listJson = parse(listResponse.body) - - val timeEntries = listJson.read("$[*]", Collection::class.java) - assertThat(timeEntries.size).isEqualTo(1) - - val readId = listJson.read("$[0].id", Long::class.java) - assertThat(readId).isEqualTo(id) - } - - @Test - fun testRead() { - val id = createTimeEntry() - - val readResponse = this.restTemplate.getForEntity("/time-entries/" + id!!, String::class.java) - - assertThat(readResponse.statusCode).isEqualTo(HttpStatus.OK) - val readJson = parse(readResponse.body) - assertThat(readJson.read("$.id", Long::class.java)).isEqualTo(id) - assertThat(readJson.read("$.projectId", Long::class.java)).isEqualTo(123L) - assertThat(readJson.read("$.userId", Long::class.java)).isEqualTo(456L) - assertThat(readJson.read("$.date", String::class.java)).isEqualTo("today") - assertThat(readJson.read("$.hours", Long::class.java)).isEqualTo(8) - } - - @Test - fun testUpdate() { - val id = createTimeEntry() - val updatedTimeEntry = TimeEntry(2, 3, "tomorrow", 9) - - val updateResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.PUT, HttpEntity(updatedTimeEntry, null), String::class.java) - - assertThat(updateResponse.statusCode).isEqualTo(HttpStatus.OK) - - val updateJson = parse(updateResponse.body) - assertThat(updateJson.read("$.id", Long::class.java)).isEqualTo(id) - assertThat(updateJson.read("$.projectId", Long::class.java)).isEqualTo(2L) - assertThat(updateJson.read("$.userId", Long::class.java)).isEqualTo(3L) - assertThat(updateJson.read("$.date", String::class.java)).isEqualTo("tomorrow") - assertThat(updateJson.read("$.hours", Long::class.java)).isEqualTo(9) - } - - @Test - fun testDelete() { - val id = createTimeEntry() - - val deleteResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.DELETE, null, String::class.java) - - assertThat(deleteResponse.statusCode).isEqualTo(HttpStatus.NO_CONTENT) - - val deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String::class.java) - assertThat(deletedReadResponse.statusCode).isEqualTo(HttpStatus.NOT_FOUND) - } - - private fun createTimeEntry(): Long? { - return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry::class.java).id - } -} From e3997fb474c1ec98df6e2849d6ed74185ccc0e86 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Thu, 7 Sep 2017 12:56:53 +1000 Subject: [PATCH 21/29] kotlinise again --- .../tracker/JdbcTimeEntryRepositoryTest.java | 154 ------------------ .../tracker/JdbcTimeEntryRepositoryTest.kt | 147 +++++++++++++++++ .../pal/trackerapi/TimeEntryApiTest.java | 131 --------------- .../pal/trackerapi/TimeEntryApiTest.kt | 126 ++++++++++++++ 4 files changed, 273 insertions(+), 285 deletions(-) delete mode 100644 src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java create mode 100644 src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt delete mode 100644 src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java create mode 100644 src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt diff --git a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java deleted file mode 100644 index b4aeb0bed..000000000 --- a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.java +++ /dev/null @@ -1,154 +0,0 @@ -package test.pivotal.pal.tracker; - - -import com.mysql.cj.jdbc.MysqlDataSource; -import io.pivotal.pal.tracker.JdbcTimeEntryRepository; -import io.pivotal.pal.tracker.TimeEntry; -import io.pivotal.pal.tracker.TimeEntryRepository; -import org.junit.Before; -import org.junit.Test; -import org.springframework.jdbc.core.JdbcTemplate; - -import java.util.List; -import java.util.Map; - -import static org.assertj.core.api.Assertions.assertThat; - -public class JdbcTimeEntryRepositoryTest { - private TimeEntryRepository subject; - private JdbcTemplate jdbcTemplate; - - @Before - public void setUp() throws Exception { - MysqlDataSource dataSource = new MysqlDataSource(); - dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); - - subject = new JdbcTimeEntryRepository(dataSource); - - jdbcTemplate = new JdbcTemplate(dataSource); - jdbcTemplate.execute("DELETE FROM time_entries"); - } - - @Test - public void createInsertsATimeEntryRecord() throws Exception { - TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); - TimeEntry entry = subject.create(newTimeEntry); - - Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry.getId()); - - assertThat(foundEntry.get("id")).isEqualTo(entry.getId()); - assertThat(foundEntry.get("project_id")).isEqualTo(123L); - assertThat(foundEntry.get("user_id")).isEqualTo(321L); - assertThat(foundEntry.get("date")).isEqualTo("today"); - assertThat(foundEntry.get("hours")).isEqualTo(8); - } - - @Test - public void createReturnsTheCreatedTimeEntry() throws Exception { - TimeEntry newTimeEntry = new TimeEntry(123, 321, "today", 8); - TimeEntry entry = subject.create(newTimeEntry); - - assertThat(entry.getId()).isNotNull(); - assertThat(entry.getProjectId()).isEqualTo(123); - assertThat(entry.getUserId()).isEqualTo(321); - assertThat(entry.getDate()).isEqualTo("today"); - assertThat(entry.getHours()).isEqualTo(8); - } - - @Test - public void findFindsATimeEntry() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (999, 123, 321, 'today', 8)" - ); - - TimeEntry timeEntry = subject.find(999L); - - assertThat(timeEntry.getId()).isEqualTo(999L); - assertThat(timeEntry.getProjectId()).isEqualTo(123L); - assertThat(timeEntry.getUserId()).isEqualTo(321L); - assertThat(timeEntry.getDate()).isEqualTo("today"); - assertThat(timeEntry.getHours()).isEqualTo(8); - } - - @Test - public void findReturnsNullWhenNotFound() throws Exception { - TimeEntry timeEntry = subject.find(999L); - - assertThat(timeEntry).isNull(); - } - - @Test - public void listFindsAllTimeEntries() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (999, 123, 321, 'today', 8), (888, 456, 678, 'yesterday', 9)" - ); - - List timeEntries = subject.list(); - assertThat(timeEntries.size()).isEqualTo(2); - - TimeEntry timeEntry = timeEntries.get(0); - assertThat(timeEntry.getId()).isEqualTo(888L); - assertThat(timeEntry.getProjectId()).isEqualTo(456L); - assertThat(timeEntry.getUserId()).isEqualTo(678L); - assertThat(timeEntry.getDate()).isEqualTo("yesterday"); - assertThat(timeEntry.getHours()).isEqualTo(9); - - timeEntry = timeEntries.get(1); - assertThat(timeEntry.getId()).isEqualTo(999L); - assertThat(timeEntry.getProjectId()).isEqualTo(123L); - assertThat(timeEntry.getUserId()).isEqualTo(321L); - assertThat(timeEntry.getDate()).isEqualTo("today"); - assertThat(timeEntry.getHours()).isEqualTo(8); - } - - @Test - public void updateReturnsTheUpdatedRecord() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (1000, 123, 321, 'today', 8)"); - - TimeEntry timeEntryUpdates = new TimeEntry(456, 987, "tomorrow", 10); - - TimeEntry updatedTimeEntry = subject.update(1000L, timeEntryUpdates); - - assertThat(updatedTimeEntry.getId()).isEqualTo(1000L); - assertThat(updatedTimeEntry.getProjectId()).isEqualTo(456L); - assertThat(updatedTimeEntry.getUserId()).isEqualTo(987L); - assertThat(updatedTimeEntry.getDate()).isEqualTo("tomorrow"); - assertThat(updatedTimeEntry.getHours()).isEqualTo(10); - } - - @Test - public void updateUpdatesTheRecord() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (1000, 123, 321, 'today', 8)"); - - TimeEntry updatedTimeEntry = new TimeEntry(456, 322, "tomorrow", 10); - - TimeEntry timeEntry = subject.update(1000L, updatedTimeEntry); - - Map foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", timeEntry.getId()); - - assertThat(foundEntry.get("id")).isEqualTo(timeEntry.getId()); - assertThat(foundEntry.get("project_id")).isEqualTo(456L); - assertThat(foundEntry.get("user_id")).isEqualTo(322L); - assertThat(foundEntry.get("date")).isEqualTo("tomorrow"); - assertThat(foundEntry.get("hours")).isEqualTo(10); - } - - @Test - public void deleteRemovesTheRecord() throws Exception { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + - "VALUES (999, 123, 321, 'today', 8)" - ); - - subject.delete(999L); - - Map foundEntry = jdbcTemplate.queryForMap("Select count(*) count from time_entries where id = ?", 999); - assertThat(foundEntry.get("count")).isEqualTo(0L); - } -} diff --git a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt new file mode 100644 index 000000000..55f004a9d --- /dev/null +++ b/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt @@ -0,0 +1,147 @@ +package test.pivotal.pal.tracker + + +import com.mysql.cj.jdbc.MysqlDataSource +import io.pivotal.pal.tracker.JdbcTimeEntryRepository +import io.pivotal.pal.tracker.TimeEntry +import io.pivotal.pal.tracker.TimeEntryRepository +import org.assertj.core.api.Assertions.assertThat +import org.junit.Before +import org.junit.Test +import org.springframework.jdbc.core.JdbcTemplate + +class JdbcTimeEntryRepositoryTest { + + private lateinit var subject: TimeEntryRepository + private lateinit var jdbcTemplate: JdbcTemplate + + @Before + fun setUp() { + val dataSource = MysqlDataSource() + dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")) + + subject = JdbcTimeEntryRepository(dataSource) + + jdbcTemplate = JdbcTemplate(dataSource) + jdbcTemplate.execute("DELETE FROM time_entries") + } + + @Test + fun createInsertsATimeEntryRecord() { + val newTimeEntry = TimeEntry(123, 321, "today", 8) + val entry = subject.create(newTimeEntry) + + val foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry!!.id) + + assertThat(foundEntry["id"]).isEqualTo(entry.id) + assertThat(foundEntry["project_id"]).isEqualTo(123L) + assertThat(foundEntry["user_id"]).isEqualTo(321L) + assertThat(foundEntry["date"]).isEqualTo("today") + assertThat(foundEntry["hours"]).isEqualTo(8) + } + + @Test + fun createReturnsTheCreatedTimeEntry() { + val newTimeEntry = TimeEntry(123, 321, "today", 8) + val entry = subject.create(newTimeEntry) + + assertThat(entry!!.id).isNotNull() + assertThat(entry.projectId).isEqualTo(123) + assertThat(entry.userId).isEqualTo(321) + assertThat(entry.date).isEqualTo("today") + assertThat(entry.hours).isEqualTo(8) + } + + @Test + fun findFindsATimeEntry() { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (999, 123, 321, 'today', 8)" + ) + + val timeEntry = subject.find(999L) + + assertThat(timeEntry!!.id).isEqualTo(999L) + assertThat(timeEntry.projectId).isEqualTo(123L) + assertThat(timeEntry.userId).isEqualTo(321L) + assertThat(timeEntry.date).isEqualTo("today") + assertThat(timeEntry.hours).isEqualTo(8) + } + + @Test + fun findReturnsNullWhenNotFound() { + val timeEntry = subject.find(999L) + + assertThat(timeEntry).isNull() + } + + @Test + fun listFindsAllTimeEntries() { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (999, 123, 321, 'today', 8), (888, 456, 678, 'yesterday', 9)" + ) + + val timeEntries = subject.list() + assertThat(timeEntries.size).isEqualTo(2) + + var timeEntry = timeEntries[0] + assertThat(timeEntry.id).isEqualTo(888L) + assertThat(timeEntry.projectId).isEqualTo(456L) + assertThat(timeEntry.userId).isEqualTo(678L) + assertThat(timeEntry.date).isEqualTo("yesterday") + assertThat(timeEntry.hours).isEqualTo(9) + + timeEntry = timeEntries[1] + assertThat(timeEntry.id).isEqualTo(999L) + assertThat(timeEntry.projectId).isEqualTo(123L) + assertThat(timeEntry.userId).isEqualTo(321L) + assertThat(timeEntry.date).isEqualTo("today") + assertThat(timeEntry.hours).isEqualTo(8) + } + + @Test + fun updateReturnsTheUpdatedRecord() { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (1000, 123, 321, 'today', 8)") + + val timeEntryUpdates = TimeEntry(456, 987, "tomorrow", 10) + + val updatedTimeEntry = subject.update(1000L, timeEntryUpdates) + + assertThat(updatedTimeEntry!!.id).isEqualTo(1000L) + assertThat(updatedTimeEntry.projectId).isEqualTo(456L) + assertThat(updatedTimeEntry.userId).isEqualTo(987L) + assertThat(updatedTimeEntry.date).isEqualTo("tomorrow") + assertThat(updatedTimeEntry.hours).isEqualTo(10) + } + + @Test + fun updateUpdatesTheRecord() { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (1000, 123, 321, 'today', 8)") + + val updatedTimeEntry = TimeEntry(456, 322, "tomorrow", 10) + + val timeEntry = subject.update(1000L, updatedTimeEntry) + + val foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", timeEntry!!.id) + + assertThat(foundEntry["id"]).isEqualTo(timeEntry.id) + assertThat(foundEntry["project_id"]).isEqualTo(456L) + assertThat(foundEntry["user_id"]).isEqualTo(322L) + assertThat(foundEntry["date"]).isEqualTo("tomorrow") + assertThat(foundEntry["hours"]).isEqualTo(10) + } + + @Test + @Throws(Exception::class) + fun deleteRemovesTheRecord() { + jdbcTemplate.execute( + "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (999, 123, 321, 'today', 8)" + ) + + subject.delete(999L) + + val foundEntry = jdbcTemplate.queryForMap("Select count(*) count from time_entries where id = ?", 999) + assertThat(foundEntry["count"]).isEqualTo(0L) + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java deleted file mode 100644 index a07c3fad8..000000000 --- a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.java +++ /dev/null @@ -1,131 +0,0 @@ -package test.pivotal.pal.trackerapi; - -import com.jayway.jsonpath.DocumentContext; -import com.mysql.cj.jdbc.MysqlDataSource; -import io.pivotal.pal.tracker.PalTrackerApplication; -import io.pivotal.pal.tracker.TimeEntry; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.Collection; - -import static com.jayway.jsonpath.JsonPath.parse; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) -public class TimeEntryApiTest { - - @Autowired - private TestRestTemplate restTemplate; - - private TimeEntry timeEntry = new TimeEntry(123, 456, "today", 8); - - @Before - public void setUp() throws Exception { - MysqlDataSource dataSource = new MysqlDataSource(); - dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")); - - JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); - jdbcTemplate.execute("TRUNCATE time_entries"); - } - - @Test - public void testCreate() throws Exception { - ResponseEntity createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String.class); - - - assertThat(createResponse.getStatusCode()).isEqualTo(HttpStatus.CREATED); - - DocumentContext createJson = parse(createResponse.getBody()); - assertThat(createJson.read("$.id", Long.class)).isGreaterThan(0); - assertThat(createJson.read("$.projectId", Long.class)).isEqualTo(123L); - assertThat(createJson.read("$.userId", Long.class)).isEqualTo(456L); - assertThat(createJson.read("$.date", String.class)).isEqualTo("today"); - assertThat(createJson.read("$.hours", Long.class)).isEqualTo(8); - } - - @Test - public void testList() throws Exception { - Long id = createTimeEntry(); - - - ResponseEntity listResponse = restTemplate.getForEntity("/time-entries", String.class); - - - assertThat(listResponse.getStatusCode()).isEqualTo(HttpStatus.OK); - - DocumentContext listJson = parse(listResponse.getBody()); - - Collection timeEntries = listJson.read("$[*]", Collection.class); - assertThat(timeEntries.size()).isEqualTo(1); - - Long readId = listJson.read("$[0].id", Long.class); - assertThat(readId).isEqualTo(id); - } - - @Test - public void testRead() throws Exception { - Long id = createTimeEntry(); - - - ResponseEntity readResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); - - - assertThat(readResponse.getStatusCode()).isEqualTo(HttpStatus.OK); - DocumentContext readJson = parse(readResponse.getBody()); - assertThat(readJson.read("$.id", Long.class)).isEqualTo(id); - assertThat(readJson.read("$.projectId", Long.class)).isEqualTo(123L); - assertThat(readJson.read("$.userId", Long.class)).isEqualTo(456L); - assertThat(readJson.read("$.date", String.class)).isEqualTo("today"); - assertThat(readJson.read("$.hours", Long.class)).isEqualTo(8); - } - - @Test - public void testUpdate() throws Exception { - Long id = createTimeEntry(); - TimeEntry updatedTimeEntry = new TimeEntry(2, 3, "tomorrow", 9); - - - ResponseEntity updateResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.PUT, new HttpEntity<>(updatedTimeEntry, null), String.class); - - - assertThat(updateResponse.getStatusCode()).isEqualTo(HttpStatus.OK); - - DocumentContext updateJson = parse(updateResponse.getBody()); - assertThat(updateJson.read("$.id", Long.class)).isEqualTo(id); - assertThat(updateJson.read("$.projectId", Long.class)).isEqualTo(2L); - assertThat(updateJson.read("$.userId", Long.class)).isEqualTo(3L); - assertThat(updateJson.read("$.date", String.class)).isEqualTo("tomorrow"); - assertThat(updateJson.read("$.hours", Long.class)).isEqualTo(9); - } - - @Test - public void testDelete() throws Exception { - Long id = createTimeEntry(); - - - ResponseEntity deleteResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.DELETE, null, String.class); - - - assertThat(deleteResponse.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); - - ResponseEntity deletedReadResponse = this.restTemplate.getForEntity("/time-entries/" + id, String.class); - assertThat(deletedReadResponse.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - } - - private Long createTimeEntry() { - return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry.class).getId(); - } -} diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt new file mode 100644 index 000000000..76813d20d --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt @@ -0,0 +1,126 @@ +package test.pivotal.pal.trackerapi + +import com.jayway.jsonpath.JsonPath.parse +import com.mysql.cj.jdbc.MysqlDataSource +import io.pivotal.pal.tracker.PalTrackerApplication +import io.pivotal.pal.tracker.TimeEntry +import org.assertj.core.api.Assertions.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.http.HttpEntity +import org.springframework.http.HttpMethod +import org.springframework.http.HttpStatus +import org.springframework.jdbc.core.JdbcTemplate +import org.springframework.test.context.junit4.SpringRunner + +@RunWith(SpringRunner::class) +@SpringBootTest(classes = arrayOf(PalTrackerApplication::class), webEnvironment = RANDOM_PORT) +class TimeEntryApiTest { + + @Autowired + private lateinit var restTemplate: TestRestTemplate + + private val timeEntry = TimeEntry(123, 456, "today", 8) + + @Before + fun setUp() { + val dataSource = MysqlDataSource() + dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")) + + val jdbcTemplate = JdbcTemplate(dataSource) + jdbcTemplate.execute("TRUNCATE time_entries") + } + + @Test + fun testCreate() { + val createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String::class.java) + + + assertThat(createResponse.statusCode).isEqualTo(HttpStatus.CREATED) + + val createJson = parse(createResponse.body) + assertThat(createJson.read("$.id", Long::class.java)).isGreaterThan(0) + assertThat(createJson.read("$.projectId", Long::class.java)).isEqualTo(123L) + assertThat(createJson.read("$.userId", Long::class.java)).isEqualTo(456L) + assertThat(createJson.read("$.date", String::class.java)).isEqualTo("today") + assertThat(createJson.read("$.hours", Long::class.java)).isEqualTo(8) + } + + @Test + fun testList() { + val id = createTimeEntry() + + + val listResponse = restTemplate.getForEntity("/time-entries", String::class.java) + + + assertThat(listResponse.statusCode).isEqualTo(HttpStatus.OK) + + val listJson = parse(listResponse.body) + + val timeEntries = listJson.read("$[*]", Collection::class.java) + assertThat(timeEntries.size).isEqualTo(1) + + val readId = listJson.read("$[0].id", Long::class.java) + assertThat(readId).isEqualTo(id) + } + + @Test + fun testRead() { + val id = createTimeEntry() + + + val readResponse = this.restTemplate.getForEntity("/time-entries/" + id!!, String::class.java) + + + assertThat(readResponse.statusCode).isEqualTo(HttpStatus.OK) + val readJson = parse(readResponse.body) + assertThat(readJson.read("$.id", Long::class.java)).isEqualTo(id) + assertThat(readJson.read("$.projectId", Long::class.java)).isEqualTo(123L) + assertThat(readJson.read("$.userId", Long::class.java)).isEqualTo(456L) + assertThat(readJson.read("$.date", String::class.java)).isEqualTo("today") + assertThat(readJson.read("$.hours", Long::class.java)).isEqualTo(8) + } + + @Test + fun testUpdate() { + val id = createTimeEntry() + val updatedTimeEntry = TimeEntry(2, 3, "tomorrow", 9) + + + val updateResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.PUT, HttpEntity(updatedTimeEntry, null), String::class.java) + + + assertThat(updateResponse.statusCode).isEqualTo(HttpStatus.OK) + + val updateJson = parse(updateResponse.body) + assertThat(updateJson.read("$.id", Long::class.java)).isEqualTo(id) + assertThat(updateJson.read("$.projectId", Long::class.java)).isEqualTo(2L) + assertThat(updateJson.read("$.userId", Long::class.java)).isEqualTo(3L) + assertThat(updateJson.read("$.date", String::class.java)).isEqualTo("tomorrow") + assertThat(updateJson.read("$.hours", Long::class.java)).isEqualTo(9) + } + + @Test + fun testDelete() { + val id = createTimeEntry() + + + val deleteResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.DELETE, null, String::class.java) + + + assertThat(deleteResponse.statusCode).isEqualTo(HttpStatus.NO_CONTENT) + + val deletedReadResponse = restTemplate.getForEntity("/time-entries/" + id, String::class.java) + assertThat(deletedReadResponse.statusCode).isEqualTo(HttpStatus.NOT_FOUND) + } + + private fun createTimeEntry(): Long? { + return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry::class.java).id + } +} From b236647b54fd04e8807733fb6513b5fe24b8f530 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Sun, 10 Sep 2017 21:56:16 +1000 Subject: [PATCH 22/29] a bit of a cleanup --- .../tracker/InMemoryTimeEntryRepository.kt | 14 ++--- .../pal/tracker/JdbcTimeEntryRepository.kt | 57 ++++++++----------- .../pal/tracker/TimeEntryController.kt | 6 +- .../pal/tracker/TimeEntryRepository.kt | 2 +- .../tracker/JdbcTimeEntryRepositoryTest.kt | 5 +- .../pal/trackerapi/TimeEntryApiTest.kt | 14 +---- 6 files changed, 38 insertions(+), 60 deletions(-) rename src/test/{java => kotlin}/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt (97%) rename src/test/{java => kotlin}/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt (96%) diff --git a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt index a74a33969..ffd77708f 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt @@ -1,22 +1,22 @@ package io.pivotal.pal.tracker -import java.util.ArrayList import java.util.HashMap class InMemoryTimeEntryRepository : TimeEntryRepository { private val timeEntries = HashMap() + override fun find(id: Long) = timeEntries[id] + + override fun list() = timeEntries.values.toList() + override fun create(timeEntry: TimeEntry): TimeEntry { - val updatedTimeEntry = timeEntry.copy(id = (timeEntries.size + 1).toLong()) - timeEntries[updatedTimeEntry.id!!] = updatedTimeEntry + val nextId = (timeEntries.size + 1).toLong() + val updatedTimeEntry = timeEntry.copy(id = nextId) + timeEntries[nextId] = updatedTimeEntry return updatedTimeEntry } - override fun find(id: Long) = timeEntries[id] - - override fun list() = ArrayList(timeEntries.values) - override fun update(id: Long, timeEntry: TimeEntry): TimeEntry? { val updatedTimeEntry = timeEntry.copy(id = id) timeEntries.replace(id, updatedTimeEntry) diff --git a/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt index 61e3bfb6e..aae80694d 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt @@ -1,8 +1,6 @@ package io.pivotal.pal.tracker import org.springframework.jdbc.core.JdbcTemplate -import org.springframework.jdbc.core.ResultSetExtractor -import org.springframework.jdbc.core.RowMapper import org.springframework.jdbc.support.GeneratedKeyHolder import org.springframework.stereotype.Component import java.sql.ResultSet @@ -14,7 +12,30 @@ class JdbcTimeEntryRepository(dataSource: DataSource) : TimeEntryRepository { private val jdbcTemplate: JdbcTemplate = JdbcTemplate(dataSource) - override fun create(timeEntry: TimeEntry): TimeEntry? { + private val timeEntryRowMapper = { rs: ResultSet, _: Int -> + TimeEntry( + rs.getLong("id"), + rs.getLong("project_id"), + rs.getLong("user_id"), + rs.getString("date"), + rs.getInt("hours") + ) + } + + private val timeEntryExtractor = { rs: ResultSet -> + if (rs.next()) timeEntryRowMapper(rs, 1) else null + } + + override fun find(id: Long) = jdbcTemplate.query( + "SELECT id, project_id, user_id, date, hours FROM time_entries WHERE id = ?", + arrayOf(id), + timeEntryExtractor) + + override fun list() = jdbcTemplate.query( + "SELECT id, project_id, user_id, date, hours FROM time_entries", + timeEntryRowMapper) + + override fun create(timeEntry: TimeEntry): TimeEntry { val generatedKeyHolder = GeneratedKeyHolder() jdbcTemplate.update({ connection -> @@ -31,18 +52,7 @@ class JdbcTimeEntryRepository(dataSource: DataSource) : TimeEntryRepository { statement }, generatedKeyHolder) - return find(generatedKeyHolder.key.toLong()) - } - - override fun find(id: Long): TimeEntry? { - return jdbcTemplate.query( - "SELECT id, project_id, user_id, date, hours FROM time_entries WHERE id = ?", - arrayOf(id), - TimeEntryExtractor()) - } - - override fun list(): List { - return jdbcTemplate.query("SELECT id, project_id, user_id, date, hours FROM time_entries", TimeEntryRowMapper()) + return find(generatedKeyHolder.key.toLong())!! } override fun update(id: Long, timeEntry: TimeEntry): TimeEntry? { @@ -62,20 +72,3 @@ class JdbcTimeEntryRepository(dataSource: DataSource) : TimeEntryRepository { jdbcTemplate.update("DELETE FROM time_entries WHERE id = ?", id) } } - -class TimeEntryRowMapper : RowMapper { - override fun mapRow(rs: ResultSet, rowNum: Int) = TimeEntry( - rs.getLong("id"), - rs.getLong("project_id"), - rs.getLong("user_id"), - rs.getString("date"), - rs.getInt("hours") - ) -} - -class TimeEntryExtractor : ResultSetExtractor { - override fun extractData(rs: ResultSet): TimeEntry? { - val mapper = TimeEntryRowMapper() - return if (rs.next()) mapper.mapRow(rs, 1) else null - } -} \ No newline at end of file diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt index 84eb579cc..0eb7c7488 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt @@ -16,11 +16,7 @@ import org.springframework.web.bind.annotation.RestController class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { @PostMapping - fun create(@RequestBody timeEntry: TimeEntry): ResponseEntity { - val createdTimeEntry = timeEntriesRepo.create(timeEntry) - - return ResponseEntity(createdTimeEntry!!, HttpStatus.CREATED) - } + fun create(@RequestBody timeEntry: TimeEntry) = ResponseEntity(timeEntriesRepo.create(timeEntry), HttpStatus.CREATED) @GetMapping("{id}") fun read(@PathVariable id: Long): ResponseEntity { diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt index 1e0bb07b9..5449c51a4 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt @@ -1,9 +1,9 @@ package io.pivotal.pal.tracker interface TimeEntryRepository { - fun create(timeEntry: TimeEntry): TimeEntry? fun find(id: Long): TimeEntry? fun list(): List + fun create(timeEntry: TimeEntry): TimeEntry fun update(id: Long, timeEntry: TimeEntry): TimeEntry? fun delete(id: Long) } \ No newline at end of file diff --git a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt similarity index 97% rename from src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt rename to src/test/kotlin/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt index 55f004a9d..02682ac96 100644 --- a/src/test/java/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt +++ b/src/test/kotlin/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt @@ -31,7 +31,7 @@ class JdbcTimeEntryRepositoryTest { val newTimeEntry = TimeEntry(123, 321, "today", 8) val entry = subject.create(newTimeEntry) - val foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry!!.id) + val foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry.id) assertThat(foundEntry["id"]).isEqualTo(entry.id) assertThat(foundEntry["project_id"]).isEqualTo(123L) @@ -45,7 +45,7 @@ class JdbcTimeEntryRepositoryTest { val newTimeEntry = TimeEntry(123, 321, "today", 8) val entry = subject.create(newTimeEntry) - assertThat(entry!!.id).isNotNull() + assertThat(entry.id).isNotNull() assertThat(entry.projectId).isEqualTo(123) assertThat(entry.userId).isEqualTo(321) assertThat(entry.date).isEqualTo("today") @@ -133,7 +133,6 @@ class JdbcTimeEntryRepositoryTest { } @Test - @Throws(Exception::class) fun deleteRemovesTheRecord() { jdbcTemplate.execute( "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (999, 123, 321, 'today', 8)" diff --git a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt similarity index 96% rename from src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt rename to src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt index 76813d20d..af7f5749b 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt +++ b/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt @@ -40,7 +40,6 @@ class TimeEntryApiTest { fun testCreate() { val createResponse = restTemplate.postForEntity("/time-entries", timeEntry, String::class.java) - assertThat(createResponse.statusCode).isEqualTo(HttpStatus.CREATED) val createJson = parse(createResponse.body) @@ -55,10 +54,8 @@ class TimeEntryApiTest { fun testList() { val id = createTimeEntry() - val listResponse = restTemplate.getForEntity("/time-entries", String::class.java) - assertThat(listResponse.statusCode).isEqualTo(HttpStatus.OK) val listJson = parse(listResponse.body) @@ -74,10 +71,8 @@ class TimeEntryApiTest { fun testRead() { val id = createTimeEntry() - val readResponse = this.restTemplate.getForEntity("/time-entries/" + id!!, String::class.java) - assertThat(readResponse.statusCode).isEqualTo(HttpStatus.OK) val readJson = parse(readResponse.body) assertThat(readJson.read("$.id", Long::class.java)).isEqualTo(id) @@ -92,10 +87,8 @@ class TimeEntryApiTest { val id = createTimeEntry() val updatedTimeEntry = TimeEntry(2, 3, "tomorrow", 9) - val updateResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.PUT, HttpEntity(updatedTimeEntry, null), String::class.java) - assertThat(updateResponse.statusCode).isEqualTo(HttpStatus.OK) val updateJson = parse(updateResponse.body) @@ -110,17 +103,14 @@ class TimeEntryApiTest { fun testDelete() { val id = createTimeEntry() - val deleteResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.DELETE, null, String::class.java) - assertThat(deleteResponse.statusCode).isEqualTo(HttpStatus.NO_CONTENT) val deletedReadResponse = restTemplate.getForEntity("/time-entries/" + id, String::class.java) assertThat(deletedReadResponse.statusCode).isEqualTo(HttpStatus.NOT_FOUND) } - private fun createTimeEntry(): Long? { - return restTemplate.postForObject("/time-entries", timeEntry, TimeEntry::class.java).id - } + private fun createTimeEntry() = + restTemplate.postForObject("/time-entries", timeEntry, TimeEntry::class.java).id } From 8d02373c568d4c1b8b1bb7bb1e24904f9e95a990 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Sun, 10 Sep 2017 21:57:44 +1000 Subject: [PATCH 23/29] Remove unused in memory repo --- .../tracker/InMemoryTimeEntryRepository.kt | 29 -------- .../InMemoryTimeEntryRepositoryTest.kt | 68 ------------------- 2 files changed, 97 deletions(-) delete mode 100644 src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt delete mode 100644 src/test/kotlin/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.kt diff --git a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt deleted file mode 100644 index ffd77708f..000000000 --- a/src/main/kotlin/io/pivotal/pal/tracker/InMemoryTimeEntryRepository.kt +++ /dev/null @@ -1,29 +0,0 @@ -package io.pivotal.pal.tracker - -import java.util.HashMap - -class InMemoryTimeEntryRepository : TimeEntryRepository { - - private val timeEntries = HashMap() - - override fun find(id: Long) = timeEntries[id] - - override fun list() = timeEntries.values.toList() - - override fun create(timeEntry: TimeEntry): TimeEntry { - val nextId = (timeEntries.size + 1).toLong() - val updatedTimeEntry = timeEntry.copy(id = nextId) - timeEntries[nextId] = updatedTimeEntry - return updatedTimeEntry - } - - override fun update(id: Long, timeEntry: TimeEntry): TimeEntry? { - val updatedTimeEntry = timeEntry.copy(id = id) - timeEntries.replace(id, updatedTimeEntry) - return updatedTimeEntry - } - - override fun delete(id: Long) { - timeEntries.remove(id) - } -} diff --git a/src/test/kotlin/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.kt deleted file mode 100644 index f2808b835..000000000 --- a/src/test/kotlin/test/pivotal/pal/tracker/InMemoryTimeEntryRepositoryTest.kt +++ /dev/null @@ -1,68 +0,0 @@ -package test.pivotal.pal.tracker - -import io.pivotal.pal.tracker.InMemoryTimeEntryRepository -import io.pivotal.pal.tracker.TimeEntry -import org.assertj.core.api.Assertions.assertThat -import org.junit.Test -import java.util.Arrays.asList - -class InMemoryTimeEntryRepositoryTest { - - @Test - fun create() { - val repo = InMemoryTimeEntryRepository() - val createdTimeEntry = repo.create(TimeEntry(123, 456, "today", 8)) - - val expected = TimeEntry(1L, 123, 456, "today", 8) - assertThat(createdTimeEntry).isEqualTo(expected) - - val readEntry = repo.find(createdTimeEntry.id!!) - assertThat(readEntry).isEqualTo(expected) - } - - @Test - fun find() { - val repo = InMemoryTimeEntryRepository() - repo.create(TimeEntry(123, 456, "today", 8)) - - val expected = TimeEntry(1L, 123, 456, "today", 8) - val readEntry = repo.find(1L) - assertThat(readEntry).isEqualTo(expected) - } - - @Test - fun list() { - val repo = InMemoryTimeEntryRepository() - repo.create(TimeEntry(123, 456, "today", 8)) - repo.create(TimeEntry(789, 654, "yesterday", 4)) - - val expected = asList( - TimeEntry(1L, 123, 456, "today", 8), - TimeEntry(2L, 789, 654, "yesterday", 4) - ) - assertThat(repo.list()).isEqualTo(expected) - } - - @Test - fun update() { - val repo = InMemoryTimeEntryRepository() - val (id) = repo.create(TimeEntry(123, 456, "today", 8)) - - val updatedEntry = repo.update( - id!!, - TimeEntry(321, 654, "tomorrow", 5)) - - val expected = TimeEntry(id, 321, 654, "tomorrow", 5) - assertThat(updatedEntry).isEqualTo(expected) - assertThat(repo.find(id)).isEqualTo(expected) - } - - @Test - fun delete() { - val repo = InMemoryTimeEntryRepository() - val (id) = repo.create(TimeEntry(123, 456, "today", 8)) - - repo.delete(id!!) - assertThat(repo.list()).isEmpty() - } -} From c32a73493d6de7132f7927ce8ee326cc6360b2ef Mon Sep 17 00:00:00 2001 From: Dariusz Date: Sun, 10 Sep 2017 22:35:09 +1000 Subject: [PATCH 24/29] Switch to jpa --- build.gradle | 6 +- .../pal/tracker/JdbcTimeEntryRepository.kt | 74 --------- .../io/pivotal/pal/tracker/TimeEntry.kt | 7 +- .../pal/tracker/TimeEntryController.kt | 8 +- .../pal/tracker/TimeEntryRepository.kt | 12 +- .../tracker/JdbcTimeEntryRepositoryTest.kt | 146 ------------------ .../pal/tracker/TimeEntryControllerTest.kt | 13 +- .../pal/trackerapi/TimeEntryApiTest.kt | 8 +- .../pal/trackerapi/WelcomeApiTest.java | 26 ---- .../pivotal/pal/trackerapi/WelcomeApiTest.kt | 25 +++ 10 files changed, 54 insertions(+), 271 deletions(-) delete mode 100644 src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt delete mode 100644 src/test/kotlin/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt delete mode 100644 src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.java create mode 100644 src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt diff --git a/build.gradle b/build.gradle index 457dae6f4..97ab8ddab 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,9 @@ plugins { id 'org.springframework.boot' version '1.5.4.RELEASE' id 'org.jetbrains.kotlin.jvm' version '1.1.4-3' id 'org.jetbrains.kotlin.plugin.spring' version '1.1.4-3' - id "org.flywaydb.flyway" version "4.2.0" + id 'org.jetbrains.kotlin.plugin.noarg' version '1.1.4-3' + id 'org.jetbrains.kotlin.plugin.jpa' version '1.1.4-3' + id 'org.flywaydb.flyway' version '4.2.0' } repositories { @@ -31,7 +33,7 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile 'org.springframework.boot:spring-boot-starter-web' compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0' - compile 'org.springframework.boot:spring-boot-starter-jdbc' + compile 'org.springframework.boot:spring-boot-starter-data-jpa' compile 'mysql:mysql-connector-java:6.0.6' testCompile 'com.nhaarman:mockito-kotlin:1.5.0' testCompile 'org.springframework.boot:spring-boot-starter-test' diff --git a/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt deleted file mode 100644 index aae80694d..000000000 --- a/src/main/kotlin/io/pivotal/pal/tracker/JdbcTimeEntryRepository.kt +++ /dev/null @@ -1,74 +0,0 @@ -package io.pivotal.pal.tracker - -import org.springframework.jdbc.core.JdbcTemplate -import org.springframework.jdbc.support.GeneratedKeyHolder -import org.springframework.stereotype.Component -import java.sql.ResultSet -import java.sql.Statement.RETURN_GENERATED_KEYS -import javax.sql.DataSource - -@Component -class JdbcTimeEntryRepository(dataSource: DataSource) : TimeEntryRepository { - - private val jdbcTemplate: JdbcTemplate = JdbcTemplate(dataSource) - - private val timeEntryRowMapper = { rs: ResultSet, _: Int -> - TimeEntry( - rs.getLong("id"), - rs.getLong("project_id"), - rs.getLong("user_id"), - rs.getString("date"), - rs.getInt("hours") - ) - } - - private val timeEntryExtractor = { rs: ResultSet -> - if (rs.next()) timeEntryRowMapper(rs, 1) else null - } - - override fun find(id: Long) = jdbcTemplate.query( - "SELECT id, project_id, user_id, date, hours FROM time_entries WHERE id = ?", - arrayOf(id), - timeEntryExtractor) - - override fun list() = jdbcTemplate.query( - "SELECT id, project_id, user_id, date, hours FROM time_entries", - timeEntryRowMapper) - - override fun create(timeEntry: TimeEntry): TimeEntry { - val generatedKeyHolder = GeneratedKeyHolder() - - jdbcTemplate.update({ connection -> - val statement = connection.prepareStatement( - "INSERT INTO time_entries (project_id, user_id, date, hours) " + "VALUES (?, ?, ?, ?)", - RETURN_GENERATED_KEYS - ) - - statement.setLong(1, timeEntry.projectId) - statement.setLong(2, timeEntry.userId) - statement.setString(3, timeEntry.date) - statement.setInt(4, timeEntry.hours) - - statement - }, generatedKeyHolder) - - return find(generatedKeyHolder.key.toLong())!! - } - - override fun update(id: Long, timeEntry: TimeEntry): TimeEntry? { - jdbcTemplate.update("UPDATE time_entries " + - "SET project_id = ?, user_id = ?, date = ?, hours = ? " + - "WHERE id = ?", - timeEntry.projectId, - timeEntry.userId, - timeEntry.date, - timeEntry.hours, - id) - - return find(id) - } - - override fun delete(id: Long) { - jdbcTemplate.update("DELETE FROM time_entries WHERE id = ?", id) - } -} diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt index 21dd2f8a8..6d6765d31 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntry.kt @@ -1,7 +1,12 @@ package io.pivotal.pal.tracker +import javax.persistence.Entity +import javax.persistence.GeneratedValue +import javax.persistence.Id + +@Entity(name = "time_entries") data class TimeEntry( - val id: Long?, + @Id @GeneratedValue val id: Long?, val projectId: Long, val userId: Long, val date: String?, diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt index 0eb7c7488..283928747 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt @@ -16,11 +16,11 @@ import org.springframework.web.bind.annotation.RestController class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { @PostMapping - fun create(@RequestBody timeEntry: TimeEntry) = ResponseEntity(timeEntriesRepo.create(timeEntry), HttpStatus.CREATED) + fun create(@RequestBody timeEntry: TimeEntry) = ResponseEntity(timeEntriesRepo.save(timeEntry), HttpStatus.CREATED) @GetMapping("{id}") fun read(@PathVariable id: Long): ResponseEntity { - val timeEntry = timeEntriesRepo.find(id) + val timeEntry = timeEntriesRepo.findOne(id) return if (timeEntry != null) { ResponseEntity(timeEntry, HttpStatus.OK) } else { @@ -29,11 +29,11 @@ class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { } @GetMapping - fun list() = ResponseEntity(timeEntriesRepo.list(), HttpStatus.OK) + fun list() = ResponseEntity(timeEntriesRepo.findAll(), HttpStatus.OK) @PutMapping("{id}") fun update(@PathVariable id: Long, @RequestBody timeEntry: TimeEntry): ResponseEntity { - val updatedTimeEntry = timeEntriesRepo.update(id, timeEntry) + val updatedTimeEntry = timeEntriesRepo.save(timeEntry.copy(id = id)) return if (updatedTimeEntry != null) { ResponseEntity(updatedTimeEntry, HttpStatus.OK) } else { diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt index 5449c51a4..181609eb2 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryRepository.kt @@ -1,9 +1,7 @@ package io.pivotal.pal.tracker -interface TimeEntryRepository { - fun find(id: Long): TimeEntry? - fun list(): List - fun create(timeEntry: TimeEntry): TimeEntry - fun update(id: Long, timeEntry: TimeEntry): TimeEntry? - fun delete(id: Long) -} \ No newline at end of file +import org.springframework.data.repository.CrudRepository +import org.springframework.stereotype.Repository + +@Repository +interface TimeEntryRepository : CrudRepository diff --git a/src/test/kotlin/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt deleted file mode 100644 index 02682ac96..000000000 --- a/src/test/kotlin/test/pivotal/pal/tracker/JdbcTimeEntryRepositoryTest.kt +++ /dev/null @@ -1,146 +0,0 @@ -package test.pivotal.pal.tracker - - -import com.mysql.cj.jdbc.MysqlDataSource -import io.pivotal.pal.tracker.JdbcTimeEntryRepository -import io.pivotal.pal.tracker.TimeEntry -import io.pivotal.pal.tracker.TimeEntryRepository -import org.assertj.core.api.Assertions.assertThat -import org.junit.Before -import org.junit.Test -import org.springframework.jdbc.core.JdbcTemplate - -class JdbcTimeEntryRepositoryTest { - - private lateinit var subject: TimeEntryRepository - private lateinit var jdbcTemplate: JdbcTemplate - - @Before - fun setUp() { - val dataSource = MysqlDataSource() - dataSource.setUrl(System.getenv("SPRING_DATASOURCE_URL")) - - subject = JdbcTimeEntryRepository(dataSource) - - jdbcTemplate = JdbcTemplate(dataSource) - jdbcTemplate.execute("DELETE FROM time_entries") - } - - @Test - fun createInsertsATimeEntryRecord() { - val newTimeEntry = TimeEntry(123, 321, "today", 8) - val entry = subject.create(newTimeEntry) - - val foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", entry.id) - - assertThat(foundEntry["id"]).isEqualTo(entry.id) - assertThat(foundEntry["project_id"]).isEqualTo(123L) - assertThat(foundEntry["user_id"]).isEqualTo(321L) - assertThat(foundEntry["date"]).isEqualTo("today") - assertThat(foundEntry["hours"]).isEqualTo(8) - } - - @Test - fun createReturnsTheCreatedTimeEntry() { - val newTimeEntry = TimeEntry(123, 321, "today", 8) - val entry = subject.create(newTimeEntry) - - assertThat(entry.id).isNotNull() - assertThat(entry.projectId).isEqualTo(123) - assertThat(entry.userId).isEqualTo(321) - assertThat(entry.date).isEqualTo("today") - assertThat(entry.hours).isEqualTo(8) - } - - @Test - fun findFindsATimeEntry() { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (999, 123, 321, 'today', 8)" - ) - - val timeEntry = subject.find(999L) - - assertThat(timeEntry!!.id).isEqualTo(999L) - assertThat(timeEntry.projectId).isEqualTo(123L) - assertThat(timeEntry.userId).isEqualTo(321L) - assertThat(timeEntry.date).isEqualTo("today") - assertThat(timeEntry.hours).isEqualTo(8) - } - - @Test - fun findReturnsNullWhenNotFound() { - val timeEntry = subject.find(999L) - - assertThat(timeEntry).isNull() - } - - @Test - fun listFindsAllTimeEntries() { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (999, 123, 321, 'today', 8), (888, 456, 678, 'yesterday', 9)" - ) - - val timeEntries = subject.list() - assertThat(timeEntries.size).isEqualTo(2) - - var timeEntry = timeEntries[0] - assertThat(timeEntry.id).isEqualTo(888L) - assertThat(timeEntry.projectId).isEqualTo(456L) - assertThat(timeEntry.userId).isEqualTo(678L) - assertThat(timeEntry.date).isEqualTo("yesterday") - assertThat(timeEntry.hours).isEqualTo(9) - - timeEntry = timeEntries[1] - assertThat(timeEntry.id).isEqualTo(999L) - assertThat(timeEntry.projectId).isEqualTo(123L) - assertThat(timeEntry.userId).isEqualTo(321L) - assertThat(timeEntry.date).isEqualTo("today") - assertThat(timeEntry.hours).isEqualTo(8) - } - - @Test - fun updateReturnsTheUpdatedRecord() { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (1000, 123, 321, 'today', 8)") - - val timeEntryUpdates = TimeEntry(456, 987, "tomorrow", 10) - - val updatedTimeEntry = subject.update(1000L, timeEntryUpdates) - - assertThat(updatedTimeEntry!!.id).isEqualTo(1000L) - assertThat(updatedTimeEntry.projectId).isEqualTo(456L) - assertThat(updatedTimeEntry.userId).isEqualTo(987L) - assertThat(updatedTimeEntry.date).isEqualTo("tomorrow") - assertThat(updatedTimeEntry.hours).isEqualTo(10) - } - - @Test - fun updateUpdatesTheRecord() { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (1000, 123, 321, 'today', 8)") - - val updatedTimeEntry = TimeEntry(456, 322, "tomorrow", 10) - - val timeEntry = subject.update(1000L, updatedTimeEntry) - - val foundEntry = jdbcTemplate.queryForMap("Select * from time_entries where id = ?", timeEntry!!.id) - - assertThat(foundEntry["id"]).isEqualTo(timeEntry.id) - assertThat(foundEntry["project_id"]).isEqualTo(456L) - assertThat(foundEntry["user_id"]).isEqualTo(322L) - assertThat(foundEntry["date"]).isEqualTo("tomorrow") - assertThat(foundEntry["hours"]).isEqualTo(10) - } - - @Test - fun deleteRemovesTheRecord() { - jdbcTemplate.execute( - "INSERT INTO time_entries (id, project_id, user_id, date, hours) " + "VALUES (999, 123, 321, 'today', 8)" - ) - - subject.delete(999L) - - val foundEntry = jdbcTemplate.queryForMap("Select count(*) count from time_entries where id = ?", 999) - assertThat(foundEntry["count"]).isEqualTo(0L) - } -} diff --git a/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt index b8fd7e283..4165c440f 100644 --- a/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt +++ b/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt @@ -2,7 +2,6 @@ package test.pivotal.pal.tracker import com.nhaarman.mockito_kotlin.any import com.nhaarman.mockito_kotlin.doReturn -import com.nhaarman.mockito_kotlin.eq import com.nhaarman.mockito_kotlin.mock import com.nhaarman.mockito_kotlin.verify import io.pivotal.pal.tracker.TimeEntry @@ -30,7 +29,7 @@ class TimeEntryControllerTest { val expected = TimeEntry(1L, 123, 456, "today", 8) doReturn(expected) .`when`(timeEntryRepository) - .create(any()) + .save(any()) val response = controller.create(TimeEntry(123, 456, "today", 8)) @@ -43,7 +42,7 @@ class TimeEntryControllerTest { val expected = TimeEntry(1L, 123, 456, "today", 8) doReturn(expected) .`when`(timeEntryRepository) - .find(1L) + .findOne(1L) val response = controller.read(1L) assertThat(response.statusCode).isEqualTo(HttpStatus.OK) @@ -54,7 +53,7 @@ class TimeEntryControllerTest { fun testRead_NotFound() { doReturn(null) .`when`(timeEntryRepository) - .find(1L) + .findOne(1L) val response = controller.read(1L) assertThat(response.statusCode).isEqualTo(HttpStatus.NOT_FOUND) @@ -66,7 +65,7 @@ class TimeEntryControllerTest { TimeEntry(1L, 123, 456, "today", 8), TimeEntry(2L, 789, 321, "yesterday", 4) ) - doReturn(expected).`when`(timeEntryRepository).list() + doReturn(expected).`when`(timeEntryRepository).findAll() val response = controller.list() assertThat(response.statusCode).isEqualTo(HttpStatus.OK) @@ -78,7 +77,7 @@ class TimeEntryControllerTest { val expected = TimeEntry(1L, 987, 654, "yesterday", 4) doReturn(expected) .`when`(timeEntryRepository) - .update(eq(1L), any()) + .save(any()) val response = controller.update(1L, expected) assertThat(response.statusCode).isEqualTo(HttpStatus.OK) @@ -89,7 +88,7 @@ class TimeEntryControllerTest { fun testUpdate_NotFound() { doReturn(null) .`when`(timeEntryRepository) - .update(eq(1L), any()) + .save(any()) val response = controller.update(1L, TimeEntry(1L, 123, 456, "today", 8)) assertThat(response.statusCode).isEqualTo(HttpStatus.NOT_FOUND) diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt index af7f5749b..e6b423667 100644 --- a/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt +++ b/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt @@ -71,7 +71,7 @@ class TimeEntryApiTest { fun testRead() { val id = createTimeEntry() - val readResponse = this.restTemplate.getForEntity("/time-entries/" + id!!, String::class.java) + val readResponse = this.restTemplate.getForEntity("/time-entries/" + id, String::class.java) assertThat(readResponse.statusCode).isEqualTo(HttpStatus.OK) val readJson = parse(readResponse.body) @@ -87,7 +87,7 @@ class TimeEntryApiTest { val id = createTimeEntry() val updatedTimeEntry = TimeEntry(2, 3, "tomorrow", 9) - val updateResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.PUT, HttpEntity(updatedTimeEntry, null), String::class.java) + val updateResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.PUT, HttpEntity(updatedTimeEntry, null), String::class.java) assertThat(updateResponse.statusCode).isEqualTo(HttpStatus.OK) @@ -103,7 +103,7 @@ class TimeEntryApiTest { fun testDelete() { val id = createTimeEntry() - val deleteResponse = restTemplate.exchange("/time-entries/" + id!!, HttpMethod.DELETE, null, String::class.java) + val deleteResponse = restTemplate.exchange("/time-entries/" + id, HttpMethod.DELETE, null, String::class.java) assertThat(deleteResponse.statusCode).isEqualTo(HttpStatus.NO_CONTENT) @@ -112,5 +112,5 @@ class TimeEntryApiTest { } private fun createTimeEntry() = - restTemplate.postForObject("/time-entries", timeEntry, TimeEntry::class.java).id + restTemplate.postForObject("/time-entries", timeEntry, TimeEntry::class.java).id!! } diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.java b/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.java deleted file mode 100644 index cc7091ed4..000000000 --- a/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package test.pivotal.pal.trackerapi; - -import io.pivotal.pal.tracker.PalTrackerApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.test.context.junit4.SpringRunner; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) -public class WelcomeApiTest { - - @Autowired - private TestRestTemplate restTemplate; - - @Test - public void exampleTest() { - String body = this.restTemplate.getForObject("/", String.class); - assertThat(body).isEqualTo("Hello from test"); - } -} diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt new file mode 100644 index 000000000..1c5e9bcdb --- /dev/null +++ b/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt @@ -0,0 +1,25 @@ +package test.pivotal.pal.trackerapi + +import io.pivotal.pal.tracker.PalTrackerApplication +import org.assertj.core.api.Assertions.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.test.context.junit4.SpringRunner + +@RunWith(SpringRunner::class) +@SpringBootTest(classes = arrayOf(PalTrackerApplication::class), webEnvironment = RANDOM_PORT) +class WelcomeApiTest { + + @Autowired + private lateinit var restTemplate: TestRestTemplate + + @Test + fun exampleTest() { + val body = this.restTemplate.getForObject("/", String::class.java) + assertThat(body).isEqualTo("Hello from test") + } +} From 9132bbc5fcced513cb83a6800027f2648f8514f2 Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Wed, 26 Jul 2017 12:28:32 -0600 Subject: [PATCH 25/29] Add tests for Actuator lab --- .../pivotal/pal/trackerapi/HealthApiTest.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java diff --git a/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java new file mode 100644 index 000000000..b3eef23cc --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java @@ -0,0 +1,38 @@ +package test.pivotal.pal.trackerapi; + +import com.jayway.jsonpath.DocumentContext; +import io.pivotal.pal.tracker.PalTrackerApplication; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringRunner; + +import static com.jayway.jsonpath.JsonPath.parse; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class HealthApiTest { + + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void healthTest() { + ResponseEntity response = this.restTemplate.getForEntity("/health", String.class); + + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + + DocumentContext healthJson = parse(response.getBody()); + + assertThat(healthJson.read("$.status", String.class)).isEqualTo("UP"); + assertThat(healthJson.read("$.db.status", String.class)).isEqualTo("UP"); + assertThat(healthJson.read("$.diskSpace.status", String.class)).isEqualTo("UP"); + } +} From 99bec6f4c57f7d7a92715677d96274c7275462a4 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Mon, 11 Sep 2017 11:24:38 +1000 Subject: [PATCH 26/29] Add custom actuator and health check --- build.gradle | 5 +++- .../pal/tracker/TimeEntryController.kt | 24 +++++++++++++++--- .../pal/tracker/TimeEntryHealthIndicator.kt | 25 +++++++++++++++++++ .../pal/tracker/TimeEntryControllerTest.kt | 6 ++++- .../pivotal/pal/trackerapi/HealthApiTest.java | 1 - 5 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/TimeEntryHealthIndicator.kt rename src/test/{java => kotlin}/test/pivotal/pal/trackerapi/HealthApiTest.java (99%) diff --git a/build.gradle b/build.gradle index 97ab8ddab..136954391 100644 --- a/build.gradle +++ b/build.gradle @@ -32,8 +32,9 @@ compileTestKotlin { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" compile 'org.springframework.boot:spring-boot-starter-web' - compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0' + compile 'org.springframework.boot:spring-boot-starter-actuator' compile 'org.springframework.boot:spring-boot-starter-data-jpa' + compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0' compile 'mysql:mysql-connector-java:6.0.6' testCompile 'com.nhaarman:mockito-kotlin:1.5.0' testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -43,12 +44,14 @@ def developmentDbUrl = "jdbc:mysql://localhost:3306/tracker_dev?user=tracker&use bootRun.environment([ "WELCOME_MESSAGE": "hello", "SPRING_DATASOURCE_URL": developmentDbUrl, + "MANAGEMENT_SECURITY_ENABLED": false, ]) def testDbUrl = "jdbc:mysql://localhost:3306/tracker_test?user=tracker&useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false" test.environment([ "WELCOME_MESSAGE": "Hello from test", "SPRING_DATASOURCE_URL": testDbUrl, + "MANAGEMENT_SECURITY_ENABLED": false, ]) flyway { diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt index 283928747..0868c7d2f 100644 --- a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryController.kt @@ -1,5 +1,7 @@ package io.pivotal.pal.tracker +import org.springframework.boot.actuate.metrics.CounterService +import org.springframework.boot.actuate.metrics.GaugeService import org.springframework.http.HttpStatus import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.DeleteMapping @@ -13,15 +15,25 @@ import org.springframework.web.bind.annotation.RestController @RestController @RequestMapping("/time-entries") -class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { +class TimeEntryController( + private val timeEntriesRepo: TimeEntryRepository, + private val counter: CounterService, + private val gauge: GaugeService +) { @PostMapping - fun create(@RequestBody timeEntry: TimeEntry) = ResponseEntity(timeEntriesRepo.save(timeEntry), HttpStatus.CREATED) + fun create(@RequestBody timeEntry: TimeEntry): ResponseEntity { + val createdTimeEntry = timeEntriesRepo.save(timeEntry) + counter.increment("TimeEntry.created") + gauge.submit("timeEntries.count", timeEntriesRepo.count().toDouble()) + return ResponseEntity(createdTimeEntry, HttpStatus.CREATED) + } @GetMapping("{id}") fun read(@PathVariable id: Long): ResponseEntity { val timeEntry = timeEntriesRepo.findOne(id) return if (timeEntry != null) { + counter.increment("TimeEntry.read") ResponseEntity(timeEntry, HttpStatus.OK) } else { ResponseEntity(HttpStatus.NOT_FOUND) @@ -29,12 +41,16 @@ class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { } @GetMapping - fun list() = ResponseEntity(timeEntriesRepo.findAll(), HttpStatus.OK) + fun list(): ResponseEntity> { + counter.increment("TimeEntry.listed") + return ResponseEntity(timeEntriesRepo.findAll(), HttpStatus.OK) + } @PutMapping("{id}") fun update(@PathVariable id: Long, @RequestBody timeEntry: TimeEntry): ResponseEntity { val updatedTimeEntry = timeEntriesRepo.save(timeEntry.copy(id = id)) return if (updatedTimeEntry != null) { + counter.increment("TimeEntry.updated") ResponseEntity(updatedTimeEntry, HttpStatus.OK) } else { ResponseEntity(HttpStatus.NOT_FOUND) @@ -44,6 +60,8 @@ class TimeEntryController(private val timeEntriesRepo: TimeEntryRepository) { @DeleteMapping("{id}") fun delete(@PathVariable id: Long): ResponseEntity { timeEntriesRepo.delete(id) + counter.increment("TimeEntry.deleted") + gauge.submit("timeEntries.count", timeEntriesRepo.count().toDouble()) return ResponseEntity(HttpStatus.NO_CONTENT) } diff --git a/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryHealthIndicator.kt b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryHealthIndicator.kt new file mode 100644 index 000000000..2bdde2118 --- /dev/null +++ b/src/main/kotlin/io/pivotal/pal/tracker/TimeEntryHealthIndicator.kt @@ -0,0 +1,25 @@ +package io.pivotal.pal.tracker + +import org.springframework.boot.actuate.health.Health +import org.springframework.boot.actuate.health.HealthIndicator +import org.springframework.stereotype.Component + +@Component +class TimeEntryHealthIndicator(private val timeEntryRepo: TimeEntryRepository) : HealthIndicator { + + override fun health(): Health { + val builder = Health.Builder() + + if (timeEntryRepo.count() < MAX_TIME_ENTRIES) { + builder.up() + } else { + builder.down() + } + + return builder.build() + } + + companion object { + private val MAX_TIME_ENTRIES = 5 + } +} diff --git a/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt b/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt index 4165c440f..a9df42359 100644 --- a/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt +++ b/src/test/kotlin/test/pivotal/pal/tracker/TimeEntryControllerTest.kt @@ -10,6 +10,8 @@ import io.pivotal.pal.tracker.TimeEntryRepository import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test +import org.springframework.boot.actuate.metrics.CounterService +import org.springframework.boot.actuate.metrics.GaugeService import org.springframework.http.HttpStatus import java.util.Arrays.asList @@ -17,11 +19,13 @@ class TimeEntryControllerTest { private lateinit var timeEntryRepository: TimeEntryRepository private lateinit var controller: TimeEntryController + private val counterService: CounterService = mock() + private val gaugeService: GaugeService = mock() @Before fun setUp() { timeEntryRepository = mock() - controller = TimeEntryController(timeEntryRepository) + controller = TimeEntryController(timeEntryRepository, counterService, gaugeService) } @Test diff --git a/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java b/src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.java similarity index 99% rename from src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java rename to src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.java index b3eef23cc..19c18968d 100644 --- a/src/test/java/test/pivotal/pal/trackerapi/HealthApiTest.java +++ b/src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.java @@ -26,7 +26,6 @@ public class HealthApiTest { public void healthTest() { ResponseEntity response = this.restTemplate.getForEntity("/health", String.class); - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); DocumentContext healthJson = parse(response.getBody()); From e828a82ff976bd97ac720c583b4712fc9f091391 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Mon, 11 Sep 2017 11:38:45 +1000 Subject: [PATCH 27/29] Add cache for gradle to pipeline --- ci/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/build.yml b/ci/build.yml index b01d4da2d..85f0630a7 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -13,6 +13,9 @@ inputs: outputs: - name: build-output +caches: + - path: .gradle/ + run: path: bash args: From b86aff1ff272c5f7640c108d15967eb167e07ad4 Mon Sep 17 00:00:00 2001 From: Tyson Gern Date: Wed, 26 Jul 2017 12:50:47 -0600 Subject: [PATCH 28/29] Add tests for Security lab --- .../pal/trackerapi/SecurityApiTest.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java diff --git a/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java new file mode 100644 index 000000000..72099994b --- /dev/null +++ b/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java @@ -0,0 +1,52 @@ +package test.pivotal.pal.trackerapi; + +import io.pivotal.pal.tracker.PalTrackerApplication; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.embedded.LocalServerPort; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) +public class SecurityApiTest { + + @LocalServerPort + private String port; + private TestRestTemplate authorizedRestTemplate; + + @Autowired + private TestRestTemplate unAuthorizedRestTemplate; + + @Before + public void setUp() throws Exception { + RestTemplateBuilder builder = new RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthorization("user", "password"); + + authorizedRestTemplate = new TestRestTemplate(builder); + } + + @Test + public void unauthorizedTest() { + ResponseEntity response = this.unAuthorizedRestTemplate.getForEntity("/", String.class); + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED); + } + + @Test + public void authorizedTest() { + ResponseEntity response = this.authorizedRestTemplate.getForEntity("/", String.class); + + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); + } +} From 85d95b7e3f958c8e8eb18f24559afeb8bd16ae19 Mon Sep 17 00:00:00 2001 From: Dariusz Date: Mon, 11 Sep 2017 12:01:50 +1000 Subject: [PATCH 29/29] Configure spring security with enforcing https --- build.gradle | 1 + manifest-production.yml | 2 + manifest-review.yml | 2 + .../pal/tracker/SecurityConfiguration.kt | 31 +++++++++++ .../pal/trackerapi/SecurityApiTest.java | 52 ------------------- .../pivotal/pal/trackerapi/HealthApiTest.java | 37 ------------- .../pivotal/pal/trackerapi/HealthApiTest.kt | 47 +++++++++++++++++ .../pivotal/pal/trackerapi/SecurityApiTest.kt | 50 ++++++++++++++++++ .../pal/trackerapi/TimeEntryApiTest.kt | 12 ++++- .../pivotal/pal/trackerapi/WelcomeApiTest.kt | 17 +++++- 10 files changed, 158 insertions(+), 93 deletions(-) create mode 100644 src/main/kotlin/io/pivotal/pal/tracker/SecurityConfiguration.kt delete mode 100644 src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java delete mode 100644 src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.java create mode 100644 src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.kt create mode 100644 src/test/kotlin/test/pivotal/pal/trackerapi/SecurityApiTest.kt diff --git a/build.gradle b/build.gradle index 136954391..0653f71aa 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,7 @@ dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-actuator' compile 'org.springframework.boot:spring-boot-starter-data-jpa' + compile 'org.springframework.boot:spring-boot-starter-security' compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.0' compile 'mysql:mysql-connector-java:6.0.6' testCompile 'com.nhaarman:mockito-kotlin:1.5.0' diff --git a/manifest-production.yml b/manifest-production.yml index b0ff13496..b2ee4ba9c 100644 --- a/manifest-production.yml +++ b/manifest-production.yml @@ -5,3 +5,5 @@ applications: host: dl-pal-tracker services: - tracker-database + env: + SECURITY_FORCE_HTTPS: true diff --git a/manifest-review.yml b/manifest-review.yml index f1f7fe419..7f80f6eda 100644 --- a/manifest-review.yml +++ b/manifest-review.yml @@ -5,3 +5,5 @@ applications: host: dl-pal-tracker-review services: - tracker-database + env: + SECURITY_FORCE_HTTPS: true diff --git a/src/main/kotlin/io/pivotal/pal/tracker/SecurityConfiguration.kt b/src/main/kotlin/io/pivotal/pal/tracker/SecurityConfiguration.kt new file mode 100644 index 000000000..ac0b505ae --- /dev/null +++ b/src/main/kotlin/io/pivotal/pal/tracker/SecurityConfiguration.kt @@ -0,0 +1,31 @@ +package io.pivotal.pal.tracker + +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter + +@EnableWebSecurity +class SecurityConfiguration : WebSecurityConfigurerAdapter() { + override fun configure(http: HttpSecurity) { + val forceHttps = System.getenv("SECURITY_FORCE_HTTPS") + if (forceHttps != null && forceHttps == "true") { + http.requiresChannel().anyRequest().requiresSecure() + } + + http + .authorizeRequests().antMatchers("/**").hasRole("USER") + .and() + .httpBasic() + .and() + .csrf().disable() + } + + @Autowired + fun configureGlobal(auth: AuthenticationManagerBuilder) { + auth + .inMemoryAuthentication() + .withUser("user").password("password").roles("USER") + } +} diff --git a/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java b/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java deleted file mode 100644 index 72099994b..000000000 --- a/src/test/java/test/pivotal/pal/trackerapi/SecurityApiTest.java +++ /dev/null @@ -1,52 +0,0 @@ -package test.pivotal.pal.trackerapi; - -import io.pivotal.pal.tracker.PalTrackerApplication; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.embedded.LocalServerPort; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) -public class SecurityApiTest { - - @LocalServerPort - private String port; - private TestRestTemplate authorizedRestTemplate; - - @Autowired - private TestRestTemplate unAuthorizedRestTemplate; - - @Before - public void setUp() throws Exception { - RestTemplateBuilder builder = new RestTemplateBuilder() - .rootUri("http://localhost:" + port) - .basicAuthorization("user", "password"); - - authorizedRestTemplate = new TestRestTemplate(builder); - } - - @Test - public void unauthorizedTest() { - ResponseEntity response = this.unAuthorizedRestTemplate.getForEntity("/", String.class); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED); - } - - @Test - public void authorizedTest() { - ResponseEntity response = this.authorizedRestTemplate.getForEntity("/", String.class); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - } -} diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.java b/src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.java deleted file mode 100644 index 19c18968d..000000000 --- a/src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package test.pivotal.pal.trackerapi; - -import com.jayway.jsonpath.DocumentContext; -import io.pivotal.pal.tracker.PalTrackerApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; - -import static com.jayway.jsonpath.JsonPath.parse; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = PalTrackerApplication.class, webEnvironment = RANDOM_PORT) -public class HealthApiTest { - - @Autowired - private TestRestTemplate restTemplate; - - @Test - public void healthTest() { - ResponseEntity response = this.restTemplate.getForEntity("/health", String.class); - - assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); - - DocumentContext healthJson = parse(response.getBody()); - - assertThat(healthJson.read("$.status", String.class)).isEqualTo("UP"); - assertThat(healthJson.read("$.db.status", String.class)).isEqualTo("UP"); - assertThat(healthJson.read("$.diskSpace.status", String.class)).isEqualTo("UP"); - } -} diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.kt new file mode 100644 index 000000000..151c502a4 --- /dev/null +++ b/src/test/kotlin/test/pivotal/pal/trackerapi/HealthApiTest.kt @@ -0,0 +1,47 @@ +package test.pivotal.pal.trackerapi + +import com.jayway.jsonpath.JsonPath.parse +import io.pivotal.pal.tracker.PalTrackerApplication +import org.assertj.core.api.Assertions.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.springframework.boot.context.embedded.LocalServerPort +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.boot.web.client.RestTemplateBuilder +import org.springframework.http.HttpStatus +import org.springframework.test.context.junit4.SpringRunner + +@RunWith(SpringRunner::class) +@SpringBootTest(classes = arrayOf(PalTrackerApplication::class), webEnvironment = RANDOM_PORT) +class HealthApiTest { + + private lateinit var restTemplate: TestRestTemplate + + @LocalServerPort + private lateinit var port: String + + @Before + fun setUp() { + val builder = RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthorization("user", "password") + + restTemplate = TestRestTemplate(builder) + } + + @Test + fun healthTest() { + val response = this.restTemplate.getForEntity("/health", String::class.java) + + assertThat(response.statusCode).isEqualTo(HttpStatus.OK) + + val healthJson = parse(response.body) + + assertThat(healthJson.read("$.status", String::class.java)).isEqualTo("UP") + assertThat(healthJson.read("$.db.status", String::class.java)).isEqualTo("UP") + assertThat(healthJson.read("$.diskSpace.status", String::class.java)).isEqualTo("UP") + } +} diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/SecurityApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/SecurityApiTest.kt new file mode 100644 index 000000000..44a49d029 --- /dev/null +++ b/src/test/kotlin/test/pivotal/pal/trackerapi/SecurityApiTest.kt @@ -0,0 +1,50 @@ +package test.pivotal.pal.trackerapi + +import io.pivotal.pal.tracker.PalTrackerApplication +import org.assertj.core.api.Assertions.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.context.embedded.LocalServerPort +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.boot.web.client.RestTemplateBuilder +import org.springframework.http.HttpStatus +import org.springframework.test.context.junit4.SpringRunner + +@RunWith(SpringRunner::class) +@SpringBootTest(classes = arrayOf(PalTrackerApplication::class), webEnvironment = RANDOM_PORT) +class SecurityApiTest { + + @LocalServerPort + private lateinit var port: String + private lateinit var authorizedRestTemplate: TestRestTemplate + + @Autowired + private lateinit var unAuthorizedRestTemplate: TestRestTemplate + + @Before + fun setUp() { + val builder = RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthorization("user", "password") + + authorizedRestTemplate = TestRestTemplate(builder) + } + + @Test + fun unauthorizedTest() { + val response = this.unAuthorizedRestTemplate.getForEntity("/", String::class.java) + + assertThat(response.statusCode).isEqualTo(HttpStatus.UNAUTHORIZED) + } + + @Test + fun authorizedTest() { + val response = this.authorizedRestTemplate.getForEntity("/", String::class.java) + + assertThat(response.statusCode).isEqualTo(HttpStatus.OK) + } +} diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt index e6b423667..4401ae0d7 100644 --- a/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt +++ b/src/test/kotlin/test/pivotal/pal/trackerapi/TimeEntryApiTest.kt @@ -8,10 +8,11 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.context.embedded.LocalServerPort import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.boot.web.client.RestTemplateBuilder import org.springframework.http.HttpEntity import org.springframework.http.HttpMethod import org.springframework.http.HttpStatus @@ -22,9 +23,10 @@ import org.springframework.test.context.junit4.SpringRunner @SpringBootTest(classes = arrayOf(PalTrackerApplication::class), webEnvironment = RANDOM_PORT) class TimeEntryApiTest { - @Autowired private lateinit var restTemplate: TestRestTemplate + @LocalServerPort + private lateinit var port: String private val timeEntry = TimeEntry(123, 456, "today", 8) @Before @@ -34,6 +36,12 @@ class TimeEntryApiTest { val jdbcTemplate = JdbcTemplate(dataSource) jdbcTemplate.execute("TRUNCATE time_entries") + + val builder = RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthorization("user", "password") + + restTemplate = TestRestTemplate(builder) } @Test diff --git a/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt b/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt index 1c5e9bcdb..dd6938e96 100644 --- a/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt +++ b/src/test/kotlin/test/pivotal/pal/trackerapi/WelcomeApiTest.kt @@ -2,21 +2,34 @@ package test.pivotal.pal.trackerapi import io.pivotal.pal.tracker.PalTrackerApplication import org.assertj.core.api.Assertions.assertThat +import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.context.embedded.LocalServerPort import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.boot.web.client.RestTemplateBuilder import org.springframework.test.context.junit4.SpringRunner @RunWith(SpringRunner::class) @SpringBootTest(classes = arrayOf(PalTrackerApplication::class), webEnvironment = RANDOM_PORT) class WelcomeApiTest { - @Autowired private lateinit var restTemplate: TestRestTemplate + @LocalServerPort + private lateinit var port: String + + @Before + fun setUp() { + val builder = RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthorization("user", "password") + + restTemplate = TestRestTemplate(builder) + } + @Test fun exampleTest() { val body = this.restTemplate.getForObject("/", String::class.java)