diff --git a/pom.xml b/pom.xml index cb09913..6639f5f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,8 +14,7 @@ UTF-8 1.8 1.8 - 1.0.3 - 5.0.3 + 5.4.0 local @@ -58,13 +57,7 @@ org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-engine + junit-jupiter ${junit.jupiter.version} test @@ -94,24 +87,17 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 2.22.0 **/*IT.java - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - org.apache.maven.plugins maven-failsafe-plugin - 2.19.1 + 2.22.0 @@ -120,13 +106,6 @@ - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - diff --git a/src/main/java/org/utplsql/cli/CliVersionInfo.java b/src/main/java/org/utplsql/cli/CliVersionInfo.java index 695bd91..965ae23 100644 --- a/src/main/java/org/utplsql/cli/CliVersionInfo.java +++ b/src/main/java/org/utplsql/cli/CliVersionInfo.java @@ -14,16 +14,14 @@ */ public class CliVersionInfo { - private static final String MAVEN_PROJECT_NAME = "utPLSL-cli"; + private static final String MAVEN_PROJECT_NAME = "utPLSQL-cli"; private static String MAVEN_PROJECT_VERSION = "unknown"; static { try { - try ( InputStream in = JavaApiVersionInfo.class.getClassLoader().getResourceAsStream("utplsql-cli.version")) { - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + try ( InputStream in = JavaApiVersionInfo.class.getClassLoader().getResourceAsStream("utplsql-cli.version"); + BufferedReader reader = new BufferedReader(new InputStreamReader(in)) ) { MAVEN_PROJECT_VERSION = reader.readLine(); - - reader.close(); } } catch ( IOException e ) { diff --git a/src/main/java/org/utplsql/cli/CommandProvider.java b/src/main/java/org/utplsql/cli/CommandProvider.java index 5298143..2a03fd8 100644 --- a/src/main/java/org/utplsql/cli/CommandProvider.java +++ b/src/main/java/org/utplsql/cli/CommandProvider.java @@ -6,10 +6,10 @@ import java.util.Map; import java.util.stream.Stream; -public class CommandProvider { +class CommandProvider { - private Map commands; - private JCommander jCommander; + private final Map commands = new HashMap<>(); + private final JCommander jCommander; public CommandProvider( JCommander jCommander ) { this.jCommander = jCommander; @@ -17,8 +17,6 @@ public CommandProvider( JCommander jCommander ) { } private void init() { - commands = new HashMap<>(); - addCommand(new RunCommand()); addCommand(new VersionInfoCommand()); addCommand(new ReportersCommand()); diff --git a/src/main/java/org/utplsql/cli/ConnectionInfo.java b/src/main/java/org/utplsql/cli/ConnectionInfo.java index 7b48e87..cada238 100644 --- a/src/main/java/org/utplsql/cli/ConnectionInfo.java +++ b/src/main/java/org/utplsql/cli/ConnectionInfo.java @@ -5,7 +5,7 @@ public class ConnectionInfo { public static final String COMMANDLINE_PARAM_DESCRIPTION = "/@//[:]/ OR /@ OR /@::"; - private String connectionInfo; + private final String connectionInfo; public ConnectionInfo(String connectionInfo) { this.connectionInfo = connectionInfo; diff --git a/src/main/java/org/utplsql/cli/ConnectionInfoBuilder.java b/src/main/java/org/utplsql/cli/ConnectionInfoBuilder.java deleted file mode 100644 index b573927..0000000 --- a/src/main/java/org/utplsql/cli/ConnectionInfoBuilder.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.utplsql.cli; - -public class ConnectionInfoBuilder { - -} diff --git a/src/main/java/org/utplsql/cli/HelpCommand.java b/src/main/java/org/utplsql/cli/HelpCommand.java index 6d0c27b..0925694 100644 --- a/src/main/java/org/utplsql/cli/HelpCommand.java +++ b/src/main/java/org/utplsql/cli/HelpCommand.java @@ -7,11 +7,12 @@ */ public class HelpCommand implements ICommand { - private String errorMessage; - private JCommander jCommander; + private final String errorMessage; + private final JCommander jCommander; public HelpCommand(JCommander jCommander) { this.jCommander = jCommander; + this.errorMessage = null; } public HelpCommand( JCommander jCommander, String errorMessage ) { diff --git a/src/main/java/org/utplsql/cli/ReporterFactoryProvider.java b/src/main/java/org/utplsql/cli/ReporterFactoryProvider.java index 3226054..828a5a9 100644 --- a/src/main/java/org/utplsql/cli/ReporterFactoryProvider.java +++ b/src/main/java/org/utplsql/cli/ReporterFactoryProvider.java @@ -12,7 +12,7 @@ * * @author pesse */ -public class ReporterFactoryProvider { +class ReporterFactoryProvider { public static ReporterFactory createReporterFactory(CompatibilityProxy proxy ) { ReporterFactory reporterFactory = ReporterFactory.createDefault(proxy); diff --git a/src/main/java/org/utplsql/cli/ReporterManager.java b/src/main/java/org/utplsql/cli/ReporterManager.java index eed17a8..3c33575 100644 --- a/src/main/java/org/utplsql/cli/ReporterManager.java +++ b/src/main/java/org/utplsql/cli/ReporterManager.java @@ -118,5 +118,5 @@ public List getReporterOptionsList() { return reporterOptionsList; } - public int getNumberOfReporters() { return reporterOptionsList.size(); }; + public int getNumberOfReporters() { return reporterOptionsList.size(); } } diff --git a/src/main/java/org/utplsql/cli/RunCommand.java b/src/main/java/org/utplsql/cli/RunCommand.java index 4142f9a..5234066 100644 --- a/src/main/java/org/utplsql/cli/RunCommand.java +++ b/src/main/java/org/utplsql/cli/RunCommand.java @@ -116,14 +116,10 @@ public class RunCommand implements ICommand { private ReporterFactory reporterFactory; private ReporterManager reporterManager; - public ConnectionInfo getConnectionInfo() { + private ConnectionInfo getConnectionInfo() { return connectionInfoList.get(0); } - public List getTestPaths() { - return testPaths; - } - void init() { LoggerConfiguration.ConfigLevel level = LoggerConfiguration.ConfigLevel.BASIC; @@ -144,7 +140,6 @@ public int run() { try { final List reporterList; - final List testPaths = getTestPaths(); final File baseDir = new File("").getAbsoluteFile(); final FileMapperOptions[] sourceMappingOptions = {null}; @@ -155,23 +150,8 @@ public int run() { sourceMappingOptions[0] = getFileMapperOptionsByParamListItem(this.sourcePathParams, baseDir); testMappingOptions[0] = getFileMapperOptionsByParamListItem(this.testPathParams, baseDir); - ArrayList includeObjectsList; - ArrayList excludeObjectsList; - - if (includeObjects != null && !includeObjects.isEmpty()) { - includeObjectsList = new ArrayList<>(Arrays.asList(includeObjects.split(","))); - } else { - includeObjectsList = new ArrayList<>(); - } - - if (excludeObjects != null && !excludeObjects.isEmpty()) { - excludeObjectsList = new ArrayList<>(Arrays.asList(excludeObjects.split(","))); - } else { - excludeObjectsList = new ArrayList<>(); - } - - final ArrayList finalIncludeObjectsList = includeObjectsList; - final ArrayList finalExcludeObjectsList = excludeObjectsList; + final List finalIncludeObjectsList = getObjectList(includeObjects); + final List finalExcludeObjectsList = getObjectList(excludeObjects); final DataSource dataSource = DataSourceProvider.getDataSource(getConnectionInfo(), getReporterManager().getNumberOfReporters() + 1); @@ -231,6 +211,16 @@ public int run() { return 1; } + private ArrayList getObjectList(String includeObjects) { + ArrayList includeObjectsList; + if (includeObjects != null && !includeObjects.isEmpty()) { + includeObjectsList = new ArrayList<>(Arrays.asList(includeObjects.split(","))); + } else { + includeObjectsList = new ArrayList<>(); + } + return includeObjectsList; + } + @Override public String getCommand() { return "run"; @@ -239,7 +229,7 @@ public String getCommand() { private void outputMainInformation() { - StringBlockFormatter formatter = new StringBlockFormatter("utPLCSL cli"); + StringBlockFormatter formatter = new StringBlockFormatter("utPLSQL cli"); formatter.appendLine(CliVersionInfo.getInfo()); formatter.appendLine(JavaApiVersionInfo.getInfo()); formatter.appendLine("Java-Version: " + System.getProperty("java.version")); @@ -317,7 +307,7 @@ private CompatibilityProxy checkFrameworkCompatibility(Connection conn) throws S return proxy; } - public FileMapperOptions getMapperOptions(List mappingParams, List filePaths) { + private FileMapperOptions getMapperOptions(List mappingParams, List filePaths) { FileMapperOptions mapperOptions = new FileMapperOptions(filePaths); final String OPT_OWNER="-owner="; @@ -364,17 +354,6 @@ public FileMapperOptions getMapperOptions(List mappingParams, List getReporterOptionsList() { + List getReporterOptionsList() { return getReporterManager().getReporterOptionsList(); } } diff --git a/src/main/java/org/utplsql/cli/VersionInfoCommand.java b/src/main/java/org/utplsql/cli/VersionInfoCommand.java index 22f70d4..cc636e4 100644 --- a/src/main/java/org/utplsql/cli/VersionInfoCommand.java +++ b/src/main/java/org/utplsql/cli/VersionInfoCommand.java @@ -23,7 +23,7 @@ public class VersionInfoCommand implements ICommand { description = ConnectionInfo.COMMANDLINE_PARAM_DESCRIPTION) private List connectionInfoList = new ArrayList<>(); - public ConnectionInfo getConnectionInfo() { + private ConnectionInfo getConnectionInfo() { if ( connectionInfoList != null && connectionInfoList.size() > 0 ) return connectionInfoList.get(0); else diff --git a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java index a0bc3ab..a9474f5 100644 --- a/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java +++ b/src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java @@ -23,7 +23,7 @@ interface ConnectStringPossibility { private static final Logger logger = LoggerFactory.getLogger(TestedDataSourceProvider.class); private final ConnectionConfig config; - private List possibilities = new ArrayList<>(); + private final List possibilities = new ArrayList<>(); public TestedDataSourceProvider(ConnectionConfig config) { this.config = config; @@ -52,8 +52,8 @@ private void setThickOrThinJdbcUrl(HikariDataSource ds ) throws SQLException for (ConnectStringPossibility possibility : possibilities) { ds.setJdbcUrl(possibility.getConnectString(config)); - try (Connection con = ds.getConnection()) { - logger.info("Use connectstring {}", possibility.getMaskedConnectString(config)); + try (Connection ignored = ds.getConnection()) { + logger.info("Use connection string {}", possibility.getMaskedConnectString(config)); return; } catch (UnsatisfiedLinkError | Exception e) { errors.add(possibility.getMaskedConnectString(config) + ": " + e.getMessage()); diff --git a/src/main/java/org/utplsql/cli/log/StringBlockFormatter.java b/src/main/java/org/utplsql/cli/log/StringBlockFormatter.java index d73656f..beb82a9 100644 --- a/src/main/java/org/utplsql/cli/log/StringBlockFormatter.java +++ b/src/main/java/org/utplsql/cli/log/StringBlockFormatter.java @@ -3,7 +3,7 @@ public class StringBlockFormatter { private String headline; - private StringBuilder content = new StringBuilder(); + private final StringBuilder content = new StringBuilder(); public StringBlockFormatter() {} diff --git a/src/test/java/org/utplsql/cli/CliHelpTest.java b/src/test/java/org/utplsql/cli/CliHelpTest.java index 6e87370..23f5c56 100644 --- a/src/test/java/org/utplsql/cli/CliHelpTest.java +++ b/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"); } } diff --git a/src/test/java/org/utplsql/cli/CliVersionInfoTest.java b/src/test/java/org/utplsql/cli/CliVersionInfoTest.java index 40fab0c..28db14c 100644 --- a/src/test/java/org/utplsql/cli/CliVersionInfoTest.java +++ b/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() { diff --git a/src/test/java/org/utplsql/cli/ConnectionInfoTest.java b/src/test/java/org/utplsql/cli/ConnectionInfoTest.java deleted file mode 100644 index 2fdc9c4..0000000 --- a/src/test/java/org/utplsql/cli/ConnectionInfoTest.java +++ /dev/null @@ -1,130 +0,0 @@ -package org.utplsql.cli; - -/** - * Created by Vinicius on 21/04/2017. - */ -public class ConnectionInfoTest { - - /** - * Regex pattern to match following connection strings: - * user/pass@host:port/db - * user/pass@host/db - * user/pass@db - */ - -// @Test -// public void valid_Full() { -// try { -// ConnectionInfo ci = new ConnectionInfo() -// .parseConnectionString("my_user/p@ss!@some.server.123-abc.com:3000/db_1.acme.com"); -// Assert.assertEquals("my_user", ci.getUser()); -// Assert.assertEquals("p@ss!", ci.getPassword()); -// Assert.assertEquals("some.server.123-abc.com", ci.getHost()); -// Assert.assertEquals(3000, ci.getPort()); -// Assert.assertEquals("db_1.acme.com", ci.getDatabase()); -// Assert.assertEquals("my_user@some.server.123-abc.com:3000/db_1.acme.com", ci.toString()); -// Assert.assertEquals("jdbc:oracle:thin:@//some.server.123-abc.com:3000/db_1.acme.com", ci.getConnectionUrl()); -// } catch (Exception e) { -// Assert.fail(e.getMessage()); -// } -// } -// -// @Test -// public void valid_WithoutPort() { -// try { -// ConnectionInfo ci = new ConnectionInfo() -// .parseConnectionString("my_user/p@ss!@some.server.123-abc.com/db_1.acme.com"); -// Assert.assertEquals("my_user", ci.getUser()); -// Assert.assertEquals("p@ss!", ci.getPassword()); -// Assert.assertEquals("some.server.123-abc.com", ci.getHost()); -// Assert.assertEquals(1521, ci.getPort()); -// Assert.assertEquals("db_1.acme.com", ci.getDatabase()); -// Assert.assertEquals("my_user@some.server.123-abc.com:1521/db_1.acme.com", ci.toString()); -// Assert.assertEquals("jdbc:oracle:thin:@//some.server.123-abc.com:1521/db_1.acme.com", ci.getConnectionUrl()); -// } catch (Exception e) { -// Assert.fail(e.getMessage()); -// } -// } -// -// @Test -// public void valid_WithoutHostAndPort() { -// try { -// ConnectionInfo ci = new ConnectionInfo() -// .parseConnectionString("my_user/p@ss!@127.0.0.1/db_1.acme.com"); -// Assert.assertEquals("my_user", ci.getUser()); -// Assert.assertEquals("p@ss!", ci.getPassword()); -// Assert.assertEquals("127.0.0.1", ci.getHost()); -// Assert.assertEquals(1521, ci.getPort()); -// Assert.assertEquals("db_1.acme.com", ci.getDatabase()); -// Assert.assertEquals("my_user@127.0.0.1:1521/db_1.acme.com", ci.toString()); -// Assert.assertEquals("jdbc:oracle:thin:@//127.0.0.1:1521/db_1.acme.com", ci.getConnectionUrl()); -// } catch (Exception e) { -// Assert.fail(e.getMessage()); -// } -// } -// -// @Test -// public void invalid_WithoutDatabase_1() { -// try { -// new ConnectionInfo().parseConnectionString("user/pass@"); -// Assert.fail(); -// } catch (ParameterException ignored) {} -// } -// -// @Test -// public void invalid_WithoutDatabase_2() { -// try { -// new ConnectionInfo().parseConnectionString("user/pass"); -// Assert.fail(); -// } catch (ParameterException ignored) {} -// } -// -// @Test -// public void invalid_WithoutDatabase_3() { -// try { -// new ConnectionInfo().parseConnectionString("user/pass@localhost:1521"); -// Assert.fail(); -// } catch (ParameterException ignored) {} -// } -// -// @Test -// public void invalid_WithoutHost() { -// try { -// new ConnectionInfo().parseConnectionString("user/pass@/db"); -// Assert.fail(); -// } catch (ParameterException ignored) {} -// } -// -// @Test -// public void invalid_WithoutPassword() { -// try { -// new ConnectionInfo().parseConnectionString("user/@db"); -// Assert.fail(); -// } catch (ParameterException ignored) {} -// } -// -// @Test -// public void invalid_WithoutUsername() { -// try { -// new ConnectionInfo().parseConnectionString("/pass@db"); -// Assert.fail(); -// } catch (ParameterException ignored) {} -// } -// -// @Test -// public void invalid_WithoutUserPassDb_1() { -// try { -// new ConnectionInfo().parseConnectionString("/@db"); -// Assert.fail(); -// } catch (ParameterException ignored) {} -// } -// -// @Test -// public void invalid_WithoutUserPass() { -// try { -// new ConnectionInfo().parseConnectionString("@db"); -// Assert.fail(); -// } catch (ParameterException ignored) {} -// } - -} diff --git a/src/test/java/org/utplsql/cli/FileWalkerTest.java b/src/test/java/org/utplsql/cli/FileWalkerTest.java index 9c00a8d..6ec2e1b 100644 --- a/src/test/java/org/utplsql/cli/FileWalkerTest.java +++ b/src/test/java/org/utplsql/cli/FileWalkerTest.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 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 fileList = new FileWalker().getFileList(BASE_DIR, "source", false); Collections.sort(fileList); assertArrayEquals(new Object[] { diff --git a/src/test/java/org/utplsql/cli/HelpCommandTest.java b/src/test/java/org/utplsql/cli/HelpCommandTest.java index 762ebe4..a22928f 100644 --- a/src/test/java/org/utplsql/cli/HelpCommandTest.java +++ b/src/test/java/org/utplsql/cli/HelpCommandTest.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(); } } diff --git a/src/test/java/org/utplsql/cli/ReportersCommandIT.java b/src/test/java/org/utplsql/cli/ReportersCommandIT.java index 91a90d7..1bf443f 100644 --- a/src/test/java/org/utplsql/cli/ReportersCommandIT.java +++ b/src/test/java/org/utplsql/cli/ReportersCommandIT.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()); diff --git a/src/test/java/org/utplsql/cli/RunCommandConfigLevelTest.java b/src/test/java/org/utplsql/cli/RunCommandConfigLevelTest.java index 411a0e3..e6263ce 100644 --- a/src/test/java/org/utplsql/cli/RunCommandConfigLevelTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandConfigLevelTest.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); diff --git a/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java b/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java index a8cd82d..bf67f7f 100644 --- a/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java +++ b/src/test/java/org/utplsql/cli/RunCommandCoverageReporterIT.java @@ -9,7 +9,7 @@ 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; /** @@ -17,14 +17,14 @@ * * @author pesse */ -public class RunCommandCoverageReporterIT extends AbstractFileOutputTest { +class RunCommandCoverageReporterIT extends AbstractFileOutputTest { private static final Pattern REGEX_COVERAGE_TITLE = Pattern.compile("([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()); diff --git a/src/test/java/org/utplsql/cli/RunCommandIT.java b/src/test/java/org/utplsql/cli/RunCommandIT.java index fbf35e5..a6373fb 100644 --- a/src/test/java/org/utplsql/cli/RunCommandIT.java +++ b/src/test/java/org/utplsql/cli/RunCommandIT.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)); diff --git a/src/test/java/org/utplsql/cli/RunCommandTest.java b/src/test/java/org/utplsql/cli/RunCommandTest.java index 5658e59..84eccdc 100644 --- a/src/test/java/org/utplsql/cli/RunCommandTest.java +++ b/src/test/java/org/utplsql/cli/RunCommandTest.java @@ -10,10 +10,10 @@ /** * Unit test for run command. */ -public class RunCommandTest { +class RunCommandTest { @Test - public void reporterOptions_Default() { + void reporterOptions_Default() { RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString()); List reporterOptionsList = runCmd.getReporterOptionsList(); @@ -26,7 +26,7 @@ public void reporterOptions_Default() { } @Test - public void reporterOptions_OneReporter() { + void reporterOptions_OneReporter() { RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-o=output.txt"); List reporterOptionsList = runCmd.getReporterOptionsList(); @@ -39,7 +39,7 @@ public void reporterOptions_OneReporter() { } @Test - public void reporterOptions_OneReporterForceScreen() { + void reporterOptions_OneReporterForceScreen() { RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-o=output.txt", "-s"); List reporterOptionsList = runCmd.getReporterOptionsList(); @@ -52,7 +52,7 @@ public void reporterOptions_OneReporterForceScreen() { } @Test - public void reporterOptions_OneReporterForceScreenInverse() { + void reporterOptions_OneReporterForceScreenInverse() { RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-s", "-o=output.txt"); List reporterOptionsList = runCmd.getReporterOptionsList(); @@ -65,7 +65,7 @@ public void reporterOptions_OneReporterForceScreenInverse() { } @Test - public void reporterOptions_TwoReporters() { + void reporterOptions_TwoReporters() { RunCommand runCmd = TestHelper.createRunCommand(TestHelper.getConnectionString(), "-f=ut_documentation_reporter", "-f=ut_coverage_html_reporter", "-o=coverage.html", "-s"); diff --git a/src/test/java/org/utplsql/cli/StringBlockFormatterTest.java b/src/test/java/org/utplsql/cli/StringBlockFormatterTest.java index 62fc5f6..87e5954 100644 --- a/src/test/java/org/utplsql/cli/StringBlockFormatterTest.java +++ b/src/test/java/org/utplsql/cli/StringBlockFormatterTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -public class StringBlockFormatterTest { +class StringBlockFormatterTest { @Test void getBlockFormattedString() { diff --git a/src/test/java/org/utplsql/cli/TestRunCommandChecker.java b/src/test/java/org/utplsql/cli/TestRunCommandChecker.java index 0b1a651..803a3f1 100644 --- a/src/test/java/org/utplsql/cli/TestRunCommandChecker.java +++ b/src/test/java/org/utplsql/cli/TestRunCommandChecker.java @@ -6,10 +6,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -public class TestRunCommandChecker { +class TestRunCommandChecker { @Test - public void getCheckFailOnErrorMessage() + void getCheckFailOnErrorMessage() { // FailOnError option should work since 3.0.3+ framework assertNotNull(RunCommandChecker.getCheckFailOnErrorMessage(2, new Version("3.0.0"))); diff --git a/src/test/java/org/utplsql/cli/VersionInfoCommandIT.java b/src/test/java/org/utplsql/cli/VersionInfoCommandIT.java index 6f4ffdc..dcedc11 100644 --- a/src/test/java/org/utplsql/cli/VersionInfoCommandIT.java +++ b/src/test/java/org/utplsql/cli/VersionInfoCommandIT.java @@ -5,17 +5,16 @@ import org.junit.jupiter.api.Test; import org.utplsql.cli.util.SystemOutCapturer; -import java.io.IOException; import java.util.Arrays; import static org.junit.jupiter.api.Assertions.assertEquals; -public class VersionInfoCommandIT { +class VersionInfoCommandIT { private SystemOutCapturer capturer; @BeforeEach - public void setupCaptureSystemOut() { + void setupCaptureSystemOut() { capturer = new SystemOutCapturer(); } @@ -30,7 +29,7 @@ private void assertNumberOfLines( int expected, String content ) { assertEquals(expected, numOfLines, String.format("Expected output to have %n lines, but got %n", expected, numOfLines)); } @Test - public void infoCommandRunsWithoutConnection() throws Exception { + void infoCommandRunsWithoutConnection() { capturer.start(); @@ -42,7 +41,7 @@ public void infoCommandRunsWithoutConnection() throws Exception { assertNumberOfLines(2, output); } @Test - public void infoCommandRunsWithConnection() throws Exception { + void infoCommandRunsWithConnection() { capturer.start(); @@ -55,7 +54,7 @@ public void infoCommandRunsWithConnection() throws Exception { } @AfterEach - public void cleanupCaptureSystemOut() throws IOException { + void cleanupCaptureSystemOut() { capturer.stop(); } }