Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue fix #2777 chore(test): fixed failing tests for windows in kubernetes-maven-plugin #2784

Merged
merged 4 commits into from
Mar 11, 2024
Merged

Issue fix #2777 chore(test): fixed failing tests for windows in kubernetes-maven-plugin #2784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86afa74
chore(test): added separatorsToSystem() to resourceDir assertion stat…
l3002 Mar 7, 2024
8cd7926
chore(test): replaced LF with platform specific line separator
l3002 Mar 7, 2024
de87978
chore(test): used File to assert return value of getResourceDir()
l3002 Mar 8, 2024
46feac2
chore(test): added method reference for resourceDir assertion
l3002 Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/BuildMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void buildServiceConfigBuilder_shouldReturnNonNullResourceConfigIfConfigured() {
BuildServiceConfig.BuildServiceConfigBuilder buildServiceConfigBuilder = buildMojo.buildServiceConfigBuilder();
// Then
assertThat(buildServiceConfigBuilder.build()).isNotNull()
.returns("src/main/jkube", c -> c.getResourceDir().getPath())
.returns(new File("src/main/jkube"), BuildServiceConfig::getResourceDir)
.extracting(BuildServiceConfig::getResourceConfig)
.extracting(ResourceConfig::getOpenshiftBuildConfig)
.returns("200m", c -> c.getLimits().get("cpu"))
Expand Down
4 changes: 2 additions & 2 deletions ...ugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void execute_withMissingHelmPackage_shouldThrowException() {
.isInstanceOf(JKubeException.class)
.hasMessage("Linting failed");
assertThat(outputStream.toString())
.contains("Linting empty-project 0.1.0\n")
.contains(String.format("Linting empty-project 0.1.0%n"))
.contains("Using packaged file:")
.contains("[[W]]Error unable to open tarball:");
}
Expand All @@ -79,7 +79,7 @@ void execute_withHelmPackage_shouldSucceed() throws Exception {
.packageIt().withDestination(projectDir.resolve("target").resolve("jkube").resolve("helm").resolve("empty-project").resolve("kubernetes")).call();
helmLintMojo.execute();
assertThat(outputStream.toString())
.contains("Linting empty-project 0.1.0\n")
.contains(String.format("Linting empty-project 0.1.0%n"))
.contains("Using packaged file:")
.contains("[[W]][INFO] Chart.yaml: icon is recommended")
.contains("Linting successful");
Expand Down