(jkube-kit/generator/api/) : Migrate tests from JMockit to Mockito(ec…

…lipse-jkube#1593) (eclipse-jkube#1657) * Jmockit to mockito * Update BaseGeneratorTest.java * Update BaseGeneratorTest.java * fix (generator/api) : Add expectations for JavaProject in BaseGeneratorTest.setUp method Add missing mockito expectation for project.getProperties() call. Signed-off-by: Rohan Kumar <rohaan@redhat.com> * Review changes * Update BaseGeneratorTest.java * Review Changes * Update BaseGeneratorTest.java Signed-off-by: Rohan Kumar <rohaan@redhat.com> Co-authored-by: Rohan Kumar <rohaan@redhat.com>
rohanKanojia · Aug 11, 2022 · 06916b6 · 06916b6
1 parent a01c8ff
commit 06916b6
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 139 deletions.
diff --git a/jkube-kit/generator/api/pom.xml b/jkube-kit/generator/api/pom.xml
@@ -52,8 +52,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jmockit</groupId>
-      <artifactId>jmockit</artifactId>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>

diff --git a/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/FromSelectorTest.java b/jkube-kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/FromSelectorTest.java
@@ -21,8 +21,8 @@
 import org.eclipse.jkube.kit.config.image.build.JKubeBuildStrategy;
 import org.eclipse.jkube.kit.config.resource.RuntimeMode;
 import org.eclipse.jkube.kit.config.resource.ProcessorConfig;
-import mockit.Mocked;
 import org.junit.Test;
+import org.mockito.Mock;
 
 import static org.eclipse.jkube.kit.config.image.build.JKubeBuildStrategy.s2i;
 import static org.eclipse.jkube.kit.config.image.build.JKubeBuildStrategy.docker;
@@ -31,14 +31,6 @@
 
 public class FromSelectorTest {
 
-  @Mocked
-  JavaProject project;
-
-  @Mocked
-  Plugin plugin;
-
-  @Mocked
-  KitLogger logger;
 
   @Test
   public void simple() {
@@ -54,9 +46,7 @@ public void simple() {
     };
     for (TestCase tc : testCases) {
       GeneratorContext ctx = GeneratorContext.builder()
-          .project(project)
           .config(new ProcessorConfig())
-          .logger(logger)
           .runtimeMode(tc.runtimeMode)
           .strategy(tc.strategy)
           .build();

diff --git a/...kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/GeneratorManagerTest.java b/...kit/generator/api/src/test/java/org/eclipse/jkube/generator/api/GeneratorManagerTest.java
@@ -20,23 +20,25 @@
 import org.eclipse.jkube.kit.common.KitLogger;
 import org.eclipse.jkube.kit.config.image.ImageConfiguration;
 import org.eclipse.jkube.kit.config.resource.ProcessorConfig;
-
-import mockit.Mocked;
-import mockit.Verifications;
 import org.junit.Before;
 import org.junit.Test;
-
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 public class GeneratorManagerTest {
 
-  @Mocked
   KitLogger logger;
 
   private GeneratorContext generatorContext;
 
   @Before
   public void setUp() throws Exception {
+    logger = spy(new KitLogger.SilentLogger());
     final ProcessorConfig processorConfig = new ProcessorConfig();
     processorConfig.setIncludes(Collections.singletonList("fake-generator"));
     generatorContext = GeneratorContext.builder()
@@ -58,11 +60,7 @@ public void generate_withTestGenerator_shouldProcessImages() {
         .hasSize(1)
         .extracting(ImageConfiguration::getName)
         .contains("processed-by-test");
-    // @formatter:off
-    new Verifications() {{
-      logger.info("Running generator %s", "fake-generator"); times = 1;
-    }};
-    // @formatter:on
+    verify(logger, times(1)).info("Running generator %s", "fake-generator");
   }
 
   // Loaded from META-INF/jkube/generator-default

diff --git a/...api/src/test/java/org/eclipse/jkube/generator/api/support/AbstractPortsExtractorTest.java b/...api/src/test/java/org/eclipse/jkube/generator/api/support/AbstractPortsExtractorTest.java
@@ -15,27 +15,38 @@
 
 import java.util.Map;
 
+import org.eclipse.jkube.generator.api.GeneratorContext;
 import org.eclipse.jkube.generator.api.PortsExtractor;
 import org.eclipse.jkube.kit.common.JavaProject;
+import org.eclipse.jkube.kit.common.KitLogger;
 import org.eclipse.jkube.kit.common.PrefixedLogger;
 import org.eclipse.jkube.kit.common.util.FileUtil;
-import mockit.Expectations;
-import mockit.Mocked;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
 
 public class AbstractPortsExtractorTest {
 
-    @Mocked
     JavaProject project;
-
-    @Mocked
     PrefixedLogger logger;
 
+    @Before
+    public void setUp() throws Exception {
+        project = mock(JavaProject.class);
+        logger = new PrefixedLogger("test", new KitLogger.SilentLogger());
+    }
+
     @Test
     public void testReadConfigFromFile() {
         for (String path : new String[] { ".json", ".yaml",
@@ -101,9 +112,6 @@ public void testNoFile() {
     @Test
     public void testConfigFileDoesNotExist() {
         final String nonExistingFile = "/bla/blub/lalala/config.yml";
-        new Expectations() {{
-            logger.warn(anyString, withEqual(FileUtil.getAbsolutePath(nonExistingFile)));
-        }};
         System.setProperty("vertx.config.test", nonExistingFile);
         try {
             Map<String, Integer> map = extractFromFile("vertx.config.test", null);