diff options
Diffstat (limited to 'src/test/java/org/sonarsource')
8 files changed, 118 insertions, 127 deletions
diff --git a/src/test/java/org/sonarsource/scanner/cli/CliTest.java b/src/test/java/org/sonarsource/scanner/cli/CliTest.java index ce5b140..6b2622a 100644 --- a/src/test/java/org/sonarsource/scanner/cli/CliTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/CliTest.java @@ -19,7 +19,7 @@ */ package org.sonarsource.scanner.cli; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -27,13 +27,13 @@ import static org.assertj.core.api.Assertions.entry; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class CliTest { +class CliTest { private final Exit exit = mock(Exit.class); private Logs logs = new Logs(System.out, System.err); private Cli cli = new Cli(exit, logs); @Test - public void should_parse_empty_arguments() { + void should_parse_empty_arguments() { cli.parse(new String[0]); assertThat(cli.properties()).isNotEmpty(); assertThat(cli.isDebugEnabled()).isFalse(); @@ -42,7 +42,7 @@ public class CliTest { } @Test - public void should_extract_properties() { + void should_extract_properties() { cli.parse(new String[]{"-D", "foo=bar", "--define", "hello=world", "-Dboolean"}); assertThat(cli.properties()).contains( entry("foo", "bar"), @@ -51,7 +51,7 @@ public class CliTest { } @Test - public void should_warn_on_duplicate_properties() { + void should_warn_on_duplicate_properties() { logs = mock(Logs.class); cli = new Cli(exit, logs); cli.parse(new String[]{"-D", "foo=bar", "--define", "foo=baz"}); @@ -59,7 +59,7 @@ public class CliTest { } @Test - public void should_fail_on_missing_prop() { + void should_fail_on_missing_prop() { logs = mock(Logs.class); cli = new Cli(exit, logs); cli.parse(new String[]{"-D"}); @@ -68,72 +68,72 @@ public class CliTest { } @Test - public void should_not_fail_with_errors_option() { + void should_not_fail_with_errors_option() { assertThatNoException().isThrownBy(() -> cli.parse(new String[]{"-e"})); } @Test - public void should_enable_debug_mode() { + void should_enable_debug_mode() { cli.parse(new String[]{"-X"}); assertThat(cli.isDebugEnabled()).isTrue(); assertThat(cli.properties()).containsEntry("sonar.verbose", "true"); } @Test - public void should_enable_debug_mode_full() { + void should_enable_debug_mode_full() { cli.parse(new String[]{"--debug"}); assertThat(cli.isDebugEnabled()).isTrue(); assertThat(cli.properties()).containsEntry("sonar.verbose", "true"); } @Test - public void should_show_version() { + void should_show_version() { cli.parse(new String[]{"-v"}); assertThat(cli.isDisplayVersionOnly()).isTrue(); } @Test - public void should_show_version_full() { + void should_show_version_full() { cli.parse(new String[]{"--version"}); assertThat(cli.isDisplayVersionOnly()).isTrue(); } @Test - public void should_enable_stacktrace_log() { + void should_enable_stacktrace_log() { cli.parse(new String[]{"-e"}); assertThat(cli.isDebugEnabled()).isFalse(); assertThat(cli.properties().get("sonar.verbose")).isNull(); } @Test - public void should_enable_stacktrace_log_full() { + void should_enable_stacktrace_log_full() { cli.parse(new String[]{"--errors"}); assertThat(cli.isDebugEnabled()).isFalse(); assertThat(cli.properties().get("sonar.verbose")).isNull(); } @Test - public void should_parse_from_argument() { + void should_parse_from_argument() { cli.parse(new String[]{"--from=ScannerMSBuild/4.8"}); assertThat(cli.getInvokedFrom()).isNotEmpty(); assertThat(cli.getInvokedFrom()).isEqualTo("ScannerMSBuild/4.8"); } @Test - public void from_argument_is_only_from_let_value_empty() { + void from_argument_is_only_from_let_value_empty() { cli.parse(new String[]{"--from="}); assertThat(cli.getInvokedFrom()).isEmpty(); } @Test - public void should_disable_debug_mode_and_stacktrace_log_by_default() { + void should_disable_debug_mode_and_stacktrace_log_by_default() { cli.parse(new String[0]); assertThat(cli.isDebugEnabled()).isFalse(); assertThat(cli.properties().get("sonar.verbose")).isNull(); } @Test - public void should_show_usage() { + void should_show_usage() { logs = mock(Logs.class); cli = new Cli(exit, logs); cli.parse(new String[]{"-h"}); @@ -142,7 +142,7 @@ public class CliTest { } @Test - public void should_show_usage_full() { + void should_show_usage_full() { logs = mock(Logs.class); cli = new Cli(exit, logs); cli.parse(new String[]{"--help"}); @@ -151,7 +151,7 @@ public class CliTest { } @Test - public void should_show_usage_on_bad_syntax() { + void should_show_usage_on_bad_syntax() { logs = mock(Logs.class); cli = new Cli(exit, logs); cli.parse(new String[]{"-w"}); @@ -161,7 +161,7 @@ public class CliTest { } @Test - public void should_enable_embedded_mode() { + void should_enable_embedded_mode() { cli.parse(new String[]{"--embedded"}); assertThat(cli.isEmbedded()).isTrue(); } diff --git a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java index d28754a..27e2eab 100644 --- a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java @@ -27,23 +27,19 @@ import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.apache.commons.lang.SystemUtils; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.apache.commons.lang3.SystemUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ConfTest { - - @Rule - public TemporaryFolder temp = new TemporaryFolder(); +class ConfTest { private final Map<String, String> env = new HashMap<>(); private final Properties args = new Properties(); @@ -51,14 +47,14 @@ public class ConfTest { private final Cli cli = mock(Cli.class); private final Conf conf = new Conf(cli, logs, env); - @Before - public void initConf() { + @BeforeEach + void initConf() { env.clear(); when(cli.properties()).thenReturn(args); } @Test - public void should_load_global_settings_by_home() throws Exception { + void should_load_global_settings_by_home() throws Exception { Path home = Paths.get(getClass().getResource("ConfTest/shouldLoadRunnerSettingsByHome/").toURI()); args.setProperty("scanner.home", home.toAbsolutePath().toString()); @@ -67,14 +63,14 @@ public class ConfTest { } @Test - public void should_not_fail_if_no_home() { + void should_not_fail_if_no_home() { assertThat(conf.properties()).isNotEmpty(); // worst case, use current path assertThat(conf.properties().getProperty("sonar.projectBaseDir")).isEqualTo(Paths.get("").toAbsolutePath().toString()); } @Test - public void should_set_bootstrap_time_only_once() { + void should_set_bootstrap_time_only_once() { Properties properties = conf.properties(); assertThat(properties).containsKey("sonar.scanner.bootstrapStartTime"); @@ -85,7 +81,7 @@ public class ConfTest { } @Test - public void base_dir_can_be_relative() throws URISyntaxException { + void base_dir_can_be_relative() throws URISyntaxException { Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfiguration/project").toURI()); args.setProperty("project.home", projectHome.getParent().toAbsolutePath().toString()); args.setProperty("sonar.projectBaseDir", "project"); @@ -98,7 +94,7 @@ public class ConfTest { } @Test - public void should_load_conf_by_direct_path() throws Exception { + void should_load_conf_by_direct_path() throws Exception { Path settings = Paths.get(getClass().getResource("ConfTest/shouldLoadRunnerSettingsByDirectPath/other-conf.properties").toURI()); args.setProperty("scanner.settings", settings.toAbsolutePath().toString()); @@ -106,7 +102,7 @@ public class ConfTest { } @Test - public void shouldLoadCompleteConfiguration() throws Exception { + void shouldLoadCompleteConfiguration() throws Exception { Path runnerHome = Paths.get(getClass().getResource("ConfTest/shouldLoadCompleteConfiguration/runner").toURI()); Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadCompleteConfiguration/project").toURI()); args.setProperty("scanner.home", runnerHome.toAbsolutePath().toString()); @@ -121,7 +117,7 @@ public class ConfTest { } @Test - public void shouldLoadModuleConfiguration() throws Exception { + void shouldLoadModuleConfiguration() throws Exception { Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfiguration/project").toURI()); args.setProperty("project.home", projectHome.toAbsolutePath().toString()); @@ -133,7 +129,7 @@ public class ConfTest { } @Test - public void shouldSupportDeepModuleConfigurationInRoot() throws Exception { + void shouldSupportDeepModuleConfigurationInRoot() throws Exception { Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldSupportDeepModuleConfigurationInRoot/project").toURI()); args.setProperty("project.home", projectHome.toAbsolutePath().toString()); @@ -151,7 +147,7 @@ public class ConfTest { } @Test - public void shouldLoadModuleConfigurationOverrideBasedir() throws Exception { + void shouldLoadModuleConfigurationOverrideBasedir() throws Exception { Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfigurationOverrideBasedir/project").toURI()); args.setProperty("project.home", projectHome.toAbsolutePath().toString()); @@ -164,7 +160,7 @@ public class ConfTest { } @Test - public void shouldCliOverrideSettingFiles() throws Exception { + void shouldCliOverrideSettingFiles() throws Exception { Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfigurationOverrideBasedir/project").toURI()); args.setProperty("project.home", projectHome.toAbsolutePath().toString()); args.setProperty("module1.sonar.projectName", "mod1"); @@ -180,7 +176,7 @@ public class ConfTest { } @Test - public void shouldUseCliToDiscoverModules() throws Exception { + void shouldUseCliToDiscoverModules() throws Exception { Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfigurationOverrideBasedir/project").toURI()); args.setProperty("project.home", projectHome.toAbsolutePath().toString()); args.setProperty("sonar.modules", "module1"); @@ -195,7 +191,7 @@ public class ConfTest { } @Test - public void shouldNotUseCurrentDir() throws Exception { + void shouldNotUseCurrentDir() throws Exception { Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfigurationOverrideBasedir/project").toURI()); args.setProperty("project.home", projectHome.toAbsolutePath().toString()); @@ -208,7 +204,7 @@ public class ConfTest { } @Test - public void shouldLoadModuleConfigurationWithoutRootConf() throws Exception { + void shouldLoadModuleConfigurationWithoutRootConf() throws Exception { Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfigurationWithoutRootConf/project").toURI()); args.setProperty("project.home", projectHome.toAbsolutePath().toString()); @@ -221,7 +217,7 @@ public class ConfTest { } @Test - public void failModuleBaseDirDoesNotExist() { + void failModuleBaseDirDoesNotExist() { args.setProperty("sonar.modules", "module1"); args.setProperty("module1.sonar.projectBaseDir", "invalid"); @@ -231,7 +227,7 @@ public class ConfTest { } @Test - public void failModulePropertyFileDoesNotExist() { + void failModulePropertyFileDoesNotExist() { args.setProperty("sonar.modules", "module1"); args.setProperty("module1.sonar.projectConfigFile", "invalid"); @@ -241,30 +237,30 @@ public class ConfTest { } @Test - public void shouldSupportSettingBaseDirFromCli() throws Exception { - Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfiguration/project").toURI()); - args.setProperty("project.home", temp.newFolder().getCanonicalPath()); - args.setProperty("sonar.projectBaseDir", projectHome.toAbsolutePath().toString()); + void shouldSupportSettingBaseDirFromCli(@TempDir Path projectHome) throws Exception { + Path projectBaseDir = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfiguration/project").toURI()); + args.setProperty("project.home", projectHome.toString()); + args.setProperty("sonar.projectBaseDir", projectBaseDir.toAbsolutePath().toString()); Properties properties = conf.properties(); assertThat(properties.getProperty("module1.sonar.projectName")).isEqualTo("Module 1"); assertThat(properties.getProperty("module2.sonar.projectName")).isEqualTo("Module 2"); - assertThat(properties.getProperty("sonar.projectBaseDir")).isEqualTo(projectHome.toString()); + assertThat(properties.getProperty("sonar.projectBaseDir")).isEqualTo(projectBaseDir.toString()); } @Test - public void ignoreEmptyModule() throws Exception { - Path projectHome = Paths.get(getClass().getResource("ConfTest/emptyModules/project").toURI()); - args.setProperty("project.home", temp.newFolder().getCanonicalPath()); - args.setProperty("sonar.projectBaseDir", projectHome.toAbsolutePath().toString()); + void ignoreEmptyModule(@TempDir Path projectHome) throws Exception { + Path projectBaseDir = Paths.get(getClass().getResource("ConfTest/emptyModules/project").toURI()); + args.setProperty("project.home", projectHome.toString()); + args.setProperty("sonar.projectBaseDir", projectBaseDir.toAbsolutePath().toString()); assertThatCode(conf::properties) .doesNotThrowAnyException(); } @Test - public void shouldGetList() { + void shouldGetList() { Properties props = new Properties(); props.put("prop", " foo ,, bar , \n\ntoto,tutu"); @@ -272,9 +268,8 @@ public class ConfTest { } @Test - public void shouldNotResolveSymlinks() throws IOException, URISyntaxException { + void shouldNotResolveSymlinks(@TempDir Path root) throws IOException, URISyntaxException { assumeTrue(SystemUtils.IS_OS_UNIX); - Path root = temp.getRoot().toPath(); Path realProjectHome = Paths.get(getClass().getResource("ConfTest/shouldLoadModuleConfiguration/project").toURI()); Path linkProjectHome = root.resolve("link"); try { @@ -295,7 +290,7 @@ public class ConfTest { // SQSCANNER-24 @Test - public void should_load_project_settings_using_property() throws Exception { + void should_load_project_settings_using_property() throws Exception { Path home = Paths.get(getClass().getResource("ConfTest/shouldOverrideProjectSettingsPath/").toURI()); args.setProperty("project.home", home.toAbsolutePath().toString()); diff --git a/src/test/java/org/sonarsource/scanner/cli/LogsTest.java b/src/test/java/org/sonarsource/scanner/cli/LogsTest.java index 82a26ad..1bb1abe 100644 --- a/src/test/java/org/sonarsource/scanner/cli/LogsTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/LogsTest.java @@ -20,8 +20,8 @@ package org.sonarsource.scanner.cli; import java.io.PrintStream; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -32,7 +32,7 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -public class LogsTest { +class LogsTest { @Mock private PrintStream stdOut; @@ -41,28 +41,28 @@ public class LogsTest { private Logs logs; - @Before - public void setUp() { + @BeforeEach + void setUp() { MockitoAnnotations.initMocks(this); logs = new Logs(stdOut, stdErr); } @Test - public void testInfo() { + void testInfo() { logs.info("info"); verify(stdOut).println("INFO: info"); verifyNoMoreInteractions(stdOut, stdErr); } @Test - public void testWarn() { + void testWarn() { logs.warn("warn"); verify(stdOut).println("WARN: warn"); verifyNoMoreInteractions(stdOut, stdErr); } @Test - public void testWarnWithTimestamp() { + void testWarnWithTimestamp() { logs.setDebugEnabled(true); logs.warn("warn"); verify(stdOut).println(ArgumentMatchers.matches("\\d\\d:\\d\\d:\\d\\d.\\d\\d\\d WARN: warn")); @@ -70,7 +70,7 @@ public class LogsTest { } @Test - public void testError() { + void testError() { Exception e = new NullPointerException("exception"); logs.error("error1"); verify(stdErr).println("ERROR: error1"); @@ -82,7 +82,7 @@ public class LogsTest { } @Test - public void testDebug() { + void testDebug() { logs.setDebugEnabled(true); logs.debug("debug"); @@ -94,7 +94,7 @@ public class LogsTest { } @Test - public void should_forward_logs() { + void should_forward_logs() { var mockedLogs = mock(Logs.class); var logOutput = new Logs.LogOutputAdapter(mockedLogs); diff --git a/src/test/java/org/sonarsource/scanner/cli/MainTest.java b/src/test/java/org/sonarsource/scanner/cli/MainTest.java index 7a2156b..94bd544 100644 --- a/src/test/java/org/sonarsource/scanner/cli/MainTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/MainTest.java @@ -21,8 +21,8 @@ package org.sonarsource.scanner.cli; import java.util.Map; import java.util.Properties; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.Mock; @@ -61,8 +61,8 @@ public class MainTest { @Mock private Logs logs; - @Before - public void setUp() { + @BeforeEach + void setUp() { MockitoAnnotations.initMocks(this); when(scannerEngineBootstrapperFactory.create(any(Properties.class), any(String.class))).thenReturn(bootstrapper); when(bootstrapper.bootstrap()).thenReturn(engine); @@ -70,7 +70,7 @@ public class MainTest { } @Test - public void should_execute_scanner_engine() { + void should_execute_scanner_engine() { when(cli.getInvokedFrom()).thenReturn(""); Main main = new Main(exit, cli, conf, scannerEngineBootstrapperFactory, logs); main.analyze(); @@ -83,7 +83,7 @@ public class MainTest { } @Test - public void should_exit_with_error_on_error_during_analysis() { + void should_exit_with_error_on_error_during_analysis() { Exception e = new NullPointerException("NPE"); e = new IllegalStateException("Error", e); doThrow(e).when(engine).analyze(any()); @@ -97,7 +97,7 @@ public class MainTest { } @Test - public void should_exit_with_error_on_error_during_bootstrap() { + void should_exit_with_error_on_error_during_bootstrap() { Exception e = new NullPointerException("NPE"); e = new IllegalStateException("Error", e); doThrow(e).when(bootstrapper).bootstrap(); @@ -114,7 +114,7 @@ public class MainTest { } @Test - public void show_stacktrace() { + void show_stacktrace() { Exception e = createException(false); testException(e, false, false, Exit.INTERNAL_ERROR); @@ -123,7 +123,7 @@ public class MainTest { } @Test - public void dont_show_MessageException_stacktrace() { + void dont_show_MessageException_stacktrace() { Exception e = createException(true); testException(e, false, false, Exit.USER_ERROR); @@ -136,7 +136,7 @@ public class MainTest { } @Test - public void dont_show_MessageException_stacktrace_embedded() { + void dont_show_MessageException_stacktrace_embedded() { Exception e = createException(true); testException(e, false, true, Exit.USER_ERROR); @@ -148,7 +148,7 @@ public class MainTest { } @Test - public void show_MessageException_stacktrace_in_debug() { + void show_MessageException_stacktrace_in_debug() { Exception e = createException(true); testException(e, true, false, Exit.USER_ERROR); @@ -157,7 +157,7 @@ public class MainTest { } @Test - public void show_MessageException_stacktrace_in_debug_embedded() { + void show_MessageException_stacktrace_in_debug_embedded() { Exception e = createException(true); testException(e, true, true, Exit.USER_ERROR); @@ -166,7 +166,7 @@ public class MainTest { } @Test - public void show_stacktrace_in_debug() { + void show_stacktrace_in_debug() { Exception e = createException(false); testException(e, true, false, Exit.INTERNAL_ERROR); @@ -202,7 +202,7 @@ public class MainTest { } @Test - public void should_only_display_version() { + void should_only_display_version() { Properties p = new Properties(); when(cli.isDisplayVersionOnly()).thenReturn(true); when(cli.getInvokedFrom()).thenReturn(""); @@ -219,7 +219,7 @@ public class MainTest { } @Test - public void should_skip() { + void should_skip() { Properties p = new Properties(); p.setProperty(ScannerProperties.SKIP, "true"); when(conf.properties()).thenReturn(p); @@ -237,7 +237,7 @@ public class MainTest { } @Test - public void shouldLogServerVersion() { + void shouldLogServerVersion() { when(engine.isSonarCloud()).thenReturn(false); when(engine.getServerVersion()).thenReturn("5.5"); Properties p = new Properties(); @@ -251,7 +251,7 @@ public class MainTest { } @Test - public void should_log_SonarCloud_server() { + void should_log_SonarCloud_server() { when(engine.isSonarCloud()).thenReturn(true); Properties p = new Properties(); when(conf.properties()).thenReturn(p); @@ -263,25 +263,25 @@ public class MainTest { } @Test - public void should_configure_logging() { + void should_configure_logging() { Properties analysisProps = testLogging("sonar.verbose", "true"); assertThat(analysisProps.getProperty("sonar.verbose")).isEqualTo("true"); } @Test - public void should_configure_logging_trace() { + void should_configure_logging_trace() { Properties analysisProps = testLogging("sonar.log.level", "TRACE"); assertThat(analysisProps.getProperty("sonar.log.level")).isEqualTo("TRACE"); } @Test - public void should_set_bootstrap_start_time_in_millis() { + void should_set_bootstrap_start_time_in_millis() { Properties analysisProps = execute("sonar.scanner.bootstrapStartTime", "1714137496104"); assertThat(analysisProps.getProperty("sonar.scanner.bootstrapStartTime")).isEqualTo("1714137496104"); } @Test - public void should_configure_logging_debug() { + void should_configure_logging_debug() { Properties analysisProps = testLogging("sonar.log.level", "DEBUG"); assertThat(analysisProps.getProperty("sonar.log.level")).isEqualTo("DEBUG"); } diff --git a/src/test/java/org/sonarsource/scanner/cli/PropertyResolverTest.java b/src/test/java/org/sonarsource/scanner/cli/PropertyResolverTest.java index 0ff6102..874e476 100644 --- a/src/test/java/org/sonarsource/scanner/cli/PropertyResolverTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/PropertyResolverTest.java @@ -22,18 +22,15 @@ package org.sonarsource.scanner.cli; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; -public class PropertyResolverTest { - @Rule - public ExpectedException exception = ExpectedException.none(); +class PropertyResolverTest { @Test - public void resolve_properties() { + void resolve_properties() { Properties map = new Properties(); Map<String, String> env = new HashMap<>(); @@ -58,7 +55,7 @@ public class PropertyResolverTest { } @Test - public void use_env() { + void use_env() { Properties map = new Properties(); Map<String, String> env = new HashMap<>(); @@ -76,7 +73,7 @@ public class PropertyResolverTest { } @Test - public void resolve_recursively() { + void resolve_recursively() { Properties map = new Properties(); Map<String, String> env = new HashMap<>(); map.put("A", "value a"); @@ -91,7 +88,7 @@ public class PropertyResolverTest { } @Test - public void dont_resolve_nested() { + void dont_resolve_nested() { Properties map = new Properties(); Map<String, String> env = new HashMap<>(); map.put("A", "value a"); @@ -106,7 +103,7 @@ public class PropertyResolverTest { } @Test - public void missing_var() { + void missing_var() { Map<String, String> env = new HashMap<>(); Properties map = new Properties(); map.put("A", "/path/${missing} var/"); @@ -118,7 +115,7 @@ public class PropertyResolverTest { } @Test - public void fail_loop_properties_resolution() { + void fail_loop_properties_resolution() { Properties map = new Properties(); Map<String, String> env = new HashMap<>(); @@ -126,14 +123,13 @@ public class PropertyResolverTest { map.put("A", "${B}"); map.put("B", "${A}"); - exception.expect(IllegalArgumentException.class); - exception.expectMessage("variable: B"); PropertyResolver resolver = new PropertyResolver(map, env); - resolver.resolve(); + + assertThatThrownBy(resolver::resolve).isInstanceOf(IllegalArgumentException.class).hasMessageContaining("variable: B"); } @Test - public void preserve_empty() { + void preserve_empty() { Properties map = new Properties(); Map<String, String> env = new HashMap<>(); diff --git a/src/test/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactoryTest.java b/src/test/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactoryTest.java index f3ae408..cfaca6f 100644 --- a/src/test/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactoryTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactoryTest.java @@ -20,7 +20,7 @@ package org.sonarsource.scanner.cli; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonarsource.scanner.lib.ScannerEngineBootstrapper; import static org.assertj.core.api.Assertions.assertThat; @@ -33,14 +33,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class ScannerEngineBootstrapperFactoryTest { +class ScannerEngineBootstrapperFactoryTest { private final Properties props = new Properties(); private final Logs logs = mock(Logs.class); - private ScannerEngineBootstrapperFactory underTest = new ScannerEngineBootstrapperFactory(logs); + private final ScannerEngineBootstrapperFactory underTest = new ScannerEngineBootstrapperFactory(logs); @Test - public void should_create_engine_bootstrapper_and_pass_app_and_properties() { + void should_create_engine_bootstrapper_and_pass_app_and_properties() { props.setProperty("foo", "bar"); var spy = spy(underTest); var mockedBootstrapper = mock(ScannerEngineBootstrapper.class); @@ -55,7 +55,7 @@ public class ScannerEngineBootstrapperFactoryTest { } @Test - public void should_create_engine_bootstrapper_with_app_from_argument() { + void should_create_engine_bootstrapper_with_app_from_argument() { var spy = spy(underTest); var mockedBootstrapper = mock(ScannerEngineBootstrapper.class); when(mockedBootstrapper.addBootstrapProperties(any())).thenReturn(mockedBootstrapper); @@ -68,7 +68,7 @@ public class ScannerEngineBootstrapperFactoryTest { } @Test - public void if_from_argument_is_not_regex_compliant_revert_to_default_scanner_name() { + void if_from_argument_is_not_regex_compliant_revert_to_default_scanner_name() { var spy = spy(underTest); var mockedBootstrapper = mock(ScannerEngineBootstrapper.class); when(mockedBootstrapper.addBootstrapProperties(any())).thenReturn(mockedBootstrapper); diff --git a/src/test/java/org/sonarsource/scanner/cli/StatsTest.java b/src/test/java/org/sonarsource/scanner/cli/StatsTest.java index 045f9be..a39e9ec 100644 --- a/src/test/java/org/sonarsource/scanner/cli/StatsTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/StatsTest.java @@ -20,20 +20,20 @@ package org.sonarsource.scanner.cli; import java.io.PrintStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class StatsTest { +class StatsTest { private final PrintStream stdOut = mock(PrintStream.class); private final PrintStream stdErr = mock(PrintStream.class); private final Logs logs = new Logs(stdOut, stdErr); @Test - public void shouldPrintStats() { + void shouldPrintStats() { new Stats(logs).start().stop(); verify(stdOut).println(Mockito.contains("Total time: ")); @@ -41,7 +41,7 @@ public class StatsTest { } @Test - public void shouldFormatTime() { + void shouldFormatTime() { assertThat(Stats.formatTime(1 * 60 * 60 * 1000 + 2 * 60 * 1000 + 3 * 1000 + 400)).isEqualTo("1:02:03.400s"); assertThat(Stats.formatTime(2 * 60 * 1000 + 3 * 1000 + 400)).isEqualTo("2:03.400s"); assertThat(Stats.formatTime(3 * 1000 + 400)).isEqualTo("3.400s"); diff --git a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java index 5a45873..7344270 100644 --- a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java @@ -19,8 +19,8 @@ */ package org.sonarsource.scanner.cli; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.sonarsource.scanner.cli.SystemInfo.System2; import static org.assertj.core.api.Assertions.assertThat; @@ -30,17 +30,17 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -public class SystemInfoTest { +class SystemInfoTest { private final System2 mockSystem = mock(System2.class); private final Logs logs = mock(Logs.class); - @Before - public void setUp() { + @BeforeEach + void setUp() { SystemInfo.setSystem(mockSystem); } @Test - public void test_java() { + void test_java() { mockJava(); assertThat(SystemInfo.java()).isEqualTo("Java 1.9 oracle (64-bit)"); @@ -52,7 +52,7 @@ public class SystemInfoTest { } @Test - public void test_os() { + void test_os() { mockOs(); assertThat(SystemInfo.os()).isEqualTo("linux 2.5 x64"); @@ -71,7 +71,7 @@ public class SystemInfoTest { } @Test - public void should_print() { + void should_print() { mockOs(); mockJava(); when(mockSystem.getenv("SONAR_SCANNER_OPTS")).thenReturn("arg"); @@ -91,7 +91,7 @@ public class SystemInfoTest { } @Test - public void should_not_print_sensitive_data() { + void should_not_print_sensitive_data() { mockOs(); mockJava(); when(mockSystem.getenv("SONAR_SCANNER_OPTS")) |