From efa7cbf67fc688806609b21eb78f560e2102c5ec Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 16 Jul 2015 21:46:04 +0200 Subject: [PATCH] Rename remaining variables "sut" to "underTest" in tests --- .../org/sonar/process/LogbackHelperTest.java | 36 +++++----- .../org/sonar/search/SearchLoggingTest.java | 4 +- .../dbcleaner/IndexPurgeListenerTest.java | 4 +- .../sonar/server/app/TomcatAccessLogTest.java | 4 +- .../ProjectSettingsRepositoryTest.java | 12 ++-- .../formula/AverageFormulaTest.java | 6 +- .../computation/issue/IssueCounterTest.java | 70 +++++++++---------- .../source/ReportIteratorTest.java | 26 +++---- .../step/CommentMeasuresStepTest.java | 30 ++++---- .../step/ComputeQProfileMeasureStepTest.java | 12 ++-- .../step/CustomMeasuresCopyStepTest.java | 6 +- .../step/FeedDebtModelStepTest.java | 8 +-- .../FillMeasuresWithVariationsStepTest.java | 14 ++-- .../step/IndexComponentsStepTest.java | 7 +- .../step/PersistDuplicationsStepTest.java | 20 +++--- .../step/PersistFileSourcesStepTest.java | 30 ++++---- ...stNumberOfDaysSinceLastCommitStepTest.java | 12 ++-- .../step/PersistSnapshotsStepTest.java | 18 ++--- .../step/PersistTestsStepTest.java | 20 +++--- .../step/PurgeDatastoresStepTest.java | 7 +- .../step/SendIssueNotificationsStepTest.java | 11 ++- .../computation/ws/IsQueueEmptyWsTest.java | 8 +-- ...ManualMeasuresComponentUuidColumnTest.java | 6 +- .../FeedManualMeasuresComponentUuidTest.java | 8 +-- .../MyNewIssuesEmailTemplateTest.java | 16 ++--- ...MyNewIssuesNotificationDispatcherTest.java | 10 +-- .../MyNewIssuesNotificationTest.java | 8 +-- .../NewIssuesNotificationTest.java | 60 ++++++++-------- .../notification/NewIssuesStatisticsTest.java | 20 +++--- .../custom/ws/CustomMeasureValidatorTest.java | 20 +++--- .../platform/TempFolderProviderTest.java | 6 +- .../monitoring/BaseMonitorMBeanTest.java | 10 +-- .../monitoring/DatabaseMonitorTest.java | 8 +-- .../monitoring/JvmPropertiesMonitorTest.java | 4 +- .../monitoring/PluginsMonitorTest.java | 6 +- .../monitoring/SystemMonitorTest.java | 6 +- .../server/platform/ws/InfoActionTest.java | 6 +- ...ProjectSettingsRespositoryFactoryTest.java | 10 +-- .../ProjectSettingsRespositoryTest.java | 40 +++++------ .../server/test/index/TestIndexTest.java | 12 ++-- .../server/test/index/TestIndexerTest.java | 18 ++--- .../test/index/TestResultSetIteratorTest.java | 36 +++++----- .../server/util/LongTypeValidationTest.java | 12 ++-- .../db/purge/PurgeConfigurationTest.java | 10 +-- .../sonar/api/utils/log/BaseLoggerTest.java | 4 +- .../sonar/api/utils/log/LogTesterTest.java | 34 ++++----- .../sonar/api/utils/log/NullProfilerTest.java | 28 ++++---- 47 files changed, 379 insertions(+), 384 deletions(-) diff --git a/server/sonar-process/src/test/java/org/sonar/process/LogbackHelperTest.java b/server/sonar-process/src/test/java/org/sonar/process/LogbackHelperTest.java index 1e2a9756224..5d63c90350c 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/LogbackHelperTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/LogbackHelperTest.java @@ -46,7 +46,7 @@ import static org.junit.Assert.fail; public class LogbackHelperTest { Props props = new Props(new Properties()); - LogbackHelper sut = new LogbackHelper(); + LogbackHelper underTest = new LogbackHelper(); @Rule public TemporaryFolder temp = new TemporaryFolder(); @@ -64,15 +64,15 @@ public class LogbackHelperTest { @Test public void getRootContext() { - assertThat(sut.getRootContext()).isNotNull(); + assertThat(underTest.getRootContext()).isNotNull(); } @Test public void enableJulChangePropagation() { - LoggerContext ctx = sut.getRootContext(); + LoggerContext ctx = underTest.getRootContext(); int countListeners = ctx.getCopyOfListenerList().size(); - LoggerContextListener propagator = sut.enableJulChangePropagation(ctx); + LoggerContextListener propagator = underTest.enableJulChangePropagation(ctx); assertThat(ctx.getCopyOfListenerList().size()).isEqualTo(countListeners + 1); ctx.removeListener(propagator); @@ -80,8 +80,8 @@ public class LogbackHelperTest { @Test public void newConsoleAppender() { - LoggerContext ctx = sut.getRootContext(); - ConsoleAppender appender = sut.newConsoleAppender(ctx, "MY_APPENDER", "%msg%n"); + LoggerContext ctx = underTest.getRootContext(); + ConsoleAppender appender = underTest.newConsoleAppender(ctx, "MY_APPENDER", "%msg%n"); assertThat(appender.getName()).isEqualTo("MY_APPENDER"); assertThat(appender.getContext()).isSameAs(ctx); @@ -91,9 +91,9 @@ public class LogbackHelperTest { @Test public void configureLogger() { - LoggerContext ctx = sut.getRootContext(); + LoggerContext ctx = underTest.getRootContext(); - Logger logger = sut.configureLogger(ctx, "my_logger", Level.WARN); + Logger logger = underTest.configureLogger(ctx, "my_logger", Level.WARN); assertThat(logger.getLevel()).isEqualTo(Level.WARN); assertThat(logger.getName()).isEqualTo("my_logger"); @@ -101,8 +101,8 @@ public class LogbackHelperTest { @Test public void createRollingPolicy_defaults() { - LoggerContext ctx = sut.getRootContext(); - LogbackHelper.RollingPolicy policy = sut.createRollingPolicy(ctx, props, "sonar"); + LoggerContext ctx = underTest.getRootContext(); + LogbackHelper.RollingPolicy policy = underTest.createRollingPolicy(ctx, props, "sonar"); FileAppender appender = policy.createAppender("SONAR_FILE"); assertThat(appender).isInstanceOf(RollingFileAppender.class); @@ -116,8 +116,8 @@ public class LogbackHelperTest { @Test public void createRollingPolicy_none() { props.set("sonar.log.rollingPolicy", "none"); - LoggerContext ctx = sut.getRootContext(); - LogbackHelper.RollingPolicy policy = sut.createRollingPolicy(ctx, props, "sonar"); + LoggerContext ctx = underTest.getRootContext(); + LogbackHelper.RollingPolicy policy = underTest.createRollingPolicy(ctx, props, "sonar"); Appender appender = policy.createAppender("SONAR_FILE"); assertThat(appender).isNotInstanceOf(RollingFileAppender.class).isInstanceOf(FileAppender.class); @@ -127,8 +127,8 @@ public class LogbackHelperTest { public void createRollingPolicy_size() { props.set("sonar.log.rollingPolicy", "size:1MB"); props.set("sonar.log.maxFiles", "20"); - LoggerContext ctx = sut.getRootContext(); - LogbackHelper.RollingPolicy policy = sut.createRollingPolicy(ctx, props, "sonar"); + LoggerContext ctx = underTest.getRootContext(); + LogbackHelper.RollingPolicy policy = underTest.createRollingPolicy(ctx, props, "sonar"); Appender appender = policy.createAppender("SONAR_FILE"); assertThat(appender).isInstanceOf(RollingFileAppender.class); @@ -147,8 +147,8 @@ public class LogbackHelperTest { props.set("sonar.log.rollingPolicy", "time:yyyy-MM"); props.set("sonar.log.maxFiles", "20"); - LoggerContext ctx = sut.getRootContext(); - LogbackHelper.RollingPolicy policy = sut.createRollingPolicy(ctx, props, "sonar"); + LoggerContext ctx = underTest.getRootContext(); + LogbackHelper.RollingPolicy policy = underTest.createRollingPolicy(ctx, props, "sonar"); RollingFileAppender appender = (RollingFileAppender) policy.createAppender("SONAR_FILE"); @@ -162,8 +162,8 @@ public class LogbackHelperTest { public void createRollingPolicy_fail_if_unknown_policy() { props.set("sonar.log.rollingPolicy", "unknown:foo"); try { - LoggerContext ctx = sut.getRootContext(); - sut.createRollingPolicy(ctx, props, "sonar"); + LoggerContext ctx = underTest.getRootContext(); + underTest.createRollingPolicy(ctx, props, "sonar"); fail(); } catch (MessageException e) { assertThat(e).hasMessage("Unsupported value for property sonar.log.rollingPolicy: unknown:foo"); diff --git a/server/sonar-search/src/test/java/org/sonar/search/SearchLoggingTest.java b/server/sonar-search/src/test/java/org/sonar/search/SearchLoggingTest.java index 2a8f9e89774..ae5c4e27a89 100644 --- a/server/sonar-search/src/test/java/org/sonar/search/SearchLoggingTest.java +++ b/server/sonar-search/src/test/java/org/sonar/search/SearchLoggingTest.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class SearchLoggingTest { - SearchLogging sut = new SearchLogging(); + SearchLogging underTest = new SearchLogging(); @AfterClass public static void resetLogback() throws Exception { @@ -40,7 +40,7 @@ public class SearchLoggingTest { @Test public void log_to_console() { - LoggerContext ctx = sut.configure(); + LoggerContext ctx = underTest.configure(); Logger root = ctx.getLogger(Logger.ROOT_LOGGER_NAME); Appender appender = root.getAppender("CONSOLE"); diff --git a/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/IndexPurgeListenerTest.java b/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/IndexPurgeListenerTest.java index 137e0fb4b3a..40850ed8f53 100644 --- a/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/IndexPurgeListenerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/IndexPurgeListenerTest.java @@ -33,9 +33,9 @@ public class IndexPurgeListenerTest { public void call_source_line_indexer() { SourceLineIndexer sourceLineIndexer = mock(SourceLineIndexer.class); TestIndexer testIndexer = mock(TestIndexer.class); - IndexPurgeListener sut = new IndexPurgeListener(sourceLineIndexer, testIndexer); + IndexPurgeListener underTest = new IndexPurgeListener(sourceLineIndexer, testIndexer); - sut.onComponentDisabling("123456"); + underTest.onComponentDisabling("123456"); verify(sourceLineIndexer).deleteByFile("123456"); verify(testIndexer).deleteByFile("123456"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/app/TomcatAccessLogTest.java b/server/sonar-server/src/test/java/org/sonar/server/app/TomcatAccessLogTest.java index 3de9aac341d..695eaa5b24a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/app/TomcatAccessLogTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/app/TomcatAccessLogTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.*; public class TomcatAccessLogTest { - TomcatAccessLog sut = new TomcatAccessLog(); + TomcatAccessLog underTest = new TomcatAccessLog(); @Rule public TemporaryFolder temp = new TemporaryFolder(); @@ -55,7 +55,7 @@ public class TomcatAccessLogTest { Tomcat tomcat = mock(Tomcat.class, Mockito.RETURNS_DEEP_STUBS); Props props = new Props(new Properties()); props.set(ProcessProperties.PATH_LOGS, temp.newFolder().getAbsolutePath()); - sut.configure(tomcat, props); + underTest.configure(tomcat, props); verify(tomcat.getHost().getPipeline()).addValve(any(ProgrammaticLogbackValve.class)); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java index 996322bffd2..12f90d1dddb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ProjectSettingsRepositoryTest.java @@ -53,7 +53,7 @@ public class ProjectSettingsRepositoryTest { Settings globalSettings; - ProjectSettingsRepository sut; + ProjectSettingsRepository underTest; @Before public void createDao() { @@ -61,7 +61,7 @@ public class ProjectSettingsRepositoryTest { globalSettings = new Settings(); PropertiesDao propertiesDao = new PropertiesDao(dbTester.myBatis()); session = dbClient.openSession(false); - sut = new ProjectSettingsRepository(new ProjectSettingsFactory(globalSettings, propertiesDao)); + underTest = new ProjectSettingsRepository(new ProjectSettingsFactory(globalSettings, propertiesDao)); } @After @@ -73,7 +73,7 @@ public class ProjectSettingsRepositoryTest { public void get_project_settings_from_global_settings() { globalSettings.setProperty("key", "value"); - Settings settings = sut.getProjectSettings(PROJECT_KEY); + Settings settings = underTest.getProjectSettings(PROJECT_KEY); assertThat(settings.getString("key")).isEqualTo("value"); } @@ -85,7 +85,7 @@ public class ProjectSettingsRepositoryTest { dbClient.propertiesDao().setProperty(new PropertyDto().setResourceId(project.getId()).setKey("key").setValue("value"), session); session.commit(); - Settings settings = sut.getProjectSettings(PROJECT_KEY); + Settings settings = underTest.getProjectSettings(PROJECT_KEY); assertThat(settings.getString("key")).isEqualTo("value"); } @@ -94,10 +94,10 @@ public class ProjectSettingsRepositoryTest { public void call_twice_get_project_settings() { globalSettings.setProperty("key", "value"); - Settings settings = sut.getProjectSettings(PROJECT_KEY); + Settings settings = underTest.getProjectSettings(PROJECT_KEY); assertThat(settings.getString("key")).isEqualTo("value"); - settings = sut.getProjectSettings(PROJECT_KEY); + settings = underTest.getProjectSettings(PROJECT_KEY); assertThat(settings.getString("key")).isEqualTo("value"); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java index e555f4c3ddd..4df0a9a1017 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java @@ -210,20 +210,20 @@ public class AverageFormulaTest { @Test public void create_measure_from_fall_back_measure() { - AverageFormula sut = Builder.newBuilder() + AverageFormula underTest = Builder.newBuilder() .setOutputMetricKey(FUNCTION_COMPLEXITY_KEY) .setMainMetricKey(COMPLEXITY_IN_FUNCTIONS_KEY) .setByMetricKey(FUNCTIONS_KEY) .setFallbackMetricKey(CoreMetrics.COMPLEXITY_KEY) .build(); - AverageFormula.AverageCounter counter = sut.createNewCounter(); + AverageFormula.AverageCounter counter = underTest.createNewCounter(); when(fileAggregateContext.getMeasure(COMPLEXITY_IN_FUNCTIONS_KEY)).thenReturn(Optional.absent()); addMeasure(COMPLEXITY_KEY, 10d); addMeasure(FUNCTIONS_KEY, 2d); counter.aggregate(fileAggregateContext); - assertThat(sut.createMeasure(counter, createMeasureContext).get().getDoubleValue()).isEqualTo(5d); + assertThat(underTest.createMeasure(counter, createMeasureContext).get().getDoubleValue()).isEqualTo(5d); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java index 9e8e4688584..44dda105ea1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java @@ -122,11 +122,11 @@ public class IssueCounterTest { @Rule public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); - IssueCounter sut; + IssueCounter underTest; @Before public void setUp() { - sut = new IssueCounter(periodsHolder, metricRepository, measureRepository); + underTest = new IssueCounter(periodsHolder, metricRepository, measureRepository); } @Test @@ -134,22 +134,22 @@ public class IssueCounterTest { periodsHolder.setPeriods(); // bottom-up traversal -> from files to project - sut.beforeComponent(FILE1); - sut.onIssue(FILE1, createIssue(null, STATUS_OPEN, BLOCKER)); - sut.onIssue(FILE1, createIssue(RESOLUTION_FIXED, STATUS_CLOSED, MAJOR)); - sut.onIssue(FILE1, createIssue(RESOLUTION_FALSE_POSITIVE, STATUS_RESOLVED, MAJOR)); - sut.afterComponent(FILE1); + underTest.beforeComponent(FILE1); + underTest.onIssue(FILE1, createIssue(null, STATUS_OPEN, BLOCKER)); + underTest.onIssue(FILE1, createIssue(RESOLUTION_FIXED, STATUS_CLOSED, MAJOR)); + underTest.onIssue(FILE1, createIssue(RESOLUTION_FALSE_POSITIVE, STATUS_RESOLVED, MAJOR)); + underTest.afterComponent(FILE1); - sut.beforeComponent(FILE2); - sut.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, BLOCKER)); - sut.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, MAJOR)); - sut.afterComponent(FILE2); + underTest.beforeComponent(FILE2); + underTest.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, BLOCKER)); + underTest.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, MAJOR)); + underTest.afterComponent(FILE2); - sut.beforeComponent(FILE3); - sut.afterComponent(FILE3); + underTest.beforeComponent(FILE3); + underTest.afterComponent(FILE3); - sut.beforeComponent(PROJECT); - sut.afterComponent(PROJECT); + underTest.beforeComponent(PROJECT); + underTest.afterComponent(PROJECT); // count by status assertThat(measureRepository.getRawMeasure(FILE1, ISSUES_METRIC).get().getIntValue()).isEqualTo(1); @@ -175,19 +175,19 @@ public class IssueCounterTest { periodsHolder.setPeriods(); // bottom-up traversal -> from files to project - sut.beforeComponent(FILE1); - sut.onIssue(FILE1, createIssue(null, STATUS_OPEN, BLOCKER)); + underTest.beforeComponent(FILE1); + underTest.onIssue(FILE1, createIssue(null, STATUS_OPEN, BLOCKER)); // this resolved issue is ignored - sut.onIssue(FILE1, createIssue(RESOLUTION_FIXED, STATUS_CLOSED, MAJOR)); - sut.afterComponent(FILE1); + underTest.onIssue(FILE1, createIssue(RESOLUTION_FIXED, STATUS_CLOSED, MAJOR)); + underTest.afterComponent(FILE1); - sut.beforeComponent(FILE2); - sut.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, BLOCKER)); - sut.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, MAJOR)); - sut.afterComponent(FILE2); + underTest.beforeComponent(FILE2); + underTest.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, BLOCKER)); + underTest.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, MAJOR)); + underTest.afterComponent(FILE2); - sut.beforeComponent(PROJECT); - sut.afterComponent(PROJECT); + underTest.beforeComponent(PROJECT); + underTest.afterComponent(PROJECT); assertThat(measureRepository.getRawMeasure(FILE1, BLOCKER_ISSUES_METRIC).get().getIntValue()).isEqualTo(1); assertThat(measureRepository.getRawMeasure(FILE1, CRITICAL_ISSUES_METRIC).get().getIntValue()).isEqualTo(0); @@ -207,21 +207,21 @@ public class IssueCounterTest { Period period = newPeriod(3, 1500000000000L); periodsHolder.setPeriods(period); - sut.beforeComponent(FILE1); + underTest.beforeComponent(FILE1); // created before -> existing issues - sut.onIssue(FILE1, createIssueAt(null, STATUS_OPEN, BLOCKER, period.getSnapshotDate() - 1000000L)); + underTest.onIssue(FILE1, createIssueAt(null, STATUS_OPEN, BLOCKER, period.getSnapshotDate() - 1000000L)); // created during the first analysis starting the period -> existing issues - sut.onIssue(FILE1, createIssueAt(null, STATUS_OPEN, BLOCKER, period.getSnapshotDate())); + underTest.onIssue(FILE1, createIssueAt(null, STATUS_OPEN, BLOCKER, period.getSnapshotDate())); // created after -> new issues - sut.onIssue(FILE1, createIssueAt(null, STATUS_OPEN, CRITICAL, period.getSnapshotDate() + 100000L)); - sut.onIssue(FILE1, createIssueAt(RESOLUTION_FIXED, STATUS_CLOSED, MAJOR, period.getSnapshotDate() + 200000L)); - sut.afterComponent(FILE1); + underTest.onIssue(FILE1, createIssueAt(null, STATUS_OPEN, CRITICAL, period.getSnapshotDate() + 100000L)); + underTest.onIssue(FILE1, createIssueAt(RESOLUTION_FIXED, STATUS_CLOSED, MAJOR, period.getSnapshotDate() + 200000L)); + underTest.afterComponent(FILE1); - sut.beforeComponent(FILE2); - sut.afterComponent(FILE2); + underTest.beforeComponent(FILE2); + underTest.afterComponent(FILE2); - sut.beforeComponent(PROJECT); - sut.afterComponent(PROJECT); + underTest.beforeComponent(PROJECT); + underTest.afterComponent(PROJECT); assertVariation(FILE1, NEW_ISSUES_METRIC, period.getIndex(), 1); assertVariation(FILE1, NEW_CRITICAL_ISSUES_METRIC, period.getIndex(), 1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java index 3919d5fdbfd..2f51720e356 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/source/ReportIteratorTest.java @@ -42,7 +42,7 @@ public class ReportIteratorTest { File file; - ReportIterator sut; + ReportIterator underTest; @Before public void setUp() throws Exception { @@ -60,34 +60,34 @@ public class ReportIteratorTest { @After public void tearDown() { - if (sut != null) { - sut.close(); + if (underTest != null) { + underTest.close(); } } @Test public void read_report() { - sut = new ReportIterator<>(file, BatchReport.Coverage.PARSER); - assertThat(sut.next().getLine()).isEqualTo(1); + underTest = new ReportIterator<>(file, BatchReport.Coverage.PARSER); + assertThat(underTest.next().getLine()).isEqualTo(1); } @Test public void do_not_fail_when_calling_has_next_with_iterator_already_closed() { - sut = new ReportIterator<>(file, BatchReport.Coverage.PARSER); - assertThat(sut.next().getLine()).isEqualTo(1); - assertThat(sut.hasNext()).isFalse(); + underTest = new ReportIterator<>(file, BatchReport.Coverage.PARSER); + assertThat(underTest.next().getLine()).isEqualTo(1); + assertThat(underTest.hasNext()).isFalse(); - sut.close(); - assertThat(sut.hasNext()).isFalse(); + underTest.close(); + assertThat(underTest.hasNext()).isFalse(); } @Test(expected = NoSuchElementException.class) public void test_error() throws Exception { - sut = new ReportIterator<>(file, BatchReport.Coverage.PARSER); - sut.next(); + underTest = new ReportIterator<>(file, BatchReport.Coverage.PARSER); + underTest.next(); // fail ! - sut.next(); + underTest.next(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CommentMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CommentMeasuresStepTest.java index f64cea0328a..0e9ecd9c9c0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CommentMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CommentMeasuresStepTest.java @@ -73,7 +73,7 @@ public class CommentMeasuresStepTest { @Rule public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); - ComputationStep sut = new CommentMeasuresStep(treeRootHolder, metricRepository, measureRepository); + ComputationStep underTest = new CommentMeasuresStep(treeRootHolder, metricRepository, measureRepository); @Before public void setUp() throws Exception { @@ -100,7 +100,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(FILE_1_REF, COMMENT_LINES_KEY, newMeasureBuilder().create(100)); measureRepository.addRawMeasure(FILE_2_REF, COMMENT_LINES_KEY, newMeasureBuilder().create(400)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(FILE_1_REF).get(COMMENT_LINES_KEY)).isEmpty(); assertThat(measureRepository.getNewRawMeasures(FILE_2_REF).get(COMMENT_LINES_KEY)).isEmpty(); @@ -125,7 +125,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(ROOT_REF, NCLOC_KEY, newMeasureBuilder().create(300)); measureRepository.addRawMeasure(ROOT_REF, COMMENT_LINES_KEY, newMeasureBuilder().create(200)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(FILE_1_REF).get(COMMENT_LINES_DENSITY_KEY)).containsOnly(newMeasureBuilder().create(60d)); assertThat(measureRepository.getNewRawMeasures(FILE_2_REF).get(COMMENT_LINES_DENSITY_KEY)).containsOnly(newMeasureBuilder().create(20d)); @@ -150,7 +150,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(ROOT_REF, NCLOC_KEY, newMeasureBuilder().create(300)); measureRepository.addRawMeasure(ROOT_REF, COMMENT_LINES_KEY, newMeasureBuilder().create(0)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(FILE_1_REF).get(COMMENT_LINES_DENSITY_KEY)).containsOnly(newMeasureBuilder().create(0d)); assertThat(measureRepository.getNewRawMeasures(FILE_2_REF).get(COMMENT_LINES_DENSITY_KEY)).containsOnly(newMeasureBuilder().create(0d)); @@ -175,7 +175,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(ROOT_REF, NCLOC_KEY, newMeasureBuilder().create(0)); measureRepository.addRawMeasure(ROOT_REF, COMMENT_LINES_KEY, newMeasureBuilder().create(0)); - sut.execute(); + underTest.execute(); assertNoNewMeasures(COMMENT_LINES_DENSITY_KEY); } @@ -188,7 +188,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(MODULE_REF, COMMENT_LINES_KEY, newMeasureBuilder().create(200)); measureRepository.addRawMeasure(ROOT_REF, COMMENT_LINES_KEY, newMeasureBuilder().create(200)); - sut.execute(); + underTest.execute(); assertNoNewMeasures(COMMENT_LINES_DENSITY_KEY); } @@ -201,7 +201,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(MODULE_REF, NCLOC_KEY, newMeasureBuilder().create(200)); measureRepository.addRawMeasure(ROOT_REF, NCLOC_KEY, newMeasureBuilder().create(200)); - sut.execute(); + underTest.execute(); assertNoNewMeasures(COMMENT_LINES_DENSITY_KEY); } @@ -210,7 +210,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(FILE_1_REF, PUBLIC_API_KEY, newMeasureBuilder().create(100)); measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_API_KEY, newMeasureBuilder().create(400)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(FILE_1_REF).get(PUBLIC_API_KEY)).isEmpty(); assertThat(measureRepository.getNewRawMeasures(FILE_2_REF).get(PUBLIC_API_KEY)).isEmpty(); @@ -225,7 +225,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(FILE_1_REF, PUBLIC_UNDOCUMENTED_API_KEY, newMeasureBuilder().create(100)); measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_UNDOCUMENTED_API_KEY, newMeasureBuilder().create(400)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(FILE_1_REF).get(PUBLIC_UNDOCUMENTED_API_KEY)).isEmpty(); assertThat(measureRepository.getNewRawMeasures(FILE_2_REF).get(PUBLIC_UNDOCUMENTED_API_KEY)).isEmpty(); @@ -243,7 +243,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_API_KEY, newMeasureBuilder().create(400)); measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_UNDOCUMENTED_API_KEY, newMeasureBuilder().create(100)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(FILE_1_REF).get(PUBLIC_DOCUMENTED_API_DENSITY_KEY)).containsOnly(newMeasureBuilder().create(50d)); assertThat(measureRepository.getNewRawMeasures(FILE_2_REF).get(PUBLIC_DOCUMENTED_API_DENSITY_KEY)).containsOnly(newMeasureBuilder().create(75d)); @@ -258,7 +258,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(FILE_1_REF, PUBLIC_UNDOCUMENTED_API_KEY, newMeasureBuilder().create(50)); measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_UNDOCUMENTED_API_KEY, newMeasureBuilder().create(100)); - sut.execute(); + underTest.execute(); assertNoNewMeasures(PUBLIC_DOCUMENTED_API_DENSITY_KEY); } @@ -267,7 +267,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(FILE_1_REF, PUBLIC_API_KEY, newMeasureBuilder().create(50)); measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_API_KEY, newMeasureBuilder().create(100)); - sut.execute(); + underTest.execute(); assertNoNewMeasures(PUBLIC_DOCUMENTED_API_DENSITY_KEY); } @@ -279,7 +279,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_API_KEY, newMeasureBuilder().create(0)); measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_UNDOCUMENTED_API_KEY, newMeasureBuilder().create(100)); - sut.execute(); + underTest.execute(); assertNoNewMeasures(PUBLIC_DOCUMENTED_API_DENSITY_KEY); } @@ -291,7 +291,7 @@ public class CommentMeasuresStepTest { measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_API_KEY, newMeasureBuilder().create(400)); measureRepository.addRawMeasure(FILE_2_REF, PUBLIC_UNDOCUMENTED_API_KEY, newMeasureBuilder().create(0)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(FILE_1_REF).get(PUBLIC_DOCUMENTED_API_DENSITY_KEY)).containsOnly(newMeasureBuilder().create(100d)); assertThat(measureRepository.getNewRawMeasures(FILE_2_REF).get(PUBLIC_DOCUMENTED_API_DENSITY_KEY)).containsOnly(newMeasureBuilder().create(100d)); @@ -303,7 +303,7 @@ public class CommentMeasuresStepTest { @Test public void compute_nothing_when_no_data() { - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(FILE_1_REF)).isEmpty(); assertThat(measureRepository.getNewRawMeasures(FILE_2_REF)).isEmpty(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputeQProfileMeasureStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputeQProfileMeasureStepTest.java index e2b96d9fdd8..c829e7d4965 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputeQProfileMeasureStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputeQProfileMeasureStepTest.java @@ -59,11 +59,11 @@ public class ComputeQProfileMeasureStepTest { @Rule public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); - ComputeQProfileMeasureStep sut; + ComputeQProfileMeasureStep underTest; @Before public void setUp() throws Exception { - sut = new ComputeQProfileMeasureStep(treeRootHolder, measureRepository, metricRepository); + underTest = new ComputeQProfileMeasureStep(treeRootHolder, measureRepository, metricRepository); } @Test @@ -82,7 +82,7 @@ public class ComputeQProfileMeasureStepTest { QualityProfile qp = createQProfile(QP_NAME_1, LANGUAGE_KEY_1); addMeasure(111, qp); - sut.execute(); + underTest.execute(); assertThat(toEntries(measureRepository.getNewRawMeasures(1))).containsOnly(entryOf(CoreMetrics.QUALITY_PROFILES_KEY, newMeasureBuilder().create(toJson(qp)))); } @@ -106,7 +106,7 @@ public class ComputeQProfileMeasureStepTest { QualityProfile qp2 = createQProfile(QP_NAME_2, LANGUAGE_KEY_2); addMeasure(12, qp2); - sut.execute(); + underTest.execute(); assertThat(toEntries(measureRepository.getNewRawMeasures(1))).containsOnly(entryOf(CoreMetrics.QUALITY_PROFILES_KEY, newMeasureBuilder().create(toJson(qp1, qp2)))); } @@ -124,7 +124,7 @@ public class ComputeQProfileMeasureStepTest { treeRootHolder.setRoot(project); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(1)).isEmpty(); } @@ -138,7 +138,7 @@ public class ComputeQProfileMeasureStepTest { QualityProfile qp = createQProfile(QP_NAME_1, LANGUAGE_KEY_1); addMeasure(1, qp); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getNewRawMeasures(1)).isEmpty(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java index d8b81004777..9c406097f1f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java @@ -63,12 +63,12 @@ public class CustomMeasuresCopyStepTest { MetricRepository metricRepository = mock(MetricRepository.class); MeasureRepository measureRepository = mock(MeasureRepository.class); - CustomMeasuresCopyStep sut; + CustomMeasuresCopyStep underTest; @Before public void setUp() { DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new CustomMeasureDao()); - sut = new CustomMeasuresCopyStep(treeRootHolder, dbClient, metricRepository, measureRepository); + underTest = new CustomMeasuresCopyStep(treeRootHolder, dbClient, metricRepository, measureRepository); } @Test @@ -87,7 +87,7 @@ public class CustomMeasuresCopyStepTest { Component project = DumbComponent.builder(Component.Type.PROJECT, 3).setUuid("PROJECT1").addChildren(file1, file2).build(); treeRootHolder.setRoot(project); - sut.execute(); + underTest.execute(); ArgumentCaptor measureCaptor = ArgumentCaptor.forClass(Measure.class); verify(measureRepository).add(eq(file1), eq(floatMetric), measureCaptor.capture()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java index 7106df01218..b6b09740edf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java @@ -48,14 +48,14 @@ public class FeedDebtModelStepTest extends BaseStepTest { MutableDebtModelHolder debtModelHolder = new DebtModelHolderImpl(); - FeedDebtModelStep sut; + FeedDebtModelStep underTest; @Before public void setUp() { dbTester.truncateTables(); dbSession = dbClient.openSession(false); - sut = new FeedDebtModelStep(dbClient, debtModelHolder); + underTest = new FeedDebtModelStep(dbClient, debtModelHolder); } @After @@ -65,14 +65,14 @@ public class FeedDebtModelStepTest extends BaseStepTest { @Override protected ComputationStep step() { - return sut; + return underTest; } @Test public void feed_characteristics() { dbTester.prepareDbUnit(getClass(), "shared.xml"); - sut.execute(); + underTest.execute(); Collection rootChars = debtModelHolder.getRootCharacteristics(); assertThat(rootChars).extracting("id").containsOnly(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java index 66f84f92e36..64a21b3f310 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java @@ -87,7 +87,7 @@ public class FillMeasuresWithVariationsStepTest { DbClient dbClient = dbTester.getDbClient(); - FillMeasuresWithVariationsStep sut; + FillMeasuresWithVariationsStep underTest; @Before public void setUp() { @@ -95,7 +95,7 @@ public class FillMeasuresWithVariationsStepTest { dbClient.componentDao().insert(session, PROJECT_DTO); session.commit(); - sut = new FillMeasuresWithVariationsStep(dbClient, treeRootHolder, periodsHolder, metricRepository, measureRepository); + underTest = new FillMeasuresWithVariationsStep(dbClient, treeRootHolder, periodsHolder, metricRepository, measureRepository); } @Test @@ -109,7 +109,7 @@ public class FillMeasuresWithVariationsStepTest { treeRootHolder.setRoot(PROJECT); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getRawMeasures(PROJECT).keys()).isEmpty(); } @@ -120,7 +120,7 @@ public class FillMeasuresWithVariationsStepTest { treeRootHolder.setRoot(project); periodsHolder.setPeriods(); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getRawMeasures(project).keys()).isEmpty(); } @@ -149,7 +149,7 @@ public class FillMeasuresWithVariationsStepTest { addRawMeasure(project, ISSUES_METRIC, Measure.newMeasureBuilder().create(80, null)); addRawMeasure(directory, ISSUES_METRIC, Measure.newMeasureBuilder().create(20, null)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getRawMeasure(project, ISSUES_METRIC).get().getVariations().getVariation1()).isEqualTo(20d); assertThat(measureRepository.getRawMeasure(directory, ISSUES_METRIC).get().getVariations().getVariation1()).isEqualTo(10d); @@ -182,7 +182,7 @@ public class FillMeasuresWithVariationsStepTest { addRawMeasure(PROJECT, ISSUES_METRIC, Measure.newMeasureBuilder().create(80, null)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getRawMeasures(PROJECT).keys()).hasSize(1); @@ -216,7 +216,7 @@ public class FillMeasuresWithVariationsStepTest { addRawMeasure(PROJECT, FILE_COMPLEXITY_METRIC, Measure.newMeasureBuilder().create(3d, null)); addRawMeasure(PROJECT, BUILD_BREAKER_METRIC, Measure.newMeasureBuilder().create(false, null)); - sut.execute(); + underTest.execute(); assertThat(measureRepository.getRawMeasures(PROJECT).keys()).hasSize(4); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java index 97fa809a3a1..2f9e5c45d2c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java @@ -20,7 +20,6 @@ package org.sonar.server.computation.step; -import java.io.IOException; import org.junit.Rule; import org.junit.Test; import org.sonar.db.component.ResourceIndexDao; @@ -45,7 +44,7 @@ public class IndexComponentsStepTest extends BaseStepTest { ResourceIndexDao resourceIndexDao = mock(ResourceIndexDao.class); DbIdsRepository dbIdsRepository = new DbIdsRepository(); - IndexComponentsStep sut = new IndexComponentsStep(resourceIndexDao, dbIdsRepository, treeRootHolder); + IndexComponentsStep underTest = new IndexComponentsStep(resourceIndexDao, dbIdsRepository, treeRootHolder); @Test public void call_indexProject_of_dao() { @@ -53,13 +52,13 @@ public class IndexComponentsStepTest extends BaseStepTest { dbIdsRepository.setComponentId(project, 123L); treeRootHolder.setRoot(project); - sut.execute(); + underTest.execute(); verify(resourceIndexDao).indexProject(123L); } @Override protected ComputationStep step() { - return sut; + return underTest; } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java index 9ec1acdce4e..3bdaae42e14 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java @@ -66,7 +66,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { DbClient dbClient; - PersistDuplicationsStep sut; + PersistDuplicationsStep underTest; @Before public void setup() { @@ -74,12 +74,12 @@ public class PersistDuplicationsStepTest extends BaseStepTest { session = dbTester.myBatis().openSession(false); dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new MeasureDao(), new MetricDao()); - sut = new PersistDuplicationsStep(dbClient, dbIdsRepository, treeRootHolder, reportReader); + underTest = new PersistDuplicationsStep(dbClient, dbIdsRepository, treeRootHolder, reportReader); } @Override protected ComputationStep step() { - return sut; + return underTest; } @After @@ -92,7 +92,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { saveDuplicationMetric(); initReportWithProjectAndFile(); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(0); } @@ -118,7 +118,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(2, newArrayList(duplication)); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -159,7 +159,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(3, newArrayList(duplication)); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -199,7 +199,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(3, newArrayList(duplication)); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -242,7 +242,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(10, newArrayList(duplication)); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -281,7 +281,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(2, newArrayList(duplication)); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -310,7 +310,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(2, newArrayList(duplication)); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java index 9792374ea77..dc2652a850b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java @@ -73,7 +73,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { public TemporaryFolder temp = new TemporaryFolder(); DbClient dbClient = dbTester.getDbClient(); - PersistFileSourcesStep sut; + PersistFileSourcesStep underTest; long now = 123456789L; @@ -81,19 +81,19 @@ public class PersistFileSourcesStepTest extends BaseStepTest { public void setup() { dbTester.truncateTables(); when(system2.now()).thenReturn(now); - sut = new PersistFileSourcesStep(dbClient, system2, treeRootHolder, reportReader); + underTest = new PersistFileSourcesStep(dbClient, system2, treeRootHolder, reportReader); } @Override protected ComputationStep step() { - return sut; + return underTest; } @Test public void persist_sources() { initBasicReport(2); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -132,7 +132,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .build()); reportReader.putFileSourceLines(FILE_REF, "line1", "line2"); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -146,7 +146,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { public void persist_source_hashes() { initBasicReport(2); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource("FILE"); @@ -168,7 +168,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .setOverallCoveredConditions(4) .build())); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -201,7 +201,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .addChangesetIndexByLine(0) .build()); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -227,7 +227,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .build() )); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -253,7 +253,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { ).build() )); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -285,7 +285,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .build() )); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -323,7 +323,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { // Sources from the report initBasicReport(1); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -357,7 +357,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { initBasicReport(1); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -388,7 +388,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { initBasicReport(1); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -413,7 +413,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { )); try { - sut.execute(); + underTest.execute(); failBecauseExceptionWasNotThrown(IllegalStateException.class); } catch (IllegalStateException e) { assertThat(e).hasMessage("Cannot persist sources of MODULE_KEY:src/Foo.java").hasCauseInstanceOf(IllegalArgumentException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java index 7f34b79dc55..69934fa72ad 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java @@ -58,7 +58,7 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { DbIdsRepository dbIdsRepository = new DbIdsRepository(); - PersistNumberOfDaysSinceLastCommitStep sut; + PersistNumberOfDaysSinceLastCommitStep underTest; DbClient dbClient = db.getDbClient(); SourceLineIndex sourceLineIndex; @@ -75,12 +75,12 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { languageRepository = mock(LanguageRepository.class); when(metricRepository.getByKey(anyString())).thenReturn(new MetricImpl(10, "key", "name", Metric.MetricType.STRING)); - sut = new PersistNumberOfDaysSinceLastCommitStep(System2.INSTANCE, dbClient, sourceLineIndex, metricRepository, treeRootHolder, reportReader, dbIdsRepository); + underTest = new PersistNumberOfDaysSinceLastCommitStep(System2.INSTANCE, dbClient, sourceLineIndex, metricRepository, treeRootHolder, reportReader, dbIdsRepository); } @Override protected ComputationStep step() { - return sut; + return underTest; } @Test @@ -97,7 +97,7 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { .build() ); - sut.execute(); + underTest.execute(); db.assertDbUnit(getClass(), "insert-from-report-result.xml", new String[]{"id"}, "project_measures"); } @@ -108,7 +108,7 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { when(sourceLineIndex.lastCommitDateOnProject("project-uuid")).thenReturn(sixDaysAgo); initProject(); - sut.execute(); + underTest.execute(); db.assertDbUnit(getClass(), "insert-from-index-result.xml", new String[]{"id"}, "project_measures"); } @@ -117,7 +117,7 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { public void no_scm_information_in_report_and_index() { initProject(); - sut.execute(); + underTest.execute(); db.assertDbUnit(getClass(), "empty.xml"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java index 8ad7f7a61f9..1b58dfe5700 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistSnapshotsStepTest.java @@ -77,7 +77,7 @@ public class PersistSnapshotsStepTest extends BaseStepTest { long now; - PersistSnapshotsStep sut; + PersistSnapshotsStep underTest; @Before public void setup() { @@ -92,7 +92,7 @@ public class PersistSnapshotsStepTest extends BaseStepTest { when(system2.now()).thenReturn(now); - sut = new PersistSnapshotsStep(system2, dbClient, treeRootHolder, reportReader, dbIdsRepository, periodsHolderRule); + underTest = new PersistSnapshotsStep(system2, dbClient, treeRootHolder, reportReader, dbIdsRepository, periodsHolderRule); // initialize PeriodHolder to empty by default periodsHolderRule.setPeriods(); @@ -100,7 +100,7 @@ public class PersistSnapshotsStepTest extends BaseStepTest { @Override protected ComputationStep step() { - return sut; + return underTest; } @Test @@ -126,7 +126,7 @@ public class PersistSnapshotsStepTest extends BaseStepTest { dbIdsRepository.setComponentId(directory, directoryDto.getId()); dbIdsRepository.setComponentId(file, fileDto.getId()); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("snapshots")).isEqualTo(4); @@ -217,7 +217,7 @@ public class PersistSnapshotsStepTest extends BaseStepTest { dbIdsRepository.setComponentId(directory, directoryDto.getId()); dbIdsRepository.setComponentId(file, fileDto.getId()); - sut.execute(); + underTest.execute(); SnapshotDto fileSnapshot = getUnprocessedSnapshot(fileDto.getId()); assertThat(fileSnapshot.getQualifier()).isEqualTo("UTS"); @@ -247,7 +247,7 @@ public class PersistSnapshotsStepTest extends BaseStepTest { dbIdsRepository.setComponentId(subModuleA, subModuleADto.getId()); dbIdsRepository.setComponentId(moduleB, moduleBDto.getId()); - sut.execute(); + underTest.execute(); assertThat(dbTester.countRowsOfTable("snapshots")).isEqualTo(4); @@ -293,7 +293,7 @@ public class PersistSnapshotsStepTest extends BaseStepTest { treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, projectDto.getId()); - sut.execute(); + underTest.execute(); SnapshotDto projectSnapshot = getUnprocessedSnapshot(projectDto.getId()); assertThat(projectSnapshot.getPeriodMode(1)).isEqualTo(CoreProperties.TIMEMACHINE_MODE_DATE); @@ -338,7 +338,7 @@ public class PersistSnapshotsStepTest extends BaseStepTest { dbIdsRepository.setComponentId(directory, directoryDto.getId()); dbIdsRepository.setComponentId(file, fileDto.getId()); - sut.execute(); + underTest.execute(); SnapshotDto newProjectSnapshot = getUnprocessedSnapshot(projectDto.getId()); assertThat(newProjectSnapshot.getPeriodMode(1)).isEqualTo(CoreProperties.TIMEMACHINE_MODE_PREVIOUS_ANALYSIS); @@ -365,7 +365,7 @@ public class PersistSnapshotsStepTest extends BaseStepTest { treeRootHolder.setRoot(project); dbIdsRepository.setComponentId(project, projectDto.getId()); - sut.execute(); + underTest.execute(); SnapshotDto projectSnapshot = getUnprocessedSnapshot(projectDto.getId()); assertThat(projectSnapshot.getPeriodMode(1)).isNull(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java index 63c18a570b7..f50c092f65c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java @@ -74,7 +74,7 @@ public class PersistTestsStepTest extends BaseStepTest { DbClient dbClient = db.getDbClient(); Component root; - PersistTestsStep sut; + PersistTestsStep underTest; long now = 123456789L; @@ -84,7 +84,7 @@ public class PersistTestsStepTest extends BaseStepTest { System2 system2 = mock(System2.class); when(system2.now()).thenReturn(now); - sut = new PersistTestsStep(dbClient, system2, reportReader, treeRootHolder); + underTest = new PersistTestsStep(dbClient, system2, reportReader, treeRootHolder); root = DumbComponent.builder(Component.Type.PROJECT, 1).setUuid(PROJECT_UUID).setKey(PROJECT_KEY).addChildren( DumbComponent.builder(Component.Type.MODULE, 2).setUuid("MODULE_UUID").setKey("MODULE_KEY").addChildren( @@ -99,12 +99,12 @@ public class PersistTestsStepTest extends BaseStepTest { @Override protected ComputationStep step() { - return sut; + return underTest; } @Test public void no_test_in_database_and_batch_report() { - sut.execute(); + underTest.execute(); assertThat(dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1)).isNull(); assertThat(log.logs()).isEmpty(); @@ -121,7 +121,7 @@ public class PersistTestsStepTest extends BaseStepTest { ); reportReader.putCoverageDetails(TEST_FILE_REF_1, coverageDetails); - sut.execute(); + underTest.execute(); assertThat(db.countRowsOfTable("file_sources")).isEqualTo(1); @@ -144,7 +144,7 @@ public class PersistTestsStepTest extends BaseStepTest { reportReader.putTests(TEST_FILE_REF_1, Arrays.asList(newTest(1))); reportReader.putCoverageDetails(TEST_FILE_REF_1, Arrays.asList(newCoverageDetail(1, MAIN_FILE_REF_1))); - sut.execute(); + underTest.execute(); FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); assertThat(dto.getCreatedAt()).isEqualTo(now); @@ -170,7 +170,7 @@ public class PersistTestsStepTest extends BaseStepTest { List batchTests = Arrays.asList(newTest(1)); reportReader.putTests(TEST_FILE_REF_1, batchTests); - sut.execute(); + underTest.execute(); FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); assertThat(dto.getFileUuid()).isEqualTo(TEST_FILE_UUID_1); @@ -188,7 +188,7 @@ public class PersistTestsStepTest extends BaseStepTest { reportReader.putCoverageDetails(TEST_FILE_REF_1, coverageDetails); reportReader.putCoverageDetails(TEST_FILE_REF_2, coverageDetails); - sut.execute(); + underTest.execute(); assertThat(log.logs(LoggerLevel.WARN)).hasSize(1); assertThat(log.logs(LoggerLevel.WARN).get(0)).isEqualTo("Some coverage tests are not taken into account during analysis of project 'PROJECT_KEY'"); @@ -205,7 +205,7 @@ public class PersistTestsStepTest extends BaseStepTest { newCoverageDetailWithLines(1, MAIN_FILE_REF_1, 1, 3), newCoverageDetailWithLines(1, MAIN_FILE_REF_1, 2, 4))); - sut.execute(); + underTest.execute(); FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); List coveredLines = dto.getTestData().get(0).getCoveredFile(0).getCoveredLineList(); @@ -238,7 +238,7 @@ public class PersistTestsStepTest extends BaseStepTest { reportReader.putCoverageDetails(TEST_FILE_REF_1, Arrays.asList(newCoverageDetail)); // ACT - sut.execute(); + underTest.execute(); // ASSERT FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java index 1f40aa2cb00..09024c4a867 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java @@ -20,7 +20,6 @@ package org.sonar.server.computation.step; -import java.io.IOException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -60,7 +59,7 @@ public class PurgeDatastoresStepTest extends BaseStepTest { ProjectCleaner projectCleaner = mock(ProjectCleaner.class); ProjectSettingsRepository projectSettingsRepository = mock(ProjectSettingsRepository.class); - PurgeDatastoresStep sut = new PurgeDatastoresStep(mock(DbClient.class, Mockito.RETURNS_DEEP_STUBS), projectCleaner, dbIdsRepository, treeRootHolder, projectSettingsRepository); + PurgeDatastoresStep underTest = new PurgeDatastoresStep(mock(DbClient.class, Mockito.RETURNS_DEEP_STUBS), projectCleaner, dbIdsRepository, treeRootHolder, projectSettingsRepository); @Before public void setUp() { @@ -77,7 +76,7 @@ public class PurgeDatastoresStepTest extends BaseStepTest { .setRootComponentRef(1) .build()); - sut.execute(); + underTest.execute(); ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(IdUuidPair.class); verify(projectCleaner).purge(any(DbSession.class), argumentCaptor.capture(), any(Settings.class)); @@ -87,6 +86,6 @@ public class PurgeDatastoresStepTest extends BaseStepTest { @Override protected ComputationStep step() { - return sut; + return underTest; } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java index 92ea18835a1..e1fd598d8be 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java @@ -19,7 +19,6 @@ */ package org.sonar.server.computation.step; -import java.io.IOException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -65,13 +64,13 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { NotificationService notifService = mock(NotificationService.class); IssueCache issueCache; - SendIssueNotificationsStep sut; + SendIssueNotificationsStep underTest; @Before public void setUp() throws Exception { issueCache = new IssueCache(temp.newFile(), System2.INSTANCE); NewIssuesNotificationFactory newIssuesNotificationFactory = mock(NewIssuesNotificationFactory.class, Mockito.RETURNS_DEEP_STUBS); - sut = new SendIssueNotificationsStep(issueCache, mock(RuleRepository.class), treeRootHolder, notifService, reportReader, newIssuesNotificationFactory); + underTest = new SendIssueNotificationsStep(issueCache, mock(RuleRepository.class), treeRootHolder, notifService, reportReader, newIssuesNotificationFactory); treeRootHolder.setRoot(DumbComponent.builder(Component.Type.PROJECT, 1).setUuid(PROJECT_UUID).setKey(PROJECT_KEY).build()); @@ -90,7 +89,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { public void do_not_send_notifications_if_no_subscribers() { when(notifService.hasProjectSubscribersForTypes(PROJECT_UUID, SendIssueNotificationsStep.NOTIF_TYPES)).thenReturn(false); - sut.execute(); + underTest.execute(); verify(notifService, never()).deliver(any(Notification.class)); } @@ -102,7 +101,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { when(notifService.hasProjectSubscribersForTypes(PROJECT_UUID, SendIssueNotificationsStep.NOTIF_TYPES)).thenReturn(true); - sut.execute(); + underTest.execute(); verify(notifService).deliver(any(NewIssuesNotification.class)); verify(notifService, atLeastOnce()).deliver(any(IssueChangeNotification.class)); @@ -110,6 +109,6 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { @Override protected ComputationStep step() { - return sut; + return underTest; } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java index a170469766f..034687fd34c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java @@ -38,14 +38,14 @@ import static org.mockito.Mockito.when; public class IsQueueEmptyWsTest { - IsQueueEmptyWs.IsQueueEmptyAction sut; + IsQueueEmptyWs.IsQueueEmptyAction underTest; ReportQueue queue; Response response; @Before public void before() { queue = mock(ReportQueue.class); - sut = new IsQueueEmptyWs.IsQueueEmptyAction(queue); + underTest = new IsQueueEmptyWs.IsQueueEmptyAction(queue); response = mock(Response.class); when(response.stream()).thenReturn(new FakeStream()); @@ -55,7 +55,7 @@ public class IsQueueEmptyWsTest { public void send_true_when_queue_is_empty() throws Exception { when(queue.all()).thenReturn(new ArrayList()); - sut.handle(mock(Request.class), response); + underTest.handle(mock(Request.class), response); assertThat(response.stream().toString()).isEqualTo("true"); } @@ -64,7 +64,7 @@ public class IsQueueEmptyWsTest { public void send_false_when_queue_is_not_empty() throws Exception { when(queue.all()).thenReturn(Lists.newArrayList(AnalysisReportDto.newForTests(1L))); - sut.handle(mock(Request.class), response); + underTest.handle(mock(Request.class), response); assertThat(response.stream().toString()).isEqualTo("false"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java index 41e0fa32b35..5db7435c27f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/AddManualMeasuresComponentUuidColumnTest.java @@ -32,16 +32,16 @@ public class AddManualMeasuresComponentUuidColumnTest { @Rule public DbTester db = DbTester.createForSchema(System2.INSTANCE, AddManualMeasuresComponentUuidColumnTest.class, "schema.sql"); - AddManualMeasuresComponentUuidColumn sut; + AddManualMeasuresComponentUuidColumn underTest; @Before public void setUp() { - sut = new AddManualMeasuresComponentUuidColumn(db.database()); + underTest = new AddManualMeasuresComponentUuidColumn(db.database()); } @Test public void update_columns() throws Exception { - sut.execute(); + underTest.execute(); db.assertColumnDefinition("manual_measures", "component_uuid", Types.VARCHAR, 50); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java index e8b92685737..1136210fe9b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v52/FeedManualMeasuresComponentUuidTest.java @@ -31,25 +31,25 @@ public class FeedManualMeasuresComponentUuidTest { @Rule public DbTester db = DbTester.createForSchema(System2.INSTANCE, FeedManualMeasuresComponentUuidTest.class, "schema.sql"); - FeedManualMeasuresComponentUuid sut; + FeedManualMeasuresComponentUuid underTest; @Before public void setUp() { db.executeUpdateSql("truncate table manual_measures"); db.executeUpdateSql("truncate table projects"); - sut = new FeedManualMeasuresComponentUuid(db.database()); + underTest = new FeedManualMeasuresComponentUuid(db.database()); } @Test public void migrate_empty_db() throws Exception { - sut.execute(); + underTest.execute(); } @Test public void migrate() throws Exception { db.prepareDbUnit(this.getClass(), "migrate.xml"); - sut.execute(); + underTest.execute(); db.assertDbUnit(this.getClass(), "migrate-result.xml", "manual_measures"); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java index 750de90cdd0..2e78994ee4f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java @@ -50,7 +50,7 @@ import static org.sonar.server.issue.notification.NewIssuesStatistics.Metric.TAG public class MyNewIssuesEmailTemplateTest { - MyNewIssuesEmailTemplate sut; + MyNewIssuesEmailTemplate underTest; DefaultI18n i18n; UserIndex userIndex; Date date; @@ -75,13 +75,13 @@ public class MyNewIssuesEmailTemplateTest { when(i18n.message(any(Locale.class), eq("severity.MINOR"), anyString())).thenReturn("Minor"); when(i18n.message(any(Locale.class), eq("severity.INFO"), anyString())).thenReturn("Info"); - sut = new MyNewIssuesEmailTemplate(settings, i18n); + underTest = new MyNewIssuesEmailTemplate(settings, i18n); } @Test public void no_format_if_not_the_correct_notif() { Notification notification = new Notification("new-issues"); - EmailMessage message = sut.format(notification); + EmailMessage message = underTest.format(notification); assertThat(message).isNull(); } @@ -92,7 +92,7 @@ public class MyNewIssuesEmailTemplateTest { addRules(notification); addComponents(notification); - EmailMessage message = sut.format(notification); + EmailMessage message = underTest.format(notification); // TODO datetime to be completed when test is isolated from JVM timezone String file = IOUtils.toString(getClass().getResource("MyNewIssuesEmailTemplateTest/email_with_all_details.txt"), StandardCharsets.UTF_8); @@ -103,7 +103,7 @@ public class MyNewIssuesEmailTemplateTest { public void message_id() { Notification notification = newNotification(); - EmailMessage message = sut.format(notification); + EmailMessage message = underTest.format(notification); assertThat(message.getMessageId()).isEqualTo("my-new-issues/org.apache:struts"); } @@ -112,7 +112,7 @@ public class MyNewIssuesEmailTemplateTest { public void subject() { Notification notification = newNotification(); - EmailMessage message = sut.format(notification); + EmailMessage message = underTest.format(notification); assertThat(message.getSubject()).isEqualTo("You have 32 new issues on project Struts"); } @@ -121,7 +121,7 @@ public class MyNewIssuesEmailTemplateTest { public void format_email_with_no_assignees_tags_nor_components() throws Exception { Notification notification = newNotification(); - EmailMessage message = sut.format(notification); + EmailMessage message = underTest.format(notification); // TODO datetime to be completed when test is isolated from JVM timezone String file = IOUtils.toString(getClass().getResource("MyNewIssuesEmailTemplateTest/email_with_no_assignee_tags_components.txt"), StandardCharsets.UTF_8); @@ -134,7 +134,7 @@ public class MyNewIssuesEmailTemplateTest { .setFieldValue(SEVERITY + ".count", "32") .setFieldValue("projectName", "Struts"); - EmailMessage message = sut.format(notification); + EmailMessage message = underTest.format(notification); assertThat(message.getMessage()).doesNotContain("See it"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java index b697cdfe159..06cd185eb54 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationDispatcherTest.java @@ -33,7 +33,7 @@ import static org.mockito.Mockito.*; public class MyNewIssuesNotificationDispatcherTest { - private MyNewIssuesNotificationDispatcher sut; + private MyNewIssuesNotificationDispatcher underTest; private NotificationManager notificationManager = mock(NotificationManager.class); private NotificationDispatcher.Context context = mock(NotificationDispatcher.Context.class); @@ -43,13 +43,13 @@ public class MyNewIssuesNotificationDispatcherTest { @Before public void setUp() { - sut = new MyNewIssuesNotificationDispatcher(notificationManager); + underTest = new MyNewIssuesNotificationDispatcher(notificationManager); } @Test public void do_not_dispatch_if_no_new_notification() { Notification notification = new Notification("other-notif"); - sut.performDispatch(notification, context); + underTest.performDispatch(notification, context); verify(context, never()).addUser(any(String.class), any(NotificationChannel.class)); } @@ -59,12 +59,12 @@ public class MyNewIssuesNotificationDispatcherTest { Multimap recipients = HashMultimap.create(); recipients.put("user1", emailChannel); recipients.put("user2", twitterChannel); - when(notificationManager.findNotificationSubscribers(sut, "struts")).thenReturn(recipients); + when(notificationManager.findNotificationSubscribers(underTest, "struts")).thenReturn(recipients); Notification notification = new Notification(MyNewIssuesNotification.MY_NEW_ISSUES_NOTIF_TYPE) .setFieldValue("projectKey", "struts") .setFieldValue("assignee", "user1"); - sut.performDispatch(notification, context); + underTest.performDispatch(notification, context); verify(context).addUser("user1", emailChannel); verifyNoMoreInteractions(context); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationTest.java index 7d334b1d4b6..759fb6e3728 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesNotificationTest.java @@ -32,18 +32,18 @@ import static org.sonar.server.issue.notification.AbstractNewIssuesEmailTemplate public class MyNewIssuesNotificationTest { - MyNewIssuesNotification sut = new MyNewIssuesNotification(mock(UserIndex.class), mock(RuleIndex.class), mock(DbClient.class), mock(Durations.class)); + MyNewIssuesNotification underTest = new MyNewIssuesNotification(mock(UserIndex.class), mock(RuleIndex.class), mock(DbClient.class), mock(Durations.class)); @Test public void set_assignee() { - sut.setAssignee("myAssignee"); + underTest.setAssignee("myAssignee"); - assertThat(sut.getFieldValue(FIELD_ASSIGNEE)).isEqualTo("myAssignee"); + assertThat(underTest.getFieldValue(FIELD_ASSIGNEE)).isEqualTo("myAssignee"); } @Test public void set_with_a_specific_type() { - assertThat(sut.getType()).isEqualTo(MyNewIssuesNotification.MY_NEW_ISSUES_NOTIF_TYPE); + assertThat(underTest.getType()).isEqualTo(MyNewIssuesNotification.MY_NEW_ISSUES_NOTIF_TYPE); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java index 0c8aa347ace..ad0e289ca6c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java @@ -59,24 +59,24 @@ public class NewIssuesNotificationTest { RuleIndex ruleIndex = mock(RuleIndex.class); DbClient dbClient = mock(DbClient.class, Mockito.RETURNS_DEEP_STUBS); Durations durations = mock(Durations.class); - NewIssuesNotification sut = new NewIssuesNotification(userIndex, ruleIndex, dbClient, durations); + NewIssuesNotification underTest = new NewIssuesNotification(userIndex, ruleIndex, dbClient, durations); @Test public void set_project() { - sut.setProject("project-key", "project-uuid", "project-long-name"); + underTest.setProject("project-key", "project-uuid", "project-long-name"); - assertThat(sut.getFieldValue(NewIssuesEmailTemplate.FIELD_PROJECT_NAME)).isEqualTo("project-long-name"); - assertThat(sut.getFieldValue(NewIssuesEmailTemplate.FIELD_PROJECT_UUID)).isEqualTo("project-uuid"); - assertThat(sut.getFieldValue(NewIssuesEmailTemplate.FIELD_PROJECT_KEY)).isEqualTo("project-key"); + assertThat(underTest.getFieldValue(NewIssuesEmailTemplate.FIELD_PROJECT_NAME)).isEqualTo("project-long-name"); + assertThat(underTest.getFieldValue(NewIssuesEmailTemplate.FIELD_PROJECT_UUID)).isEqualTo("project-uuid"); + assertThat(underTest.getFieldValue(NewIssuesEmailTemplate.FIELD_PROJECT_KEY)).isEqualTo("project-key"); } @Test public void set_date() { Date date = new Date(); - sut.setAnalysisDate(date); + underTest.setAnalysisDate(date); - assertThat(sut.getFieldValue(NewIssuesEmailTemplate.FIELD_PROJECT_DATE)).isEqualTo(DateUtils.formatDateTime(date)); + assertThat(underTest.getFieldValue(NewIssuesEmailTemplate.FIELD_PROJECT_DATE)).isEqualTo(DateUtils.formatDateTime(date)); } @Test @@ -88,36 +88,36 @@ public class NewIssuesNotificationTest { when(ruleIndex.getByKey(RuleKey.of("SonarQube", "rule-the-world"))).thenReturn(newRule("Rule the World", "Java")); when(ruleIndex.getByKey(RuleKey.of("SonarQube", "rule-the-universe"))).thenReturn(newRule("Rule the Universe", "Clojure")); - sut.setStatistics("project-long-name", stats); - - assertThat(sut.getFieldValue(SEVERITY + ".INFO.count")).isEqualTo("5"); - assertThat(sut.getFieldValue(SEVERITY + ".BLOCKER.count")).isEqualTo("3"); - assertThat(sut.getFieldValue(ASSIGNEE + ".1.label")).isEqualTo("maynard"); - assertThat(sut.getFieldValue(ASSIGNEE + ".1.count")).isEqualTo("5"); - assertThat(sut.getFieldValue(ASSIGNEE + ".2.label")).isEqualTo("keenan"); - assertThat(sut.getFieldValue(ASSIGNEE + ".2.count")).isEqualTo("3"); - assertThat(sut.getFieldValue(TAG + ".1.label")).isEqualTo("owasp"); - assertThat(sut.getFieldValue(TAG + ".1.count")).isEqualTo("8"); - assertThat(sut.getFieldValue(TAG + ".2.label")).isEqualTo("bug"); - assertThat(sut.getFieldValue(TAG + ".2.count")).isEqualTo("5"); - assertThat(sut.getFieldValue(COMPONENT + ".1.label")).isEqualTo("file-name"); - assertThat(sut.getFieldValue(COMPONENT + ".1.count")).isEqualTo("5"); - assertThat(sut.getFieldValue(COMPONENT + ".2.label")).isEqualTo("directory-name"); - assertThat(sut.getFieldValue(COMPONENT + ".2.count")).isEqualTo("3"); - assertThat(sut.getFieldValue(RULE + ".1.label")).isEqualTo("Rule the World (Java)"); - assertThat(sut.getFieldValue(RULE + ".1.count")).isEqualTo("5"); - assertThat(sut.getFieldValue(RULE + ".2.label")).isEqualTo("Rule the Universe (Clojure)"); - assertThat(sut.getFieldValue(RULE + ".2.count")).isEqualTo("3"); - assertThat(sut.getDefaultMessage()).startsWith("8 new issues on project-long-name"); + underTest.setStatistics("project-long-name", stats); + + assertThat(underTest.getFieldValue(SEVERITY + ".INFO.count")).isEqualTo("5"); + assertThat(underTest.getFieldValue(SEVERITY + ".BLOCKER.count")).isEqualTo("3"); + assertThat(underTest.getFieldValue(ASSIGNEE + ".1.label")).isEqualTo("maynard"); + assertThat(underTest.getFieldValue(ASSIGNEE + ".1.count")).isEqualTo("5"); + assertThat(underTest.getFieldValue(ASSIGNEE + ".2.label")).isEqualTo("keenan"); + assertThat(underTest.getFieldValue(ASSIGNEE + ".2.count")).isEqualTo("3"); + assertThat(underTest.getFieldValue(TAG + ".1.label")).isEqualTo("owasp"); + assertThat(underTest.getFieldValue(TAG + ".1.count")).isEqualTo("8"); + assertThat(underTest.getFieldValue(TAG + ".2.label")).isEqualTo("bug"); + assertThat(underTest.getFieldValue(TAG + ".2.count")).isEqualTo("5"); + assertThat(underTest.getFieldValue(COMPONENT + ".1.label")).isEqualTo("file-name"); + assertThat(underTest.getFieldValue(COMPONENT + ".1.count")).isEqualTo("5"); + assertThat(underTest.getFieldValue(COMPONENT + ".2.label")).isEqualTo("directory-name"); + assertThat(underTest.getFieldValue(COMPONENT + ".2.count")).isEqualTo("3"); + assertThat(underTest.getFieldValue(RULE + ".1.label")).isEqualTo("Rule the World (Java)"); + assertThat(underTest.getFieldValue(RULE + ".1.count")).isEqualTo("5"); + assertThat(underTest.getFieldValue(RULE + ".2.label")).isEqualTo("Rule the Universe (Clojure)"); + assertThat(underTest.getFieldValue(RULE + ".2.count")).isEqualTo("3"); + assertThat(underTest.getDefaultMessage()).startsWith("8 new issues on project-long-name"); } @Test public void set_debt() { when(durations.format(any(Locale.class), any(Duration.class))).thenReturn("55 min"); - sut.setDebt(Duration.create(55)); + underTest.setDebt(Duration.create(55)); - assertThat(sut.getFieldValue(DEBT + ".count")).isEqualTo("55 min"); + assertThat(underTest.getFieldValue(DEBT + ".count")).isEqualTo("55 min"); } private void addIssueNTimes(DefaultIssue issue, int times) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java index 08f6851849b..9dd6de2b344 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesStatisticsTest.java @@ -32,15 +32,15 @@ import static org.assertj.core.api.Assertions.assertThat; public class NewIssuesStatisticsTest { - NewIssuesStatistics sut = new NewIssuesStatistics(); + NewIssuesStatistics underTest = new NewIssuesStatistics(); @Test public void add_issues_with_correct_global_statistics() { DefaultIssue issue = defaultIssue(); - sut.add(issue); - sut.add(issue.setAssignee("james")); - sut.add(issue.setAssignee("keenan")); + underTest.add(issue); + underTest.add(issue.setAssignee("james")); + underTest.add(issue.setAssignee("keenan")); assertThat(countDistribution(Metric.ASSIGNEE, "maynard")).isEqualTo(1); assertThat(countDistribution(Metric.ASSIGNEE, "james")).isEqualTo(1); @@ -54,19 +54,19 @@ public class NewIssuesStatisticsTest { assertThat(countDistribution(Metric.TAG, "wrong-tag")).isEqualTo(0); assertThat(countDistribution(Metric.RULE, "SonarQube:rule-the-world")).isEqualTo(3); assertThat(countDistribution(Metric.RULE, "SonarQube:has-a-fake-rule")).isEqualTo(0); - assertThat(sut.globalStatistics().debt().toMinutes()).isEqualTo(15L); - assertThat(sut.globalStatistics().hasIssues()).isTrue(); - assertThat(sut.hasIssues()).isTrue(); - assertThat(sut.assigneesStatistics().get("maynard").hasIssues()).isTrue(); + assertThat(underTest.globalStatistics().debt().toMinutes()).isEqualTo(15L); + assertThat(underTest.globalStatistics().hasIssues()).isTrue(); + assertThat(underTest.hasIssues()).isTrue(); + assertThat(underTest.assigneesStatistics().get("maynard").hasIssues()).isTrue(); } @Test public void do_not_have_issues_when_no_issue_added() { - assertThat(sut.globalStatistics().hasIssues()).isFalse(); + assertThat(underTest.globalStatistics().hasIssues()).isFalse(); } private int countDistribution(Metric metric, String label) { - return sut.globalStatistics().countForMetric(metric, label); + return underTest.globalStatistics().countForMetric(metric, label); } private DefaultIssue defaultIssue() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java index 9c637847457..5fd4834e24d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasureValidatorTest.java @@ -43,54 +43,54 @@ public class CustomMeasureValidatorTest { @Rule public ExpectedException expectedException = ExpectedException.none(); - CustomMeasureValidator sut = new CustomMeasureValidator(newFullTypeValidations()); + CustomMeasureValidator underTest = new CustomMeasureValidator(newFullTypeValidations()); CustomMeasureDto customMeasure = CustomMeasureTesting.newCustomMeasureDto(); @Test public void set_boolean_true_value() { - sut.setMeasureValue(customMeasure, "true", newMetricDto().setValueType(BOOL.name())); + underTest.setMeasureValue(customMeasure, "true", newMetricDto().setValueType(BOOL.name())); assertThat(customMeasure.getValue()).isCloseTo(1.0d, defaultOffset()); } @Test public void set_boolean_false_value() { - sut.setMeasureValue(customMeasure, "false", newMetricDto().setValueType(BOOL.name())); + underTest.setMeasureValue(customMeasure, "false", newMetricDto().setValueType(BOOL.name())); assertThat(customMeasure.getValue()).isCloseTo(0.0d, defaultOffset()); } @Test public void set_integer_value() { - sut.setMeasureValue(customMeasure, "1984", newMetricDto().setValueType(INT.name())); + underTest.setMeasureValue(customMeasure, "1984", newMetricDto().setValueType(INT.name())); assertThat(customMeasure.getValue()).isCloseTo(1984d, defaultOffset()); } @Test public void set_float_value() { - sut.setMeasureValue(customMeasure, "3.14", newMetricDto().setValueType(FLOAT.name())); + underTest.setMeasureValue(customMeasure, "3.14", newMetricDto().setValueType(FLOAT.name())); assertThat(customMeasure.getValue()).isCloseTo(3.14d, defaultOffset()); } @Test public void set_long_value() { - sut.setMeasureValue(customMeasure, "123456789", newMetricDto().setValueType(WORK_DUR.name())); + underTest.setMeasureValue(customMeasure, "123456789", newMetricDto().setValueType(WORK_DUR.name())); assertThat(customMeasure.getValue()).isCloseTo(123456789d, defaultOffset()); } @Test public void set_level_value() { - sut.setMeasureValue(customMeasure, WARN.name(), newMetricDto().setValueType(LEVEL.name())); + underTest.setMeasureValue(customMeasure, WARN.name(), newMetricDto().setValueType(LEVEL.name())); assertThat(customMeasure.getTextValue()).isEqualTo(WARN.name()); } @Test public void set_string_value() { - sut.setMeasureValue(customMeasure, "free-text-string", newMetricDto().setValueType(STRING.name())); + underTest.setMeasureValue(customMeasure, "free-text-string", newMetricDto().setValueType(STRING.name())); assertThat(customMeasure.getTextValue()).isEqualTo("free-text-string"); } @@ -99,14 +99,14 @@ public class CustomMeasureValidatorTest { public void fail_when_non_compliant_value() { expectedException.expect(BadRequestException.class); - sut.setMeasureValue(customMeasure, "non-compliant-boolean-value", newMetricDto().setValueType(BOOL.name())); + underTest.setMeasureValue(customMeasure, "non-compliant-boolean-value", newMetricDto().setValueType(BOOL.name())); } @Test public void fail_when_non_compliant_level_value() { expectedException.expect(BadRequestException.class); - sut.setMeasureValue(customMeasure, "non-compliant-level-value", newMetricDto().setValueType(LEVEL.name())); + underTest.setMeasureValue(customMeasure, "non-compliant-level-value", newMetricDto().setValueType(LEVEL.name())); } private Offset defaultOffset() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java index 6452f4477d8..f9b51807b04 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/TempFolderProviderTest.java @@ -41,7 +41,7 @@ public class TempFolderProviderTest { @Rule public TemporaryFolder temp = new TemporaryFolder(); - TempFolderProvider sut = new TempFolderProvider(); + TempFolderProvider underTest = new TempFolderProvider(); @Test public void existing_temp_dir() throws Exception { @@ -49,7 +49,7 @@ public class TempFolderProviderTest { File tmpDir = temp.newFolder(); when(fs.getTempDir()).thenReturn(tmpDir); - TempFolder folder = sut.provide(fs); + TempFolder folder = underTest.provide(fs); assertThat(folder).isNotNull(); File newDir = folder.newDir(); assertThat(newDir).exists().isDirectory(); @@ -63,7 +63,7 @@ public class TempFolderProviderTest { when(fs.getTempDir()).thenReturn(tmpDir); FileUtils.forceDelete(tmpDir); - TempFolder folder = sut.provide(fs); + TempFolder folder = underTest.provide(fs); assertThat(folder).isNotNull(); File newDir = folder.newDir(); assertThat(newDir).exists().isDirectory(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java index 1dbb3dd70cf..c36e169c0b9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseMonitorMBeanTest.java @@ -30,29 +30,29 @@ import static org.assertj.core.api.Assertions.assertThat; public class BaseMonitorMBeanTest { - FakeMonitor sut = new FakeMonitor(); + FakeMonitor underTest = new FakeMonitor(); @Test public void test_registration() throws Exception { assertThat(getMBean()).isNull(); - sut.start(); + underTest.start(); assertThat(getMBean()).isNotNull(); - sut.stop(); + underTest.stop(); assertThat(getMBean()).isNull(); } @Test public void do_not_fail_when_stopping_unstarted() throws Exception { - sut.stop(); + underTest.stop(); assertThat(getMBean()).isNull(); } @CheckForNull private ObjectInstance getMBean() throws Exception { try { - return ManagementFactory.getPlatformMBeanServer().getObjectInstance(sut.objectName()); + return ManagementFactory.getPlatformMBeanServer().getObjectInstance(underTest.objectName()); } catch (InstanceNotFoundException e) { return null; } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java index 7328db262cd..d3795c868da 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DatabaseMonitorTest.java @@ -34,17 +34,17 @@ public class DatabaseMonitorTest { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); - DatabaseMonitor sut; + DatabaseMonitor underTest; @Before public void setUp() { DatabaseVersion dbVersion = new DatabaseVersion(dbTester.myBatis()); - sut = new DatabaseMonitor(dbVersion, dbTester.getDbClient()); + underTest = new DatabaseMonitor(dbVersion, dbTester.getDbClient()); } @Test public void db_info() { - LinkedHashMap attributes = sut.attributes(); + LinkedHashMap attributes = underTest.attributes(); assertThat(attributes.get("Database")).isEqualTo("H2"); assertThat(attributes.get("Database Version").toString()).startsWith("1."); assertThat(attributes.get("Username")).isEqualTo("SONAR"); @@ -53,7 +53,7 @@ public class DatabaseMonitorTest { @Test public void pool_info() { - LinkedHashMap attributes = sut.attributes(); + LinkedHashMap attributes = underTest.attributes(); assertThat((int) attributes.get("Pool Max Connections")).isGreaterThan(0); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/JvmPropertiesMonitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/JvmPropertiesMonitorTest.java index 28f3424f838..652b41d7c37 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/JvmPropertiesMonitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/JvmPropertiesMonitorTest.java @@ -29,8 +29,8 @@ public class JvmPropertiesMonitorTest { @Test public void attributes() { - JvmPropertiesMonitor sut = new JvmPropertiesMonitor(); - LinkedHashMap attributes = sut.attributes(); + JvmPropertiesMonitor underTest = new JvmPropertiesMonitor(); + LinkedHashMap attributes = underTest.attributes(); assertThat(attributes).containsKeys("java.vm.vendor", "os.name"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsMonitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsMonitorTest.java index 50190428539..9d8b2db375a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsMonitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsMonitorTest.java @@ -36,11 +36,11 @@ import static org.mockito.Mockito.when; public class PluginsMonitorTest { PluginRepository repo = mock(PluginRepository.class); - PluginsMonitor sut = new PluginsMonitor(repo); + PluginsMonitor underTest = new PluginsMonitor(repo); @Test public void name() { - assertThat(sut.name()).isEqualTo("Plugins"); + assertThat(underTest.name()).isEqualTo("Plugins"); } @Test @@ -55,7 +55,7 @@ public class PluginsMonitorTest { new PluginInfo("no-version") .setName("No Version"))); - LinkedHashMap attributes = sut.attributes(); + LinkedHashMap attributes = underTest.attributes(); assertThat(attributes).containsKeys("key-1", "key-2"); assertThat((Map) attributes.get("key-1")) diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SystemMonitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SystemMonitorTest.java index 783e2cc1e10..4ddb12db103 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SystemMonitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SystemMonitorTest.java @@ -27,16 +27,16 @@ import static org.assertj.core.api.Assertions.assertThat; public class SystemMonitorTest { - SystemMonitor sut = new SystemMonitor(); + SystemMonitor underTest = new SystemMonitor(); @Test public void name() { - assertThat(sut.name()).isEqualTo("System"); + assertThat(underTest.name()).isEqualTo("System"); } @Test public void system_properties() { - LinkedHashMap attributes = sut.attributes(); + LinkedHashMap attributes = underTest.attributes(); assertThat(attributes).containsKeys("System Date", "Processors"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java index 74cf84b130f..a4439de25b4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java @@ -43,13 +43,13 @@ public class InfoActionTest { Monitor monitor1 = mock(Monitor.class); Monitor monitor2 = mock(Monitor.class); - InfoAction sut = new InfoAction(userSessionRule, monitor1, monitor2); + InfoAction underTest = new InfoAction(userSessionRule, monitor1, monitor2); @Test(expected = ForbiddenException.class) public void should_fail_when_does_not_have_admin_right() { userSessionRule.setGlobalPermissions(GlobalPermissions.SCAN_EXECUTION); - sut.handle(mock(Request.class), mock(Response.class)); + underTest.handle(mock(Request.class), mock(Response.class)); } @Test @@ -67,7 +67,7 @@ public class InfoActionTest { when(monitor2.attributes()).thenReturn(attributes2); WsTester.TestResponse response = new WsTester.TestResponse(); - sut.handle(new SimpleGetRequest(), response); + underTest.handle(new SimpleGetRequest(), response); assertThat(response.outputAsString()).isEqualTo("{\"Monitor One\":{\"foo\":\"bar\"},\"Monitor Two\":{\"one\":1,\"two\":2}}"); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryFactoryTest.java index 489d9f4c5e5..59ed79f206e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryFactoryTest.java @@ -35,26 +35,26 @@ import static org.mockito.Mockito.mock; public class ProjectSettingsRespositoryFactoryTest { - private ProjectSettingsFactory sut; + private ProjectSettingsFactory underTest; @Before public void before() { Settings settings = mock(Settings.class); PropertiesDao dao = mock(PropertiesDao.class); - this.sut = new ProjectSettingsFactory(settings, dao); + this.underTest = new ProjectSettingsFactory(settings, dao); } @Test public void newProjectSettings_returns_a_ProjectSettings() { - Settings projectSettings = sut.newProjectSettings("PROJECT_KEY"); + Settings projectSettings = underTest.newProjectSettings("PROJECT_KEY"); assertThat(projectSettings).isInstanceOf(ProjectSettings.class); } @Test public void transform_empty_list_into_empty_map() { - Map propertyMap = sut.getPropertyMap(Lists.newArrayList()); + Map propertyMap = underTest.getPropertyMap(Lists.newArrayList()); assertThat(propertyMap).isEmpty(); } @@ -65,7 +65,7 @@ public class ProjectSettingsRespositoryFactoryTest { PropertyDto property2 = new PropertyDto().setKey("2").setValue("val2"); PropertyDto property3 = new PropertyDto().setKey("3").setValue("val3"); - Map propertyMap = sut.getPropertyMap(newArrayList(property1, property2, property3)); + Map propertyMap = underTest.getPropertyMap(newArrayList(property1, property2, property3)); assertThat(propertyMap.get("1")).isEqualTo("val1"); assertThat(propertyMap.get("2")).isEqualTo("val2"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryTest.java index 214729cd21e..6ea1e586b69 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/properties/ProjectSettingsRespositoryTest.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify; public class ProjectSettingsRespositoryTest { - private ProjectSettings sut; + private ProjectSettings underTest; private Settings settings; @@ -46,11 +46,11 @@ public class ProjectSettingsRespositoryTest { @Test public void call_global_settings_method_when_no_project_specific_settings() { - this.sut = new ProjectSettings(settings, Maps.newHashMap()); + this.underTest = new ProjectSettings(settings, Maps.newHashMap()); - sut.getInt("anyKey"); - sut.getBoolean("anyKey"); - sut.getString("anyKey"); + underTest.getInt("anyKey"); + underTest.getBoolean("anyKey"); + underTest.getString("anyKey"); verify(settings, times(1)).getBoolean(anyString()); verify(settings, times(1)).getInt(anyString()); @@ -61,18 +61,18 @@ public class ProjectSettingsRespositoryTest { public void getInt_property_throws_exception_when_value_is_not_formatted_correctly() { HashMap properties = Maps.newHashMap(); properties.put("intKey", "wrongIntValue"); - this.sut = new ProjectSettings(settings, properties); + this.underTest = new ProjectSettings(settings, properties); - sut.getInt("intKey"); + underTest.getInt("intKey"); } @Test public void getInt_property_return_0_when_empty_property() { HashMap properties = Maps.newHashMap(); properties.put("intKey", ""); - this.sut = new ProjectSettings(settings, properties); + this.underTest = new ProjectSettings(settings, properties); - int value = sut.getInt("intKey"); + int value = underTest.getInt("intKey"); assertThat(value).isEqualTo(0); } @@ -81,9 +81,9 @@ public class ProjectSettingsRespositoryTest { public void getInt_property_return_the_int_value() { HashMap properties = Maps.newHashMap(); properties.put("intKey", "123"); - this.sut = new ProjectSettings(settings, properties); + this.underTest = new ProjectSettings(settings, properties); - int value = sut.getInt("intKey"); + int value = underTest.getInt("intKey"); assertThat(value).isEqualTo(123); } @@ -92,9 +92,9 @@ public class ProjectSettingsRespositoryTest { public void getString_returns_String_property() { HashMap properties = Maps.newHashMap(); properties.put("stringKey", "stringValue"); - this.sut = new ProjectSettings(settings, properties); + this.underTest = new ProjectSettings(settings, properties); - String value = sut.getString("stringKey"); + String value = underTest.getString("stringKey"); assertThat(value).isEqualTo("stringValue"); } @@ -103,9 +103,9 @@ public class ProjectSettingsRespositoryTest { public void getBoolean_returns_exception_when_value_is_not_formatted_correctly() { HashMap properties = Maps.newHashMap(); properties.put("boolKey", "wronglyFormattedBoolean"); - this.sut = new ProjectSettings(settings, properties); + this.underTest = new ProjectSettings(settings, properties); - boolean key = sut.getBoolean("boolKey"); + boolean key = underTest.getBoolean("boolKey"); assertThat(key).isFalse(); } @@ -114,9 +114,9 @@ public class ProjectSettingsRespositoryTest { public void getBoolean_returns_false_when_value_is_empty() { HashMap properties = Maps.newHashMap(); properties.put("boolKey", ""); - this.sut = new ProjectSettings(settings, properties); + this.underTest = new ProjectSettings(settings, properties); - boolean key = sut.getBoolean("boolKey"); + boolean key = underTest.getBoolean("boolKey"); assertThat(key).isFalse(); } @@ -126,10 +126,10 @@ public class ProjectSettingsRespositoryTest { HashMap properties = Maps.newHashMap(); properties.put("boolKey1", "true"); properties.put("boolKey2", "True"); - this.sut = new ProjectSettings(settings, properties); + this.underTest = new ProjectSettings(settings, properties); - boolean key1 = sut.getBoolean("boolKey1"); - boolean key2 = sut.getBoolean("boolKey2"); + boolean key1 = underTest.getBoolean("boolKey1"); + boolean key2 = underTest.getBoolean("boolKey2"); assertThat(key1).isTrue(); assertThat(key2).isTrue(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java index f64c1e81fac..8cfeabdfe34 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java @@ -36,7 +36,7 @@ public class TestIndexTest { @ClassRule public static EsTester es = new EsTester().addDefinitions(new TestIndexDefinition(new Settings())); - TestIndex sut = new TestIndex(es.client()); + TestIndex underTest = new TestIndex(es.client()); @Before public void setup() { @@ -49,7 +49,7 @@ public class TestIndexTest { newTestDoc("1", newCoverageBlock("3"), newCoverageBlock("4"), newCoverageBlock("5")), newTestDoc("2", newCoverageBlock("5"), newCoverageBlock("6"), newCoverageBlock("7"))); - List result = sut.coveredFiles("uuid-1"); + List result = underTest.coveredFiles("uuid-1"); assertThat(result).hasSize(3); assertThat(result).extractingResultOf("fileUuid").containsOnly("main-uuid-3", "main-uuid-4", "main-uuid-5"); @@ -63,7 +63,7 @@ public class TestIndexTest { newTestDoc("1", newCoverageBlock("5"), newCoverageBlock("6"), newCoverageBlock("7")), newTestDoc("2", newCoverageBlock("5"), newCoverageBlock("6"), newCoverageBlock("7"))); - List result = sut.searchByTestFileUuid("file-uuid-1", searchOptions()).getDocs(); + List result = underTest.searchByTestFileUuid("file-uuid-1", searchOptions()).getDocs(); assertThat(result).hasSize(2); assertThat(result).extractingResultOf("name").containsOnly("name-1"); @@ -76,7 +76,7 @@ public class TestIndexTest { newTestDoc("2", newCoverageBlock("3"), newCoverageBlock("4"), newCoverageBlock("5")), newTestDoc("3", newCoverageBlock("5"), newCoverageBlock("6"), newCoverageBlock("7"))); - List result = sut.searchBySourceFileUuidAndLineNumber("main-uuid-5", 82, searchOptions()).getDocs(); + List result = underTest.searchBySourceFileUuidAndLineNumber("main-uuid-5", 82, searchOptions()).getDocs(); assertThat(result).hasSize(2); assertThat(result).extractingResultOf("name").containsOnly("name-2", "name-3"); @@ -88,7 +88,7 @@ public class TestIndexTest { newTestDoc("1", newCoverageBlock("3"), newCoverageBlock("4"), newCoverageBlock("5")), newTestDoc("2", newCoverageBlock("5"), newCoverageBlock("6"), newCoverageBlock("7"))); - TestDoc test = sut.searchByTestUuid("uuid-1"); + TestDoc test = underTest.searchByTestUuid("uuid-1"); assertThat(test.testUuid()).isEqualTo("uuid-1"); assertThat(test.fileUuid()).isEqualTo("file-uuid-1"); @@ -106,7 +106,7 @@ public class TestIndexTest { newTestDoc("1", newCoverageBlock("3"), newCoverageBlock("4"), newCoverageBlock("5")), newTestDoc("2", newCoverageBlock("5"), newCoverageBlock("6"), newCoverageBlock("7"))); - List result = sut.searchByTestUuid("uuid-1", searchOptions()).getDocs(); + List result = underTest.searchByTestUuid("uuid-1", searchOptions()).getDocs(); assertThat(result).hasSize(1); assertThat(result.get(0).testUuid()).isEqualTo("uuid-1"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java index 515e60a7f1a..daf04e6795f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java @@ -70,14 +70,14 @@ public class TestIndexerTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); - private TestIndexer sut; + private TestIndexer underTest; @Before public void setUp() { es.truncateIndices(); db.truncateTables(); - sut = new TestIndexer(new DbClient(db.database(), db.myBatis()), es.client()); - sut.setEnabled(true); + underTest = new TestIndexer(new DbClient(db.database(), db.myBatis()), es.client()); + underTest.setEnabled(true); } @Test @@ -85,7 +85,7 @@ public class TestIndexerTest { db.prepareDbUnit(getClass(), "db.xml"); TestTesting.updateDataColumn(db.getSession(), "FILE_UUID", TestTesting.newRandomTests(3)); - sut.index(); + underTest.index(); assertThat(countDocuments()).isEqualTo(3); } @@ -96,7 +96,7 @@ public class TestIndexerTest { TestTesting.updateDataColumn(db.getSession(), "FILE_UUID", TestTesting.newRandomTests(3)); - sut.index("PROJECT_UUID"); + underTest.index("PROJECT_UUID"); assertThat(countDocuments()).isEqualTo(3); } @@ -106,7 +106,7 @@ public class TestIndexerTest { TestTesting.updateDataColumn(db.getSession(), "FILE_UUID", TestTesting.newRandomTests(3)); - sut.index("UNKNOWN"); + underTest.index("UNKNOWN"); assertThat(countDocuments()).isZero(); } @@ -131,7 +131,7 @@ public class TestIndexerTest { .addCoveredFile(FileSourceDb.Test.CoveredFile.newBuilder().setFileUuid("MAIN_UUID_1").addCoveredLine(42)) .build() )); - sut.index(Iterators.singletonIterator(dbRow)); + underTest.index(Iterators.singletonIterator(dbRow)); assertThat(countDocuments()).isEqualTo(2L); @@ -158,7 +158,7 @@ public class TestIndexerTest { indexTest("P1", "F1", "T2", "U112"); indexTest("P1", "F2", "T1", "U121"); - sut.deleteByFile("F1"); + underTest.deleteByFile("F1"); List hits = getDocuments(); Map document = hits.get(0).getSource(); @@ -174,7 +174,7 @@ public class TestIndexerTest { indexTest("P1", "F2", "T1", "U121"); indexTest("P2", "F3", "T1", "U231"); - sut.deleteByProject("P1"); + underTest.deleteByProject("P1"); List hits = getDocuments(); assertThat(hits).hasSize(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java index a2e851e9dc9..100c0ca0e72 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java @@ -47,12 +47,12 @@ public class TestResultSetIteratorTest { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); - TestResultSetIterator sut; + TestResultSetIterator underTest; @After public void after() { - if (sut != null) { - sut.close(); + if (underTest != null) { + underTest.close(); } } @@ -60,9 +60,9 @@ public class TestResultSetIteratorTest { public void traverse_db() throws Exception { dbTester.prepareDbUnit(getClass(), "shared.xml"); TestTesting.updateDataColumn(dbTester.getSession(), "F1", newFakeTests(3)); - sut = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 0L, null); + underTest = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 0L, null); - FileSourcesUpdaterHelper.Row row = sut.next(); + FileSourcesUpdaterHelper.Row row = underTest.next(); assertThat(row.getProjectUuid()).isEqualTo("P1"); assertThat(row.getFileUuid()).isEqualTo("F1"); assertThat(row.getUpdatedAt()).isEqualTo(1416239042000L); @@ -95,9 +95,9 @@ public class TestResultSetIteratorTest { .build() ); TestTesting.updateDataColumn(dbTester.getSession(), "F1", tests); - sut = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 0L, null); + underTest = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 0L, null); - FileSourcesUpdaterHelper.Row row = sut.next(); + FileSourcesUpdaterHelper.Row row = underTest.next(); assertThat(row.getProjectUuid()).isEqualTo("P1"); assertThat(row.getFileUuid()).isEqualTo("F1"); @@ -124,9 +124,9 @@ public class TestResultSetIteratorTest { @Test public void filter_by_date() { dbTester.prepareDbUnit(getClass(), "shared.xml"); - sut = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 2000000000000L, null); + underTest = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 2000000000000L, null); - assertThat(sut.hasNext()).isFalse(); + assertThat(underTest.hasNext()).isFalse(); } @Test @@ -134,14 +134,14 @@ public class TestResultSetIteratorTest { dbTester.prepareDbUnit(getClass(), "filter_by_project.xml"); TestTesting.updateDataColumn(dbTester.getSession(), "F1", newFakeTests(1)); - sut = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 0L, "P1"); + underTest = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 0L, "P1"); - FileSourcesUpdaterHelper.Row row = sut.next(); + FileSourcesUpdaterHelper.Row row = underTest.next(); assertThat(row.getProjectUuid()).isEqualTo("P1"); assertThat(row.getFileUuid()).isEqualTo("F1"); // File from other project P2 is not returned - assertThat(sut.hasNext()).isFalse(); + assertThat(underTest.hasNext()).isFalse(); } @Test @@ -149,14 +149,14 @@ public class TestResultSetIteratorTest { dbTester.prepareDbUnit(getClass(), "filter_by_project_and_date.xml"); TestTesting.updateDataColumn(dbTester.getSession(), "F1", newFakeTests(1)); - sut = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 1400000000000L, "P1"); + underTest = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 1400000000000L, "P1"); - FileSourcesUpdaterHelper.Row row = sut.next(); + FileSourcesUpdaterHelper.Row row = underTest.next(); assertThat(row.getProjectUuid()).isEqualTo("P1"); assertThat(row.getFileUuid()).isEqualTo("F1"); // File F2 is not returned - assertThat(sut.hasNext()).isFalse(); + assertThat(underTest.hasNext()).isFalse(); } @Test @@ -165,10 +165,10 @@ public class TestResultSetIteratorTest { TestTesting.updateDataColumn(dbTester.getSession(), "F1", "THIS_IS_NOT_PROTOBUF".getBytes()); - sut = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 0L, null); + underTest = TestResultSetIterator.create(dbTester.getDbClient(), dbTester.getSession(), 0L, null); try { - assertThat(sut.hasNext()).isTrue(); - sut.next(); + assertThat(underTest.hasNext()).isTrue(); + underTest.next(); fail("it should not be possible to go through not compliant data"); } catch (IllegalStateException e) { // ok diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java index a3a4b5a6a36..a2fdfc7460b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java @@ -30,32 +30,32 @@ import static org.assertj.core.api.Assertions.assertThat; public class LongTypeValidationTest { - LongTypeValidation sut = new LongTypeValidation(); + LongTypeValidation underTest = new LongTypeValidation(); @Rule public ExpectedException expectedException = ExpectedException.none(); @Test public void key_is_long_type_name() { - assertThat(sut.key()).isEqualTo(PropertyType.LONG.name()); + assertThat(underTest.key()).isEqualTo(PropertyType.LONG.name()); } @Test public void do_not_fail_with_long_values() { - sut.validate("1984", null); - sut.validate("-1984", null); + underTest.validate("1984", null); + underTest.validate("-1984", null); } @Test public void fail_when_float() { expectedException.expect(BadRequestException.class); - sut.validate("3.14", null); + underTest.validate("3.14", null); } @Test public void fail_when_string() { expectedException.expect(BadRequestException.class); - sut.validate("original string", null); + underTest.validate("original string", null); } } diff --git a/sonar-db/src/test/java/org/sonar/db/purge/PurgeConfigurationTest.java b/sonar-db/src/test/java/org/sonar/db/purge/PurgeConfigurationTest.java index a150c84ebd1..db8ecebaae4 100644 --- a/sonar-db/src/test/java/org/sonar/db/purge/PurgeConfigurationTest.java +++ b/sonar-db/src/test/java/org/sonar/db/purge/PurgeConfigurationTest.java @@ -57,11 +57,11 @@ public class PurgeConfigurationTest { settings.setProperty(PurgeConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES, 5); Date now = new Date(); - PurgeConfiguration sut = PurgeConfiguration.newDefaultPurgeConfiguration(settings, new IdUuidPair(42L, "any-uuid")); + PurgeConfiguration underTest = PurgeConfiguration.newDefaultPurgeConfiguration(settings, new IdUuidPair(42L, "any-uuid")); - assertThat(sut.scopesWithoutHistoricalData()).contains(Scopes.FILE) + assertThat(underTest.scopesWithoutHistoricalData()).contains(Scopes.FILE) .doesNotContain(Scopes.DIRECTORY); - assertThat(sut.maxLiveDateOfClosedIssues(now)).isEqualTo(DateUtils.addDays(now, -5)); + assertThat(underTest.maxLiveDateOfClosedIssues(now)).isEqualTo(DateUtils.addDays(now, -5)); } @Test @@ -69,8 +69,8 @@ public class PurgeConfigurationTest { Settings settings = new Settings(); settings.setProperty(PurgeConstants.PROPERTY_CLEAN_DIRECTORY, true); - PurgeConfiguration sut = PurgeConfiguration.newDefaultPurgeConfiguration(settings, new IdUuidPair(42L, "any-uuid")); + PurgeConfiguration underTest = PurgeConfiguration.newDefaultPurgeConfiguration(settings, new IdUuidPair(42L, "any-uuid")); - assertThat(sut.scopesWithoutHistoricalData()).contains(Scopes.DIRECTORY, Scopes.FILE); + assertThat(underTest.scopesWithoutHistoricalData()).contains(Scopes.DIRECTORY, Scopes.FILE); } } diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/BaseLoggerTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/BaseLoggerTest.java index 5f34386d175..a2e44da3913 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/BaseLoggerTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/BaseLoggerTest.java @@ -23,10 +23,8 @@ import org.junit.Test; public class BaseLoggerTest { - ConsoleLogger sut = new ConsoleLogger(); - @Test public void log() { - sut.log(LoggerLevel.WARN, "message"); + new ConsoleLogger().log(LoggerLevel.WARN, "message"); } } diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/LogTesterTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/LogTesterTest.java index 9880b1ef13a..89e8e27e8dc 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/LogTesterTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/LogTesterTest.java @@ -25,44 +25,44 @@ import static org.assertj.core.api.Assertions.assertThat; public class LogTesterTest { - LogTester sut = new LogTester(); + LogTester underTest = new LogTester(); @Test public void debugLevel() throws Throwable { - LoggerLevel initial = sut.getLevel(); + LoggerLevel initial = underTest.getLevel(); // when LogTester is used, then debug logs are enabled by default - sut.before(); - assertThat(sut.getLevel()).isEqualTo(LoggerLevel.TRACE); + underTest.before(); + assertThat(underTest.getLevel()).isEqualTo(LoggerLevel.TRACE); assertThat(Loggers.getFactory().getLevel()).isEqualTo(LoggerLevel.TRACE); // change - sut.setLevel(LoggerLevel.INFO); - assertThat(sut.getLevel()).isEqualTo(LoggerLevel.INFO); + underTest.setLevel(LoggerLevel.INFO); + assertThat(underTest.getLevel()).isEqualTo(LoggerLevel.INFO); assertThat(Loggers.getFactory().getLevel()).isEqualTo(LoggerLevel.INFO); // reset to initial level after execution of test - sut.after(); - assertThat(sut.getLevel()).isEqualTo(initial); + underTest.after(); + assertThat(underTest.getLevel()).isEqualTo(initial); assertThat(Loggers.getFactory().getLevel()).isEqualTo(initial); } @Test public void intercept_logs() throws Throwable { - sut.before(); + underTest.before(); Loggers.get("logger1").info("an information"); Loggers.get("logger2").warn("warning: {}", 42); - assertThat(sut.logs()).containsExactly("an information", "warning: 42"); - assertThat(sut.logs(LoggerLevel.ERROR)).isEmpty(); - assertThat(sut.logs(LoggerLevel.INFO)).containsOnly("an information"); - assertThat(sut.logs(LoggerLevel.WARN)).containsOnly("warning: 42"); + assertThat(underTest.logs()).containsExactly("an information", "warning: 42"); + assertThat(underTest.logs(LoggerLevel.ERROR)).isEmpty(); + assertThat(underTest.logs(LoggerLevel.INFO)).containsOnly("an information"); + assertThat(underTest.logs(LoggerLevel.WARN)).containsOnly("warning: 42"); - sut.clear(); - assertThat(sut.logs()).isEmpty(); - assertThat(sut.logs(LoggerLevel.INFO)).isEmpty(); + underTest.clear(); + assertThat(underTest.logs()).isEmpty(); + assertThat(underTest.logs(LoggerLevel.INFO)).isEmpty(); - sut.after(); + underTest.after(); assertThat(LogInterceptors.get()).isSameAs(NullInterceptor.NULL_INSTANCE); } } diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/NullProfilerTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/NullProfilerTest.java index bc9af01a006..563260bfa91 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/NullProfilerTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/log/NullProfilerTest.java @@ -25,24 +25,24 @@ import static org.assertj.core.api.Assertions.assertThat; public class NullProfilerTest { - NullProfiler sut = NullProfiler.NULL_INSTANCE; + NullProfiler underTest = NullProfiler.NULL_INSTANCE; @Test public void do_not_fail() { - assertThat(sut.start()).isSameAs(sut); - assertThat(sut.startTrace("")).isSameAs(sut); - assertThat(sut.startDebug("")).isSameAs(sut); - assertThat(sut.startInfo("")).isSameAs(sut); + assertThat(underTest.start()).isSameAs(underTest); + assertThat(underTest.startTrace("")).isSameAs(underTest); + assertThat(underTest.startDebug("")).isSameAs(underTest); + assertThat(underTest.startInfo("")).isSameAs(underTest); - assertThat(sut.stopTrace()).isSameAs(sut); - assertThat(sut.stopTrace("")).isSameAs(sut); - assertThat(sut.stopDebug("")).isSameAs(sut); - assertThat(sut.stopDebug()).isSameAs(sut); - assertThat(sut.stopInfo()).isSameAs(sut); - assertThat(sut.stopInfo("")).isSameAs(sut); + assertThat(underTest.stopTrace()).isSameAs(underTest); + assertThat(underTest.stopTrace("")).isSameAs(underTest); + assertThat(underTest.stopDebug("")).isSameAs(underTest); + assertThat(underTest.stopDebug()).isSameAs(underTest); + assertThat(underTest.stopInfo()).isSameAs(underTest); + assertThat(underTest.stopInfo("")).isSameAs(underTest); - assertThat(sut.isDebugEnabled()).isFalse(); - assertThat(sut.isTraceEnabled()).isFalse(); - assertThat(sut.addContext("foo", "bar")).isSameAs(sut); + assertThat(underTest.isDebugEnabled()).isFalse(); + assertThat(underTest.isTraceEnabled()).isFalse(); + assertThat(underTest.addContext("foo", "bar")).isSameAs(underTest); } } -- 2.39.5