Skip to content

Commit

Permalink
Rename variables "sut" to "underTest" in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Brandhof committed Jul 16, 2015
1 parent 97e7401 commit 57cb022
Show file tree
Hide file tree
Showing 44 changed files with 641 additions and 637 deletions.
16 changes: 8 additions & 8 deletions ...r/sonar-server/src/test/java/org/sonar/core/computation/dbcleaner/ProjectCleanerTest.java
View file
Expand Up @@ -46,7 +46,7 @@


public class ProjectCleanerTest { public class ProjectCleanerTest {


private ProjectCleaner sut; private ProjectCleaner underTest;
private PurgeDao dao = mock(PurgeDao.class); private PurgeDao dao = mock(PurgeDao.class);
private PurgeProfiler profiler = mock(PurgeProfiler.class); private PurgeProfiler profiler = mock(PurgeProfiler.class);
private DefaultPeriodCleaner periodCleaner = mock(DefaultPeriodCleaner.class); private DefaultPeriodCleaner periodCleaner = mock(DefaultPeriodCleaner.class);
Expand All @@ -56,21 +56,21 @@ public class ProjectCleanerTest {


@Before @Before
public void before() { public void before() {
this.sut = new ProjectCleaner(dao, periodCleaner, profiler, purgeListener, issueIndex); this.underTest = new ProjectCleaner(dao, periodCleaner, profiler, purgeListener, issueIndex);
} }


@Test @Test
public void no_profiling_when_property_is_false() { public void no_profiling_when_property_is_false() {
settings.setProperty(CoreProperties.PROFILING_LOG_PROPERTY, false); settings.setProperty(CoreProperties.PROFILING_LOG_PROPERTY, false);


sut.purge(mock(DbSession.class), mock(IdUuidPair.class), settings); underTest.purge(mock(DbSession.class), mock(IdUuidPair.class), settings);


verify(profiler, never()).dump(anyLong(), any(Logger.class)); verify(profiler, never()).dump(anyLong(), any(Logger.class));
} }


@Test @Test
public void no_indexing_when_no_issue_to_delete() { public void no_indexing_when_no_issue_to_delete() {
sut.purge(mock(DbSession.class), mock(IdUuidPair.class), settings); underTest.purge(mock(DbSession.class), mock(IdUuidPair.class), settings);


verifyZeroInteractions(issueIndex); verifyZeroInteractions(issueIndex);
} }
Expand All @@ -79,7 +79,7 @@ public void no_indexing_when_no_issue_to_delete() {
public void profiling_when_property_is_true() { public void profiling_when_property_is_true() {
settings.setProperty(CoreProperties.PROFILING_LOG_PROPERTY, true); settings.setProperty(CoreProperties.PROFILING_LOG_PROPERTY, true);


sut.purge(mock(DbSession.class), mock(IdUuidPair.class), settings); underTest.purge(mock(DbSession.class), mock(IdUuidPair.class), settings);


verify(profiler).dump(anyLong(), any(Logger.class)); verify(profiler).dump(anyLong(), any(Logger.class));
} }
Expand All @@ -88,7 +88,7 @@ public void profiling_when_property_is_true() {
public void call_period_cleaner_index_client_and_purge_dao() { public void call_period_cleaner_index_client_and_purge_dao() {
settings.setProperty(PurgeConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES, 5); settings.setProperty(PurgeConstants.DAYS_BEFORE_DELETING_CLOSED_ISSUES, 5);


sut.purge(mock(DbSession.class), mock(IdUuidPair.class), settings); underTest.purge(mock(DbSession.class), mock(IdUuidPair.class), settings);


verify(periodCleaner).clean(any(DbSession.class), any(Long.class), any(Settings.class)); verify(periodCleaner).clean(any(DbSession.class), any(Long.class), any(Settings.class));
verify(dao).purge(any(DbSession.class), any(PurgeConfiguration.class), any(PurgeListener.class), any(PurgeProfiler.class)); verify(dao).purge(any(DbSession.class), any(PurgeConfiguration.class), any(PurgeListener.class), any(PurgeProfiler.class));
Expand All @@ -99,7 +99,7 @@ public void call_period_cleaner_index_client_and_purge_dao() {
public void if_dao_purge_fails_it_should_not_interrupt_program_execution() { public void if_dao_purge_fails_it_should_not_interrupt_program_execution() {
doThrow(RuntimeException.class).when(dao).purge(any(DbSession.class), any(PurgeConfiguration.class), any(PurgeListener.class), any(PurgeProfiler.class)); doThrow(RuntimeException.class).when(dao).purge(any(DbSession.class), any(PurgeConfiguration.class), any(PurgeListener.class), any(PurgeProfiler.class));


sut.purge(mock(DbSession.class), mock(IdUuidPair.class), settings); underTest.purge(mock(DbSession.class), mock(IdUuidPair.class), settings);


verify(dao).purge(any(DbSession.class), any(PurgeConfiguration.class), any(PurgeListener.class), any(PurgeProfiler.class)); verify(dao).purge(any(DbSession.class), any(PurgeConfiguration.class), any(PurgeListener.class), any(PurgeProfiler.class));
} }
Expand All @@ -108,7 +108,7 @@ public void if_dao_purge_fails_it_should_not_interrupt_program_execution() {
public void if_profiler_cleaning_fails_it_should_not_interrupt_program_execution() { public void if_profiler_cleaning_fails_it_should_not_interrupt_program_execution() {
doThrow(RuntimeException.class).when(periodCleaner).clean(any(DbSession.class), anyLong(), any(Settings.class)); doThrow(RuntimeException.class).when(periodCleaner).clean(any(DbSession.class), anyLong(), any(Settings.class));


sut.purge(mock(DbSession.class), mock(IdUuidPair.class), settings); underTest.purge(mock(DbSession.class), mock(IdUuidPair.class), settings);


verify(periodCleaner).clean(any(DbSession.class), anyLong(), any(Settings.class)); verify(periodCleaner).clean(any(DbSession.class), anyLong(), any(Settings.class));
} }
Expand Down
16 changes: 8 additions & 8 deletions server/sonar-server/src/test/java/org/sonar/server/activity/index/ActivityIndexTest.java
View file
Expand Up @@ -39,18 +39,18 @@ public class ActivityIndexTest {
@ClassRule @ClassRule
public static EsTester es = new EsTester().addDefinitions(new ActivityIndexDefinition(new Settings())); public static EsTester es = new EsTester().addDefinitions(new ActivityIndexDefinition(new Settings()));


ActivityIndex sut; ActivityIndex underTest;


@Before @Before
public void before() { public void before() {
sut = new ActivityIndex(es.client()); underTest = new ActivityIndex(es.client());
} }


@Test @Test
public void search_all() throws Exception { public void search_all() throws Exception {
es.putDocuments("activities", "activity", newDoc(1, 1_500_000_000_000L), newDoc(2, 1_600_000_000_000L)); es.putDocuments("activities", "activity", newDoc(1, 1_500_000_000_000L), newDoc(2, 1_600_000_000_000L));


SearchResult<ActivityDoc> results = sut.search(new ActivityQuery(), new SearchOptions()); SearchResult<ActivityDoc> results = underTest.search(new ActivityQuery(), new SearchOptions());
assertThat(results.getTotal()).isEqualTo(2L); assertThat(results.getTotal()).isEqualTo(2L);
assertThat(results.getDocs()).hasSize(2); assertThat(results.getDocs()).hasSize(2);
assertThat(results.getDocs()).extracting("message").containsOnly("THE_MSG 1", "THE_MSG 2"); assertThat(results.getDocs()).extracting("message").containsOnly("THE_MSG 1", "THE_MSG 2");
Expand All @@ -62,11 +62,11 @@ public void search_by_type() throws Exception {


ActivityQuery query = new ActivityQuery(); ActivityQuery query = new ActivityQuery();
query.setTypes(Arrays.asList("ANALYSIS_REPORT")); query.setTypes(Arrays.asList("ANALYSIS_REPORT"));
assertThat(sut.search(query, new SearchOptions()).getTotal()).isEqualTo(2L); assertThat(underTest.search(query, new SearchOptions()).getTotal()).isEqualTo(2L);


query = new ActivityQuery(); query = new ActivityQuery();
query.setTypes(Arrays.asList("OTHER", "TYPES")); query.setTypes(Arrays.asList("OTHER", "TYPES"));
assertThat(sut.search(query, new SearchOptions()).getTotal()).isEqualTo(0L); assertThat(underTest.search(query, new SearchOptions()).getTotal()).isEqualTo(0L);
} }


@Test @Test
Expand All @@ -75,7 +75,7 @@ public void search_by_data() throws Exception {


ActivityQuery query = new ActivityQuery(); ActivityQuery query = new ActivityQuery();
query.addDataOrFilter("foo", "bar2"); query.addDataOrFilter("foo", "bar2");
SearchResult<ActivityDoc> results = sut.search(query, new SearchOptions()); SearchResult<ActivityDoc> results = underTest.search(query, new SearchOptions());
assertThat(results.getDocs()).hasSize(1); assertThat(results.getDocs()).hasSize(1);
assertThat(results.getDocs().get(0).getKey()).isEqualTo("UUID2"); assertThat(results.getDocs().get(0).getKey()).isEqualTo("UUID2");
} }
Expand All @@ -86,13 +86,13 @@ public void search_by_date() throws Exception {


ActivityQuery query = new ActivityQuery(); ActivityQuery query = new ActivityQuery();
query.setSince(new Date(1_550_000_000_000L)); query.setSince(new Date(1_550_000_000_000L));
SearchResult<ActivityDoc> results = sut.search(query, new SearchOptions()); SearchResult<ActivityDoc> results = underTest.search(query, new SearchOptions());
assertThat(results.getDocs()).hasSize(1); assertThat(results.getDocs()).hasSize(1);
assertThat(results.getDocs().get(0).getKey()).isEqualTo("UUID2"); assertThat(results.getDocs().get(0).getKey()).isEqualTo("UUID2");


query = new ActivityQuery(); query = new ActivityQuery();
query.setTo(new Date(1_550_000_000_000L)); query.setTo(new Date(1_550_000_000_000L));
results = sut.search(query, new SearchOptions()); results = underTest.search(query, new SearchOptions());
assertThat(results.getDocs()).hasSize(1); assertThat(results.getDocs()).hasSize(1);
assertThat(results.getDocs().get(0).getKey()).isEqualTo("UUID1"); assertThat(results.getDocs().get(0).getKey()).isEqualTo("UUID1");
} }
Expand Down
12 changes: 6 additions & 6 deletions server/sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java
View file
Expand Up @@ -37,14 +37,14 @@ public class StartupLogsTest {
Tomcat tomcat = mock(Tomcat.class, Mockito.RETURNS_DEEP_STUBS); Tomcat tomcat = mock(Tomcat.class, Mockito.RETURNS_DEEP_STUBS);
Logger logger = mock(Logger.class); Logger logger = mock(Logger.class);
Props props = new Props(new Properties()); Props props = new Props(new Properties());
StartupLogs sut = new StartupLogs(props, logger); StartupLogs underTest = new StartupLogs(props, logger);


@Test @Test
public void logAjp() { public void logAjp() {
Connector connector = newConnector("AJP/1.3", "http"); Connector connector = newConnector("AJP/1.3", "http");
when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector}); when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector});


sut.log(tomcat); underTest.log(tomcat);


verify(logger).info("AJP/1.3 connector enabled on port 1234"); verify(logger).info("AJP/1.3 connector enabled on port 1234");
verifyNoMoreInteractions(logger); verifyNoMoreInteractions(logger);
Expand All @@ -55,7 +55,7 @@ public void logHttp() {
Connector connector = newConnector("HTTP/1.1", "http"); Connector connector = newConnector("HTTP/1.1", "http");
when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector}); when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector});


sut.log(tomcat); underTest.log(tomcat);


verify(logger).info("HTTP connector enabled on port 1234"); verify(logger).info("HTTP connector enabled on port 1234");
verifyNoMoreInteractions(logger); verifyNoMoreInteractions(logger);
Expand All @@ -66,7 +66,7 @@ public void logHttps_default_ciphers() {
Connector connector = newConnector("HTTP/1.1", "https"); Connector connector = newConnector("HTTP/1.1", "https");
when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector}); when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector});


sut.log(tomcat); underTest.log(tomcat);


verify(logger).info("HTTPS connector enabled on port 1234 | ciphers=JVM defaults"); verify(logger).info("HTTPS connector enabled on port 1234 | ciphers=JVM defaults");
verifyNoMoreInteractions(logger); verifyNoMoreInteractions(logger);
Expand All @@ -82,7 +82,7 @@ public void logHttps_overridden_ciphers() {
when(connector.getProtocolHandler()).thenReturn(protocol); when(connector.getProtocolHandler()).thenReturn(protocol);
when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector}); when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector});
props.set(TomcatConnectors.PROP_HTTPS_CIPHERS, "SSL_RSA,TLS_RSA_WITH_RC4"); props.set(TomcatConnectors.PROP_HTTPS_CIPHERS, "SSL_RSA,TLS_RSA_WITH_RC4");
sut.log(tomcat); underTest.log(tomcat);


