From 596167494470bf7c7231752efb03861eeb7799ee Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 3 Jul 2019 00:15:29 +0200 Subject: [PATCH 1/3] Add openjdk12 to travis-ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 59c3fa6f..2f1677de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ matrix: - jdk: openjdk8 - jdk: oraclejdk9 - jdk: openjdk11 - + - jdk: openjdk12 From c4b78828d78c14646873bc9ca4947da1a80da109 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 3 Jul 2019 22:20:21 +0200 Subject: [PATCH 2/3] Fix cucumber? --- .../org/airsonic/test/cucumber/steps/api/StreamStepDef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java b/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java index 6e526f20..13527644 100644 --- a/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java +++ b/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java @@ -43,7 +43,7 @@ public class StreamStepDef implements En { public StreamStepDef(AirsonicServer server) { mapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS); this.client = HttpClientBuilder.create().build(); - Given("Media file (.*) is added", (String streamName) -> { + Given("Media file {string} is added", (String streamName) -> { this.streamName = streamName; server.uploadToDefaultMusicFolder( Paths.get(this.getClass().getResource("/blobs/stream/" + streamName + "/input").toURI()), From 967c32b92fe209dd90450f153e4f26148b685cb6 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 3 Jul 2019 22:20:56 +0200 Subject: [PATCH 3/3] Fix cucumber. --- .../org/airsonic/test/cucumber/steps/api/StreamStepDef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java b/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java index 13527644..2468d4a0 100644 --- a/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java +++ b/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java @@ -43,7 +43,7 @@ public class StreamStepDef implements En { public StreamStepDef(AirsonicServer server) { mapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS); this.client = HttpClientBuilder.create().build(); - Given("Media file {string} is added", (String streamName) -> { + Given("Media file {word} is added", (String streamName) -> { this.streamName = streamName; server.uploadToDefaultMusicFolder( Paths.get(this.getClass().getResource("/blobs/stream/" + streamName + "/input").toURI()),