File tree 9 files changed +18
-17
lines changed
main/kotlin/nl.deltadak.ktemplate
test/kotlin/nl/deltadak/ktemplate
9 files changed +18
-17
lines changed Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ plugins {
13
13
id(" com.github.ben-manes.versions" ) version " 0.28.0"
14
14
15
15
// Plugin which can update Gradle dependencies, use help/useLatestVersions
16
- id(" se.patrikerdes.use-latest-versions" ) version " 0.2.13 "
16
+ id(" se.patrikerdes.use-latest-versions" ) version " 0.2.14 "
17
17
18
18
// Test coverage
19
19
jacoco
@@ -35,9 +35,9 @@ dependencies {
35
35
implementation(kotlin(" test-junit" ))
36
36
37
37
// JUnit 5
38
- testImplementation(" org.junit.jupiter:junit-jupiter-api:5.6.2 " )
39
- testRuntimeOnly(" org.junit.jupiter:junit-jupiter-engine:5.6.2 " )
40
- testRuntimeOnly(" org.junit.platform:junit-platform-console:1.6.2 " )
38
+ testImplementation(" org.junit.jupiter:junit-jupiter-api:5.7.0-M1 " )
39
+ testRuntimeOnly(" org.junit.jupiter:junit-jupiter-engine:5.7.0-M1 " )
40
+ testRuntimeOnly(" org.junit.platform:junit-platform-console:1.7.0-M1 " )
41
41
42
42
// Kotlintest
43
43
testImplementation(" io.kotlintest:kotlintest-core:3.4.2" )
@@ -51,8 +51,8 @@ dependencies {
51
51
// testImplementation("org.testfx:openjfx-monocle:8u76-b04") // jdk-9+181 for Java 9
52
52
53
53
// Spek
54
- testImplementation(" org.spekframework.spek2:spek-dsl-jvm:2.0.10 " )
55
- testImplementation(" org.spekframework.spek2:spek-runner-junit5:2.0.10 " )
54
+ testImplementation(" org.spekframework.spek2:spek-dsl-jvm:2.0.11 " )
55
+ testImplementation(" org.spekframework.spek2:spek-runner-junit5:2.0.11 " )
56
56
}
57
57
58
58
repositories {
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
distributionPath =wrapper/dists
3
- distributionUrl =https\://services.gradle.org/distributions/gradle-6.4-rc- 1-all.zip
3
+ distributionUrl =https\://services.gradle.org/distributions/gradle-6.5. 1-all.zip
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change 82
82
83
83
CLASSPATH=$APP_HOME /gradle/wrapper/gradle-wrapper.jar
84
84
85
+
85
86
# Determine the Java command to use to start the JVM.
86
87
if [ -n " $JAVA_HOME " ] ; then
87
88
if [ -x " $JAVA_HOME /jre/sh/java" ] ; then
129
130
if [ " $cygwin " = " true" -o " $msys " = " true" ] ; then
130
131
APP_HOME=` cygpath --path --mixed " $APP_HOME " `
131
132
CLASSPATH=` cygpath --path --mixed " $CLASSPATH " `
133
+
132
134
JAVACMD=` cygpath --unix " $JAVACMD " `
133
135
134
136
# We build the pattern for arguments to be converted via cygpath
Original file line number Diff line number Diff line change @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
29
29
set APP_BASE_NAME = %~n0
30
30
set APP_HOME = %DIRNAME%
31
31
32
+ @ rem Resolve any "." and ".." in APP_HOME to make it shorter.
33
+ for %%i in (" %APP_HOME% " ) do set APP_HOME = %%~fi
34
+
32
35
@ rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33
36
set DEFAULT_JVM_OPTS = " -Xmx64m" " -Xms64m"
34
37
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
81
84
82
85
set CLASSPATH = %APP_HOME% \gradle\wrapper\gradle-wrapper.jar
83
86
87
+
84
88
@ rem Execute Gradle
85
89
" %JAVA_EXE% " %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% " -Dorg.gradle.appname=%APP_BASE_NAME% " -classpath " %CLASSPATH% " org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
86
90
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ class HelloJavaFX : Application() {
24
24
primaryStage.title = " Hello World!"
25
25
val btn = Button ()
26
26
btn.text = " Say 1+1"
27
- btn.setOnAction { _ -> println (calculate()) }
27
+ btn.setOnAction { println (calculate()) }
28
28
29
29
val spinner = Spinner <Int >()
30
30
@@ -59,7 +59,7 @@ class HelloJavaFX : Application() {
59
59
* Start application.
60
60
*/
61
61
fun main (args : Array <String >) {
62
- Application . launch(* args)
62
+ launch(* args)
63
63
}
64
64
65
65
}
Original file line number Diff line number Diff line change 1
1
package nl.deltadak.ktemplate
2
2
3
- import org.spekframework.spek2.style.gherkin.Feature
4
- import org.spekframework.spek2.Spek
5
3
import org.junit.jupiter.api.Assertions.assertEquals
6
- import org.junit.jupiter.api.Assertions.fail
4
+ import org.spekframework.spek2.Spek
5
+ import org.spekframework.spek2.style.gherkin.Feature
7
6
8
7
object KotlinJUnitSpekTest: Spek({
9
8
Feature ("Empty feature") {
Original file line number Diff line number Diff line change 1
1
package nl.deltadak.ktemplate
2
2
3
3
import javafx.scene.control.ProgressIndicator
4
- import junit.framework.TestCase.fail
5
4
import org.junit.jupiter.api.Assertions
6
5
import org.spekframework.spek2.Spek
7
6
import org.spekframework.spek2.style.gherkin.Feature
Original file line number Diff line number Diff line change @@ -2,15 +2,12 @@ package nl.deltadak.ktemplate
2
2
3
3
4
4
import javafx.scene.control.ProgressIndicator
5
- import org.junit.jupiter.api.Assertions.assertFalse
5
+ import org.junit.jupiter.api.Assertions.assertTrue
6
6
import org.junit.jupiter.api.Test
7
7
import org.testfx.api.FxRobot
8
8
import org.testfx.api.FxToolkit
9
-
10
9
import java.util.concurrent.TimeoutException
11
10
12
- import org.junit.jupiter.api.Assertions.assertTrue
13
-
14
11
/* *
15
12
* Test general JavaFX components.
16
13
*/
You can’t perform that action at this time.
0 commit comments