optimize imports, update junit to 5.4, fix visibility of test methods and tes classes

Author: Pazus

pom.xml

@@ -14,8 +14,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <junit.platform.version>1.0.3</junit.platform.version>
-        <junit.jupiter.version>5.0.3</junit.jupiter.version>
+        <junit.jupiter.version>5.4.0</junit.jupiter.version>
         <travisBuildNumber>local</travisBuildNumber>
     </properties>
 
@@ -58,13 +57,7 @@
       <!-- Test -->
       <dependency>
           <groupId>org.junit.jupiter</groupId>
-          <artifactId>junit-jupiter-api</artifactId>
-          <version>${junit.jupiter.version}</version>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.junit.jupiter</groupId>
-          <artifactId>junit-jupiter-engine</artifactId>
+          <artifactId>junit-jupiter</artifactId>
           <version>${junit.jupiter.version}</version>
           <scope>test</scope>
       </dependency>
@@ -94,24 +87,17 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.19.1</version>
+            <version>2.22.0</version>
             <configuration>
                 <excludes>
                     <exclude>**/*IT.java</exclude>
                 </excludes>
             </configuration>
-            <dependencies>
-                <dependency>
-                    <groupId>org.junit.platform</groupId>
-                    <artifactId>junit-platform-surefire-provider</artifactId>
-                    <version>${junit.platform.version}</version>
-                </dependency>
-            </dependencies>
         </plugin>
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.19.1</version>
+            <version>2.22.0</version>
             <executions>
                 <execution>
                     <goals>
@@ -120,13 +106,6 @@
                     </goals>
                 </execution>
             </executions>
-            <dependencies>
-                <dependency>
-                    <groupId>org.junit.platform</groupId>
-                    <artifactId>junit-platform-surefire-provider</artifactId>
-                    <version>${junit.platform.version}</version>
-                </dependency>
-            </dependencies>
         </plugin>
     </plugins>
       <resources>

src/test/java/org/utplsql/cli/CliHelpTest.java

@@ -2,10 +2,10 @@
 
 import org.junit.jupiter.api.Test;
 
-public class CliHelpTest {
+class CliHelpTest {
 
     @Test
-    public void showBasicHelp() {
+    void showBasicHelp() {
         TestHelper.runApp("help");
     }
 }

src/test/java/org/utplsql/cli/CliVersionInfoTest.java

@@ -4,7 +4,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class CliVersionInfoTest {
+class CliVersionInfoTest {
 
     @Test
     void getCliVersionInfo() {

src/test/java/org/utplsql/cli/ConnectionInfoTest.java

@@ -11,12 +11,12 @@
 /**
  * Created by Vinicius on 18/06/2017.
  */
