fix merge 5.2

SonarSource · Mar 2, 2015 · db22903 · db22903
1 parent bcce128
commit db22903
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -22,19 +22,14 @@
 
 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));
+  ComputationContext sut = new ComputationContext(mock(BatchReportReader.class), mock(ComponentDto.class));
-
-  @Test(expected = IllegalStateException.class)
-  public void getReportMetadata() throws Exception {
-    sut.getReportMetadata();
-  }
 
   @Test(expected = IllegalStateException.class)
   public void setProjectSettings() throws Exception {

diff --git a/...sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java b/...sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java
@@ -51,7 +51,7 @@ public void call_purge_method_of_the_purge_task() throws IOException {
     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);