verify(logger).info("HTTPS connector enabled on port 1234 | ciphers=SSL_RSA,TLS_RSA_WITH_RC4"); verify(logger).info("HTTPS connector enabled on port 1234 | ciphers=SSL_RSA,TLS_RSA_WITH_RC4");
verifyNoMoreInteractions(logger); verifyNoMoreInteractions(logger);
Expand All @@ -95,7 +95,7 @@ public void unsupported_connector() {
when(connector.getScheme()).thenReturn("spdy"); when(connector.getScheme()).thenReturn("spdy");
when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector}); when(tomcat.getService().findConnectors()).thenReturn(new Connector[] {connector});
try { try {
sut.log(tomcat); underTest.log(tomcat);
fail(); fail();
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
// expected // expected
Expand Down
8 changes: 4 additions & 4 deletions server/sonar-server/src/test/java/org/sonar/server/app/WebLoggingTest.java
View file
Expand Up @@ -36,7 +36,7 @@
public class WebLoggingTest { public class WebLoggingTest {


Props props = new Props(new Properties()); Props props = new Props(new Properties());
WebLogging sut = new WebLogging(); WebLogging underTest = new WebLogging();


@AfterClass @AfterClass
public static void resetLogback() throws Exception { public static void resetLogback() throws Exception {
Expand All @@ -45,7 +45,7 @@ public static void resetLogback() throws Exception {


@Test @Test
public void log_to_console() { public void log_to_console() {
LoggerContext ctx = sut.configure(props); LoggerContext ctx = underTest.configure(props);


Logger root = ctx.getLogger(Logger.ROOT_LOGGER_NAME); Logger root = ctx.getLogger(Logger.ROOT_LOGGER_NAME);
Appender appender = root.getAppender("CONSOLE"); Appender appender = root.getAppender("CONSOLE");
Expand All @@ -60,14 +60,14 @@ public void log_to_console() {
@Test @Test
public void enable_debug_logs() { public void enable_debug_logs() {
props.set("sonar.log.level", "DEBUG"); props.set("sonar.log.level", "DEBUG");
LoggerContext ctx = sut.configure(props); LoggerContext ctx = underTest.configure(props);
assertThat(ctx.getLogger(Logger.ROOT_LOGGER_NAME).getLevel()).isEqualTo(Level.DEBUG); assertThat(ctx.getLogger(Logger.ROOT_LOGGER_NAME).getLevel()).isEqualTo(Level.DEBUG);
} }


@Test @Test
public void enable_trace_logs() { public void enable_trace_logs() {
props.set("sonar.log.level", "TRACE"); props.set("sonar.log.level", "TRACE");
LoggerContext ctx = sut.configure(props); LoggerContext ctx = underTest.configure(props);
assertThat(ctx.getLogger(Logger.ROOT_LOGGER_NAME).getLevel()).isEqualTo(Level.TRACE); assertThat(ctx.getLogger(Logger.ROOT_LOGGER_NAME).getLevel()).isEqualTo(Level.TRACE);
} }
} }
13 changes: 6 additions & 7 deletions server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
View file
Expand Up @@ -21,7 +21,6 @@


import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.RandomStringUtils;
Expand Down Expand Up @@ -55,11 +54,11 @@ public class ComputationServiceTest {
ActivityManager activityManager = mock(ActivityManager.class); ActivityManager activityManager = mock(ActivityManager.class);
System2 system = mock(System2.class); System2 system = mock(System2.class);
AnalysisReportDto dto = AnalysisReportDto.newForTests(1L).setProjectKey("P1").setUuid("U1").setStatus(Status.PENDING); AnalysisReportDto dto = AnalysisReportDto.newForTests(1L).setProjectKey("P1").setUuid("U1").setStatus(Status.PENDING);
ComputationService sut; ComputationService underTest;


@Before @Before
public void setUp() { public void setUp() {
sut = new ComputationService(new ReportQueue.Item(dto, new File("Do_not_care")), steps, activityManager, system); underTest = new ComputationService(new ReportQueue.Item(dto, new File("Do_not_care")), steps, activityManager, system);
} }


@Test @Test
Expand All @@ -68,7 +67,7 @@ public void process_new_project() {


when(steps.instances()).thenReturn(Arrays.asList(projectStep1, projectStep2)); when(steps.instances()).thenReturn(Arrays.asList(projectStep1, projectStep2));


sut.process(); underTest.process();


// report is integrated -> status is set to SUCCESS // report is integrated -> status is set to SUCCESS
assertThat(dto.getStatus()).isEqualTo(Status.SUCCESS); assertThat(dto.getStatus()).isEqualTo(Status.SUCCESS);
Expand All @@ -89,7 +88,7 @@ public void debug_logs() {
when(steps.instances()).thenReturn(Collections.<ComputationStep>emptyList()); when(steps.instances()).thenReturn(Collections.<ComputationStep>emptyList());
logTester.setLevel(LoggerLevel.DEBUG); logTester.setLevel(LoggerLevel.DEBUG);


sut.process(); underTest.process();


assertThat(logTester.logs(LoggerLevel.DEBUG)).isNotEmpty(); assertThat(logTester.logs(LoggerLevel.DEBUG)).isNotEmpty();
} }
Expand All @@ -101,7 +100,7 @@ public void fail_if_step_throws_error() {
doThrow(new IllegalStateException(errorMessage)).when(projectStep1).execute(); doThrow(new IllegalStateException(errorMessage)).when(projectStep1).execute();


try { try {
sut.process(); underTest.process();
fail(); fail();
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
assertThat(e.getMessage()).isEqualTo(errorMessage); assertThat(e.getMessage()).isEqualTo(errorMessage);
Expand All @@ -116,7 +115,7 @@ public void step_error() {
doThrow(new IllegalStateException("pb")).when(projectStep1).execute(); doThrow(new IllegalStateException("pb")).when(projectStep1).execute();


try { try {
sut.process(); underTest.process();
fail(); fail();
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
assertThat(e.getMessage()).isEqualTo("pb"); assertThat(e.getMessage()).isEqualTo("pb");
Expand Down
18 changes: 9 additions & 9 deletions ...onar-server/src/test/java/org/sonar/server/computation/ComputationThreadLauncherTest.java
View file
Expand Up @@ -41,7 +41,7 @@ public class ComputationThreadLauncherTest {
@Rule @Rule
public TestRule timeout = new DisableOnDebug(Timeout.seconds(60)); public TestRule timeout = new DisableOnDebug(Timeout.seconds(60));


ComputationThreadLauncher sut; ComputationThreadLauncher underTest;
ReportQueue queue; ReportQueue queue;
ComponentContainer componentContainer; ComponentContainer componentContainer;
ContainerFactory containerFactory; ContainerFactory containerFactory;
Expand All @@ -55,14 +55,14 @@ public void before() {


@After @After
public void after() { public void after() {
sut.stop(); underTest.stop();
} }


@Test @Test
public void call_findAndBook_when_launching_a_recurrent_task() throws Exception { public void call_findAndBook_when_launching_a_recurrent_task() throws Exception {
sut = new ComputationThreadLauncher(queue, componentContainer, containerFactory, 0, 1, TimeUnit.MILLISECONDS); underTest = new ComputationThreadLauncher(queue, componentContainer, containerFactory, 0, 1, TimeUnit.MILLISECONDS);


sut.onServerStart(mock(Server.class)); underTest.onServerStart(mock(Server.class));


sleep(); sleep();


Expand All @@ -71,10 +71,10 @@ public void call_findAndBook_when_launching_a_recurrent_task() throws Exception


@Test @Test
public void call_findAndBook_when_executing_task_immediately() throws Exception { public void call_findAndBook_when_executing_task_immediately() throws Exception {
sut = new ComputationThreadLauncher(queue, componentContainer, containerFactory, 1, 1, TimeUnit.HOURS); underTest = new ComputationThreadLauncher(queue, componentContainer, containerFactory, 1, 1, TimeUnit.HOURS);
sut.start(); underTest.start();


sut.startAnalysisTaskNow(); underTest.startAnalysisTaskNow();


sleep(); sleep();


Expand All @@ -83,8 +83,8 @@ public void call_findAndBook_when_executing_task_immediately() throws Exception


@Test @Test
public void test_real_constructor() throws Exception { public void test_real_constructor() throws Exception {
sut = new ComputationThreadLauncher(queue, componentContainer); underTest = new ComputationThreadLauncher(queue, componentContainer);
sut.start(); underTest.start();
} }


private void sleep() throws InterruptedException { private void sleep() throws InterruptedException {
Expand Down
10 changes: 5 additions & 5 deletions server/sonar-server/src/test/java/org/sonar/server/computation/ComputationThreadTest.java
View file
Expand Up @@ -48,13 +48,13 @@ public class ComputationThreadTest {
ReportQueue queue = mock(ReportQueue.class); ReportQueue queue = mock(ReportQueue.class);
ComponentContainer componentContainer = mock(ComponentContainer.class); ComponentContainer componentContainer = mock(ComponentContainer.class);
ContainerFactory containerFactory = mock(ContainerFactory.class); ContainerFactory containerFactory = mock(ContainerFactory.class);
ComputationThread sut = new ComputationThread(queue, componentContainer, containerFactory); ComputationThread underTest = new ComputationThread(queue, componentContainer, containerFactory);


@Test @Test
public void do_nothing_if_queue_empty() { public void do_nothing_if_queue_empty() {
when(queue.pop()).thenReturn(null); when(queue.pop()).thenReturn(null);


sut.run(); underTest.run();


verify(queue).pop(); verify(queue).pop();
verifyZeroInteractions(containerFactory); verifyZeroInteractions(containerFactory);
Expand All @@ -68,7 +68,7 @@ public void pop_queue_and_integrate_report() throws IOException {
when(queue.pop()).thenReturn(item); when(queue.pop()).thenReturn(item);
when(containerFactory.create(componentContainer, item)).thenReturn(mock(ComputeEngineContainer.class)); when(containerFactory.create(componentContainer, item)).thenReturn(mock(ComputeEngineContainer.class));


sut.run(); underTest.run();


verify(queue).pop(); verify(queue).pop();
verify(containerFactory).create(componentContainer, item); verify(containerFactory).create(componentContainer, item);
Expand All @@ -78,7 +78,7 @@ public void pop_queue_and_integrate_report() throws IOException {
public void handle_error_during_queue_pop() { public void handle_error_during_queue_pop() {
when(queue.pop()).thenThrow(new IllegalStateException()); when(queue.pop()).thenThrow(new IllegalStateException());


sut.run(); underTest.run();


assertThat(logTester.logs()).contains("Failed to pop the queue of analysis reports"); assertThat(logTester.logs()).contains("Failed to pop the queue of analysis reports");
} }
Expand All @@ -92,7 +92,7 @@ public void handle_error_during_removal_from_queue() throws Exception {
when(queue.pop()).thenReturn(item); when(queue.pop()).thenReturn(item);
doThrow(new IllegalStateException("pb")).when(queue).remove(item); doThrow(new IllegalStateException("pb")).when(queue).remove(item);


sut.run(); underTest.run();


assertThat(logTester.logs()).contains("Failed to remove analysis report 1 from queue"); assertThat(logTester.logs()).contains("Failed to remove analysis report 1 from queue");
} }
Expand Down
10 changes: 5 additions & 5 deletions server/sonar-server/src/test/java/org/sonar/server/computation/ReportQueueCleanerTest.java
View file
Expand Up @@ -29,20 +29,20 @@ public class ReportQueueCleanerTest {


ServerUpgradeStatus serverUpgradeStatus = mock(ServerUpgradeStatus.class); ServerUpgradeStatus serverUpgradeStatus = mock(ServerUpgradeStatus.class);
ReportQueue queue = mock(ReportQueue.class); ReportQueue queue = mock(ReportQueue.class);
ReportQueueCleaner sut = new ReportQueueCleaner(serverUpgradeStatus, queue); ReportQueueCleaner underTest = new ReportQueueCleaner(serverUpgradeStatus, queue);


@Test @Test
public void reset_reports_on_restart() { public void reset_reports_on_restart() {
sut.start(); underTest.start();
verify(queue).resetToPendingStatus(); verify(queue).resetToPendingStatus();
sut.stop(); underTest.stop();
} }


@Test @Test
public void delete_all_reports_on_upgrade() { public void delete_all_reports_on_upgrade() {
when(serverUpgradeStatus.isUpgraded()).thenReturn(Boolean.TRUE); when(serverUpgradeStatus.isUpgraded()).thenReturn(Boolean.TRUE);
sut.start(); underTest.start();
verify(queue).clear(); verify(queue).clear();
sut.stop(); underTest.stop();
} }
} }

0 comments on commit 57cb022

Please sign in to comment.