-public class FileWalkerTest {
+class FileWalkerTest {
 
     private final File BASE_DIR = new File(new File("").getAbsolutePath(), "assets/demo_project");
 
     @Test
-    public void fileWalker_Relative() {
+    void fileWalker_Relative() {
         List<String> fileList = new FileWalker().getFileList(BASE_DIR, "source");
         Collections.sort(fileList);
         assertArrayEquals(new Object[] {
@@ -28,7 +28,7 @@ public void fileWalker_Relative() {
     }
 
     @Test
-    public void fileWalker_Absolute() {
+    void fileWalker_Absolute() {
         List<String> fileList = new FileWalker().getFileList(BASE_DIR, "source", false);
         Collections.sort(fileList);
         assertArrayEquals(new Object[] {

src/test/java/org/utplsql/cli/FileWalkerTest.java

@@ -10,18 +10,18 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class HelpCommandTest {
+class HelpCommandTest {
 
 
     private SystemOutCapturer capturer;
 
     @BeforeEach
-    public void setupCaptureSystemOut() {
+    void setupCaptureSystemOut() {
         capturer = new SystemOutCapturer();
     }
 
     @Test
-    public void callHelp() {
+    void callHelp() {
 
         capturer.start();
         int result = TestHelper.runApp("-h");
@@ -32,7 +32,7 @@ public void callHelp() {
     }
 
     @Test
-    public void callWithNoArgs() {
+    void callWithNoArgs() {
 
         capturer.start();
         int result = TestHelper.runApp();
@@ -43,7 +43,7 @@ public void callWithNoArgs() {
     }
 
     @AfterEach
-    public void cleanupCaptureSystemOut() throws IOException {
+    void cleanupCaptureSystemOut() throws IOException {
         capturer.stop();
     }
 }

src/test/java/org/utplsql/cli/HelpCommandTest.java

@@ -4,10 +4,10 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ReportersCommandIT {
+class ReportersCommandIT {
 
     @Test
-    public void callReportersWorks() {
+    void callReportersWorks() {
 
         int result = TestHelper.runApp("reporters", TestHelper.getConnectionString());
 

src/test/java/org/utplsql/cli/ReportersCommandIT.java

@@ -7,7 +7,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class RunCommandConfigLevelTest {
+class RunCommandConfigLevelTest {
 
     private Logger getRootLogger() {
         return (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);

src/test/java/org/utplsql/cli/RunCommandConfigLevelTest.java

@@ -9,22 +9,22 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * System tests for Code Coverage Reporter
  *
  * @author pesse
  */
-public class RunCommandCoverageReporterIT extends AbstractFileOutputTest {
+class RunCommandCoverageReporterIT extends AbstractFileOutputTest {
 
     private static final Pattern REGEX_COVERAGE_TITLE = Pattern.compile("<a href=\"[a-zA-Z0-9#]+\" class=\"src_link\" title=\"[a-zA-Z\\._]+\">([a-zA-Z0-9\\._]+)<\\/a>");
 
 
     private String getTempCoverageFileName(int counter) {
 
-        return "tmpCoverage_" + String.valueOf(System.currentTimeMillis()) + "_" + String.valueOf(counter) + ".html";
+        return "tmpCoverage_" + System.currentTimeMillis() + "_" + counter + ".html";
     }
 
     /**
@@ -68,7 +68,7 @@ private boolean hasCoverageListed(String content, String packageName) {
     }
 
     @Test
-    public void run_CodeCoverageWithIncludeAndExclude() throws Exception {
+    void run_CodeCoverageWithIncludeAndExclude() throws Exception {
 
         Path coveragePath = getTempCoverageFilePath();
 
@@ -78,14 +78,14 @@ public void run_CodeCoverageWithIncludeAndExclude() throws Exception {
 
         String content = new String(Files.readAllBytes(coveragePath));
 
-        assertEquals(true, hasCoverageListed(content, "app.remove_rooms_by_name"));
-        assertEquals(false, hasCoverageListed(content, "app.award_bonus"));
-        assertEquals(false, hasCoverageListed(content, "app.betwnstr"));
+        assertTrue(hasCoverageListed(content, "app.remove_rooms_by_name"));
+        assertFalse(hasCoverageListed(content, "app.award_bonus"));
+        assertFalse(hasCoverageListed(content, "app.betwnstr"));
 
     }
 
     @Test
-    public void coverageReporterWriteAssetsToOutput() throws Exception {
+    void coverageReporterWriteAssetsToOutput() throws Exception {
         Path coveragePath = getTempCoverageFilePath();
         Path coverageAssetsPath = Paths.get(coveragePath.toString() + "_assets");
 
@@ -110,7 +110,7 @@ public void coverageReporterWriteAssetsToOutput() throws Exception {
     }
 
     @Test
-    public void coverageReporterWriteAssetsToSubfolder() throws Exception {
+    void coverageReporterWriteAssetsToSubfolder() throws Exception {
 
         Path origCoveratePath = getTempCoverageFilePath();
         Path coveragePath = Paths.get(origCoveratePath.toString(), origCoveratePath.toString());

src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java

@@ -11,10 +11,10 @@
 /**
  * System tests for run command.
  */
-public class RunCommandIT extends AbstractFileOutputTest {
+class RunCommandIT extends AbstractFileOutputTest {
 
     @Test
-    public void run_Default() throws Exception {
+    void run_Default() throws Exception {
 
         int result = TestHelper.runApp("run",
                 TestHelper.getConnectionString(),
@@ -31,7 +31,7 @@ public void run_Default() throws Exception {
     }
 
     @Test
-    public void run_Debug() throws Exception {
+    void run_Debug() throws Exception {
 
         int result = TestHelper.runApp("run",
                 TestHelper.getConnectionString(),
@@ -41,7 +41,7 @@ public void run_Debug() throws Exception {
     }
 
     @Test
-    public void run_MultipleReporters() throws Exception {
+    void run_MultipleReporters() throws Exception {
 
         String outputFileName = "output_" + System.currentTimeMillis() + ".xml";
         addTempPath(Paths.get(outputFileName));