Skip to content

Commit

Permalink
[issue-122] (Unrelated) - Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
fabiobrz committed Jan 17, 2025
1 parent fa83b59 commit af77b67
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ public void verifyEap81DynamicallyFilledAdapterTest() {
Assertions.assertEquals("url", eap81HelmChartRelease.getSourceRepositoryUrl());
Assertions.assertEquals("ref", eap81HelmChartRelease.getSourceRepositoryRef());
Assertions.assertEquals("context-dir", eap81HelmChartRelease.getContextDir());
Assertions.assertEquals("fp1,fp2", eap81HelmChartRelease.getS2iFeaturePacks().stream().collect(Collectors.joining(",")));
Assertions.assertEquals("fp1,fp2",
eap81HelmChartRelease.getS2iFeaturePacks().stream().collect(Collectors.joining(",")));
Assertions.assertEquals("gl1,gl2",
eap81HelmChartRelease.getS2iGalleonLayers().stream().collect(Collectors.joining(",")));
Assertions.assertEquals("ch1", eap81HelmChartRelease.getS2iChannels().stream().collect(Collectors.joining(",")));
Expand Down Expand Up @@ -285,7 +286,8 @@ public void verifyWildFlyDynamicallyFilledAdapterTest() {
Assertions.assertEquals("url", wildflyHelmChartRelease.getSourceRepositoryUrl());
Assertions.assertEquals("ref", wildflyHelmChartRelease.getSourceRepositoryRef());
Assertions.assertEquals("context-dir", wildflyHelmChartRelease.getContextDir());
Assertions.assertEquals("fp1,fp2", wildflyHelmChartRelease.getS2iFeaturePacks().stream().collect(Collectors.joining(",")));
Assertions.assertEquals("fp1,fp2",
wildflyHelmChartRelease.getS2iFeaturePacks().stream().collect(Collectors.joining(",")));
Assertions.assertEquals("gl1,gl2",
wildflyHelmChartRelease.getS2iGalleonLayers().stream().collect(Collectors.joining(",")));
Assertions.assertEquals(Boolean.TRUE, wildflyHelmChartRelease.isBuildEnabled());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,28 +74,28 @@ private HelmChartRelease loadRelease() {
} else if (IntersmashTestsuiteProperties.isProductizedTestExecutionProfileEnabled()) {
// EAP 8.0
if (TestDeploymentProperties.isEap80DeploymentsBuildStreamEnabled()) {
HelmEap8Release helmRelease = HelmChartReleaseAdapter.<HelmEap8Release>fromValuesFile(
HelmEap8Release helmRelease = HelmChartReleaseAdapter.<HelmEap8Release> fromValuesFile(
this.getClass().getResource("eap8-helm-values.yaml"), HelmEap8Release.class);
wildflyHelmChartRelease = new Eap8HelmChartReleaseAdapter(helmRelease)
.withJdk17BuilderImage(IntersmashConfig.wildflyImageURL())
.withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL());
} // EAP 8.1
else if (TestDeploymentProperties.isEap81DeploymentsBuildStreamEnabled()) {
HelmEap81Release helmRelease = HelmChartReleaseAdapter.<HelmEap81Release>fromValuesFile(
HelmEap81Release helmRelease = HelmChartReleaseAdapter.<HelmEap81Release> fromValuesFile(
this.getClass().getResource("eap81-helm-values.yaml"), HelmEap81Release.class);
wildflyHelmChartRelease = new Eap81HelmChartReleaseAdapter(helmRelease)
.withJdk17BuilderImage(IntersmashConfig.wildflyImageURL())
.withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL());
} // EAP XP 5
else if (TestDeploymentProperties.isEapXp5DeploymentsBuildStreamEnabled()) {
HelmXp5Release helmRelease = HelmChartReleaseAdapter.<HelmXp5Release>fromValuesFile(
HelmXp5Release helmRelease = HelmChartReleaseAdapter.<HelmXp5Release> fromValuesFile(
this.getClass().getResource("xp5-helm-values.yaml"), HelmXp5Release.class);
wildflyHelmChartRelease = new EapXp5HelmChartReleaseAdapter(helmRelease)
.withJdk17BuilderImage(IntersmashConfig.wildflyImageURL())
.withJdk17RuntimeImage(IntersmashConfig.wildflyRuntimeImageURL());
} // EAP XP 6
else if (TestDeploymentProperties.isEapXp6DeploymentsBuildStreamEnabled()) {
HelmXp6Release helmRelease = HelmChartReleaseAdapter.<HelmXp6Release>fromValuesFile(
HelmXp6Release helmRelease = HelmChartReleaseAdapter.<HelmXp6Release> fromValuesFile(
this.getClass().getResource("xp6-helm-values.yaml"), HelmXp6Release.class);
wildflyHelmChartRelease = new EapXp6HelmChartReleaseAdapter(helmRelease)
.withJdk17BuilderImage(IntersmashConfig.wildflyImageURL())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,11 @@ public WildflyHelmChartOpenShiftExampleApplication() {
} else if (TestDeploymentProperties.isEapXp6DeploymentsBuildStreamEnabled()) {
release = loadRelease(new EapXp6HelmChartReleaseAdapter(new HelmXp6Release()));
} else
throw new IllegalStateException(String.format("Not a valid WildFly deployments stream! (%s)", TestDeploymentProperties.getWildflyDeploymentsBuildStream()));
throw new IllegalStateException(String.format("Not a valid WildFly deployments stream! (%s)",
TestDeploymentProperties.getWildflyDeploymentsBuildStream()));
} else
throw new IllegalStateException(String.format("Not a valid testing profile! (%s)", TestDeploymentProperties.getWildflyDeploymentsBuildProfile()));
throw new IllegalStateException(String.format("Not a valid testing profile! (%s)",
TestDeploymentProperties.getWildflyDeploymentsBuildProfile()));
}

private HelmChartRelease loadRelease(final WildflyHelmChartRelease release) {
Expand Down

0 comments on commit af77b67

Please sign in to comment.