diff --git a/gradle-plugin/it/src/test/java/org/eclipse/jkube/gradle/plugin/tests/HelmIT.java b/gradle-plugin/it/src/test/java/org/eclipse/jkube/gradle/plugin/tests/HelmIT.java index 353a35cd9d..dc95739e70 100644 --- a/gradle-plugin/it/src/test/java/org/eclipse/jkube/gradle/plugin/tests/HelmIT.java +++ b/gradle-plugin/it/src/test/java/org/eclipse/jkube/gradle/plugin/tests/HelmIT.java @@ -59,7 +59,7 @@ void k8sResourceHelmFromFragment_whenRun_generatesHelmChart(String projectName) }) void k8sResourceHelmFromFragment_whenRun_generatesHelmValues(String projectName) throws Exception { // When - final BuildResult result = gradleRunner.withITProject(projectName) + gradleRunner.withITProject(projectName) .withArguments("clean", "k8sResource", "k8sHelm").build(); // Then ResourceVerify.verifyResourceDescriptors( diff --git a/gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/KubernetesExtension.java b/gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/KubernetesExtension.java index ffaa5c0f2f..fff75a7c5d 100644 --- a/gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/KubernetesExtension.java +++ b/gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/KubernetesExtension.java @@ -111,11 +111,13 @@ public abstract class KubernetesExtension { private static final boolean DEFAULT_OFFLINE = false; - private static final Path DEFAULT_KUBERNETES_MANIFEST = Paths.get("META-INF", "jkube", "kubernetes.yml"); - private static final Path DEFAULT_KUBERNETES_TEMPLATE = Paths.get("META-INF", "jkube", "kubernetes"); - private static final Path DEFAULT_JSON_LOG_DIR = Paths.get("jkube","applyJson"); - private static final Path DEFAULT_RESOURCE_SOURCE_DIR = Paths.get("src", "main", "jkube"); - private static final Path DEFAULT_RESOURCE_TARGET_DIR = Paths.get("META-INF", "jkube"); + private static final String META_INF = "META-INF"; + private static final String JKUBE = "jkube"; + private static final Path DEFAULT_KUBERNETES_MANIFEST = Paths.get(META_INF, JKUBE, "kubernetes.yml"); + private static final Path DEFAULT_KUBERNETES_TEMPLATE = Paths.get(META_INF, JKUBE, "kubernetes"); + private static final Path DEFAULT_JSON_LOG_DIR = Paths.get(JKUBE, "applyJson"); + private static final Path DEFAULT_RESOURCE_SOURCE_DIR = Paths.get("src", "main", JKUBE); + private static final Path DEFAULT_RESOURCE_TARGET_DIR = Paths.get(META_INF, JKUBE); private static final Path DEFAULT_WORK_DIR = Paths.get("jkube-temp"); public transient JavaProject javaProject; diff --git a/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesConfigViewTaskTest.java b/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesConfigViewTaskTest.java index 88649b3ae1..e63f123e71 100644 --- a/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesConfigViewTaskTest.java +++ b/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesConfigViewTaskTest.java @@ -48,6 +48,6 @@ void runTask_withManualSettings_shouldLogThem() { configViewTask.runTask(); // Then verify(taskEnvironment.logger, times(1)) - .lifecycle(matches(String.format("k8s: %n---\noffline: true\nbuildStrategy: \"s2i\""))); + .lifecycle(matches(String.format("k8s: %n---%noffline: true%nbuildStrategy: \"s2i\""))); } } diff --git a/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesRemoteDevTaskTest.java b/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesRemoteDevTaskTest.java index 1e7af88664..1d90c820ae 100644 --- a/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesRemoteDevTaskTest.java +++ b/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesRemoteDevTaskTest.java @@ -81,6 +81,6 @@ void runTask_withException_shouldStop() { // Then assertThat(remoteDevelopmentService.constructed()) .singleElement() - .satisfies(remoteDevelopmentService -> verify(remoteDevelopmentService, times(1)).stop()); + .satisfies(service -> verify(service, times(1)).stop()); } }