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

Jump to bottom

Issue 3404 replace mockito with actual object in wildflyjarhealthcheckenrichertest #3416

Merged
merged 14 commits into from
Oct 10, 2024
Merged

Issue 3404 replace mockito with actual object in wildflyjarhealthcheckenrichertest #3416

Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a5d6dc2
Replaced Mockito.mock by creating actual object
ShivamChavan01 Sep 29, 2024
67d916f
remove redundant initialization of javaProject in setup method
ShivamChavan01 Sep 30, 2024
60fdb76
index on issue-#3407-replace-mockito.mock-by-creating-actual-object: …
ShivamChavan01 Sep 30, 2024
79a37f7
WIP on issue-#3407-replace-mockito.mock-by-creating-actual-object: 67…
ShivamChavan01 Sep 30, 2024
16a83bd
#3404 Replaced Mockito.mock with actual object creation in WildflyJAR…
ShivamChavan01 Oct 1, 2024
8838777
#3404 Replaced Mockito.mock with actual object creation in WildflyJAR…
ShivamChavan01 Oct 1, 2024
16e56cb
Replace Mockito mocks with actual objects in WildflyJARHealthCheckEnr…
ShivamChavan01 Oct 2, 2024
715e647
Replace Mockito mocks with actual objects in WildflyJARHealthCheckEnr…
ShivamChavan01 Oct 2, 2024
4c04880
Reverted some lines
ShivamChavan01 Oct 3, 2024
0f21fba
Cleaned up the code by removing extra spaces in the WildflyJARHealthC…
ShivamChavan01 Oct 3, 2024
74408be
Merge branch 'eclipse-jkube:master' into issue-3404-replace-mockito-w…
ShivamChavan01 Oct 4, 2024
4c53033
Merge remote-tracking branch 'origin/issue-3404-replace-mockito-with-…
ShivamChavan01 Oct 4, 2024
34efd87
Using context.getProject() for ProjectBuilder to retain updates
ShivamChavan01 Oct 8, 2024
f4b9d48
Changing the intialzation of the Context
ShivamChavan01 Oct 9, 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
41 changes: 25 additions & 16 deletions ...c/test/java/org/eclipse/jkube/wildfly/jar/enricher/WildflyJARHealthCheckEnricherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@
import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;


class WildflyJARHealthCheckEnricherTest {

Expand All @@ -53,9 +51,10 @@ class WildflyJARHealthCheckEnricherTest {

@BeforeEach
public void setUp() {
context = mock(JKubeEnricherContext.class, RETURNS_DEEP_STUBS);
project = mock(JavaProject.class);
when(context.getProject()).thenReturn(project);
project = JavaProject.builder().build();
context = JKubeEnricherContext.builder()
.project(project)
.build();
}
private void setupExpectations(Map<String, Object> bootableJarConfig, Map<String, Map<String, Object>> jkubeConfig) {
Plugin plugin = Plugin.builder().artifactId("wildfly-jar-maven-plugin").groupId("org.wildfly.plugins")
Expand All @@ -65,16 +64,20 @@ private void setupExpectations(Map<String, Object> bootableJarConfig, Map<String
ProcessorConfig c = new ProcessorConfig(null, null, jkubeConfig);
Configuration.ConfigurationBuilder configBuilder = Configuration.builder();
configBuilder.processorConfig(c);
when(project.getPlugins()).thenReturn(lst);
when(context.getProject()).thenReturn(project);
when(context.getConfiguration()).thenReturn(configBuilder.build());
context = context.toBuilder()
.project(project.toBuilder()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than creating a builder instance from member field project you should create it from context itself so that you don't lose changes done in context.getProject() after test setup

Suggested change
.project(project.toBuilder()
.project(context.getProject().toBuilder()

.plugins(lst).build())
.processorConfig(c)
.build();
}

private void setupExpectations(Map<String, Map<String, Object>> jkubeConfig) {
ProcessorConfig c = new ProcessorConfig(null, null, jkubeConfig);
Configuration.ConfigurationBuilder configBuilder = Configuration.builder();
configBuilder.processorConfig(c);
when(context.getConfiguration()).thenReturn(configBuilder.build());
context = context.toBuilder()
.processorConfig(c)
.build();
}

@Test
Expand Down Expand Up @@ -161,7 +164,7 @@ void withCustomConfigurationComingFromConf_withWildflyJarBefore25_0shouldNotAdd_
@Test
@DisplayName("custom configuration with wildfly jar version after 25.0, should add startup probe")
void withCustomConfigurationComingFromConf_withWildflyJarAfter25_0shouldAdd_startupProbe() {
wildFlyJarDependencyWithVersion( "26.1.1.Final");
wildFlyJarDependencyWithVersion("26.1.1.Final");
Map<String, Object> jarConfig = new HashMap<>();
jarConfig.put("cloud", null);
Map<String, Map<String, Object>> config = createFakeConfig(
Expand Down Expand Up @@ -291,11 +294,17 @@ public void visit(ContainerBuilder containerBuilder) {
}

private void wildFlyJarDependencyWithVersion(String wildflyJarVersion) {
when(project.getDependencies()).thenReturn(Collections.singletonList(Dependency.builder()
.groupId("org.wildfly.plugins")
.artifactId("wildfly-jar-maven-plugin")
.version(wildflyJarVersion)
.build()));
context = context.toBuilder()
.project(project.toBuilder()
.dependency(Dependency.builder()
.groupId("org.wildfly.plugins")
.artifactId("wildfly-jar-maven-plugin")
.version(wildflyJarVersion)
.build())
.build())
.build();


}

@SuppressWarnings("unchecked")
Expand Down