From db229037bdb6e7a8ab8289efbe791bd75a6295db Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Mon, 2 Mar 2015 13:42:44 +0100 Subject: [PATCH] fix merge 5.2 --- .../sonar/server/computation/ComputationContextTest.java | 9 ++------- .../server/computation/step/PurgeDatastoresStepTest.java | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationContextTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationContextTest.java index c9f07e3f1a4..5f20e21bb36 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationContextTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationContextTest.java @@ -22,19 +22,14 @@ package org.sonar.server.computation; import org.junit.Test; import org.sonar.api.config.Settings; +import org.sonar.batch.protocol.output.BatchReportReader; import org.sonar.core.component.ComponentDto; -import org.sonar.core.computation.db.AnalysisReportDto; import static org.mockito.Mockito.mock; public class ComputationContextTest { - ComputationContext sut = new ComputationContext(mock(AnalysisReportDto.class), mock(ComponentDto.class)); - - @Test(expected = IllegalStateException.class) - public void getReportMetadata() throws Exception { - sut.getReportMetadata(); - } + ComputationContext sut = new ComputationContext(mock(BatchReportReader.class), mock(ComponentDto.class)); @Test(expected = IllegalStateException.class) public void setProjectSettings() throws Exception { 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 c73929c2f83..a2588058de4 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 @@ -51,7 +51,7 @@ public class PurgeDatastoresStepTest extends BaseStepTest { ComponentDto project = mock(ComponentDto.class); when(project.getId()).thenReturn(123L); when(project.uuid()).thenReturn("UUID-1234"); - åComputationContext context = new ComputationContext(mock(BatchReportReader.class), project); + ComputationContext context = new ComputationContext(mock(BatchReportReader.class), project); sut.execute(context); -- 2.39.5