Import mockStatic method staticly in tests.

Author: Aleksi Salmela

src/test/java/fi/helsinki/cs/tmc/cli/command/CourseInfoCommandTest.java

@@ -8,6 +8,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.io.TestIo;
@@ -21,7 +22,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -69,7 +69,7 @@ public void setUp() {
         exercises.get(0).setCompleted(true);
         course.setExercises(exercises);
 
-        PowerMockito.mockStatic(TmcUtil.class);
+        mockStatic(TmcUtil.class);
     }
 
     @Test

src/test/java/fi/helsinki/cs/tmc/cli/command/ListExercisesCommandTest.java

@@ -1,7 +1,6 @@
 package fi.helsinki.cs.tmc.cli.command;
 
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;

src/test/java/fi/helsinki/cs/tmc/cli/command/LogoutCommandTest.java

@@ -1,6 +1,7 @@
 package fi.helsinki.cs.tmc.cli.command;
 
 import static org.mockito.Mockito.times;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.verifyStatic;
 
 import fi.helsinki.cs.tmc.cli.Application;
@@ -10,7 +11,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -26,7 +26,7 @@ public void setUp() {
         io = new TestIo();
         app = new Application(io);
 
-        PowerMockito.mockStatic(SettingsIo.class);
+        mockStatic(SettingsIo.class);
     }
 
     @Test

src/test/java/fi/helsinki/cs/tmc/cli/command/SubmitCommandTest.java

@@ -6,6 +6,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.verifyStatic;
 
 import fi.helsinki.cs.tmc.cli.Application;
@@ -84,12 +85,12 @@ public void setUp() {
         result = new SubmissionResult();
         result2 = new SubmissionResult();
 
-        PowerMockito.mockStatic(TmcUtil.class);
+        mockStatic(TmcUtil.class);
         when(TmcUtil.findCourse(any(TmcCore.class), any(String.class))).thenReturn(course);
         when(TmcUtil.submitExercise(any(TmcCore.class), any(Exercise.class)))
                 .thenReturn(result).thenReturn(result2);
 
-        PowerMockito.mockStatic(CourseInfoIo.class);
+        mockStatic(CourseInfoIo.class);
         when(CourseInfoIo.load(any(Path.class))).thenCallRealMethod();
         when(CourseInfoIo.save(any(CourseInfo.class), any(Path.class))).thenReturn(true);
     }

src/test/java/fi/helsinki/cs/tmc/cli/io/ColorTest.java

@@ -2,11 +2,11 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -16,7 +16,7 @@ public class ColorTest {
 
     @Before
     public void setup() {
-        PowerMockito.mockStatic(EnvironmentUtil.class);
+        mockStatic(EnvironmentUtil.class);
     }
 
     @Test

src/test/java/fi/helsinki/cs/tmc/cli/io/EnvironmentUtilTest.java

@@ -4,6 +4,7 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -20,8 +21,8 @@ public class EnvironmentUtilTest {
 
     @Before
     public void setUp() {
-        PowerMockito.mockStatic(System.class);
-        PowerMockito.mockStatic(Class.class);
+        mockStatic(System.class);
+        mockStatic(Class.class);
     }
 
     @Test

src/test/java/fi/helsinki/cs/tmc/cli/io/ShutdownHandlerTest.java

@@ -1,15 +1,14 @@
 package fi.helsinki.cs.tmc.cli.io;
 
-import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.when;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -25,7 +24,7 @@ public class ShutdownHandlerTest {
     public void setUp() {
         io = new TestIo();
         shutdownHandler = new ShutdownHandler(io);
-        PowerMockito.mockStatic(Runtime.class);
+        mockStatic(Runtime.class);
 
         mockedRuntime = mock(Runtime.class);
         when(Runtime.getRuntime()).thenReturn(mockedRuntime);

src/test/java/fi/helsinki/cs/tmc/cli/io/TmcCliProgressObserverTest.java

@@ -2,12 +2,12 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.when;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -20,7 +20,7 @@ public class TmcCliProgressObserverTest {
     @Before
     public void setup() {
         this.io = new TestIo();
-        PowerMockito.mockStatic(EnvironmentUtil.class);
+        mockStatic(EnvironmentUtil.class);
         when(EnvironmentUtil.getTerminalWidth()).thenReturn(50);
     }