[IT] Complete fix of tests due to Orchestrator upgrade

lindamartin · lindamartin · commit 58c4a71896a0 · 2015-11-06T18:30:08.000+01:00
diff --git a/its/plugin/src/test/java/com/sonar/python/it/plugin/CoverageTest.java b/its/plugin/src/test/java/com/sonar/python/it/plugin/CoverageTest.java
@@ -126,7 +126,13 @@ public void empty_coverage_report() throws Exception {
       .setProperty("sonar.python.coverage.overallReportPath", "empty.xml");
     BuildResult buildResult = orchestrator.executeBuild(build);
 
-    assertThat(buildResult.getLogs()).matches(".*The report '[^']*' seems to be empty, ignoring.*");
+    int nbLog = 0;
+    for (String s : buildResult.getLogs().split("[\\r\\n]+")) {
+      if (s.matches(".*The report '[^']*' seems to be empty, ignoring.*")) {
+        nbLog++;
+      }
+    }
+    assertThat(nbLog).isEqualTo(3);
     assertThat(getProjectMeasure(PROJECT_KEY, "coverage")).isNull();
     assertThat(getProjectMeasure(PROJECT_KEY, "it_coverage")).isNull();
     assertThat(getProjectMeasure(PROJECT_KEY, "overall_coverage")).isNull();
diff --git a/its/plugin/src/test/java/com/sonar/python/it/plugin/MetricsTest.java b/its/plugin/src/test/java/com/sonar/python/it/plugin/MetricsTest.java
@@ -44,14 +44,13 @@ public class MetricsTest {
 
   @BeforeClass
   public static void startServer() {
-    orchestrator.getServer().provisionProject("project", "project");
-    orchestrator.getServer().associateProjectToQualityProfile("project", "py", "no_rule");
+    orchestrator.getServer().provisionProject(PROJECT_KEY, PROJECT_KEY);
+    orchestrator.getServer().associateProjectToQualityProfile(PROJECT_KEY, "py", "no_rule");
     SonarRunner build = SonarRunner.create()
       .setProjectDir(new File("projects/metrics"))
       .setProjectKey(PROJECT_KEY)
       .setProjectName(PROJECT_KEY)
       .setProjectVersion("1.0-SNAPSHOT")
-      .setProfile("no_rule")
       .setSourceDirs("src");
     orchestrator.executeBuild(build);
 
diff --git a/its/plugin/src/test/java/com/sonar/python/it/plugin/PylintReportTest.java b/its/plugin/src/test/java/com/sonar/python/it/plugin/PylintReportTest.java
@@ -57,14 +57,14 @@ public void missing_report() throws Exception {
   @Test
   public void invalid_report() throws Exception {
     BuildResult result = analyseProjectWithReport("invalid.txt");
-    assertThat(result.getLogs()).matches(".*DEBUG - Cannot parse the line: trash.*");
+    assertThat(result.getLogs()).contains("DEBUG - Cannot parse the line: trash");
     assertThat(issues()).hasSize(0);
   }
 
   @Test
   public void unknown_rule() throws Exception {
     BuildResult result = analyseProjectWithReport("rule-unknown.txt");
-    assertThat(result.getLogs()).matches(".*WARN  - Pylint rule 'C9999' is unknown.*");
+    assertThat(result.getLogs()).contains("WARN  - Pylint rule 'C9999' is unknown");
     assertThat(issues()).hasSize(0);
   }
 
@@ -74,12 +74,10 @@ private List<Issue> issues() {
 
   private BuildResult analyseProjectWithReport(String reportPath) {
     orchestrator.resetData();
-    orchestrator.getServer().provisionProject("pylint_project", "pylint_project");
-    orchestrator.getServer().associateProjectToQualityProfile("pylint_project", "py", "pylint-rules");
+    orchestrator.getServer().provisionProject(PROJECT, PROJECT);
+    orchestrator.getServer().associateProjectToQualityProfile(PROJECT, "py", "pylint-rules");
     return orchestrator.executeBuild(
       SonarRunner.create()
-        .setProjectKey("pylint_project")
-        .setProjectName("pylint_project")
         .setDebugLogs(true)
         .setProjectDir(new File("projects/pylint_project"))
         .setProperty("sonar.python.pylint.reportPath", reportPath));
diff --git a/its/plugin/src/test/java/com/sonar/python/it/plugin/TestReportTest.java b/its/plugin/src/test/java/com/sonar/python/it/plugin/TestReportTest.java
@@ -94,7 +94,7 @@ public void missing_test_report_with_simple_mode() throws Exception {
   public void invalid_test_report() throws Exception {
     BuildResult result = orchestrator.executeBuildQuietly(createBuild("invalid_report.xml"));
     assertThat(result.isSuccess()).isFalse();
-    assertThat(result.getLogs()).matches(".*Cannot feed the data into sonar.*");
+    assertThat(result.getLogs()).contains("Cannot feed the data into sonar");
     assertProjectMeasures(PROJECT, nullMeasures());
   }
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public void missing_test_report_with_simple_mode() throws Exception {`
`94`	`94`	`public void invalid_test_report() throws Exception {`
`95`	`95`	`BuildResult result = orchestrator.executeBuildQuietly(createBuild("invalid_report.xml"));`
`96`	`96`	`assertThat(result.isSuccess()).isFalse();`
`97`		`- assertThat(result.getLogs()).matches(".Cannot feed the data into sonar.");`
	`97`	`+ assertThat(result.getLogs()).contains("Cannot feed the data into sonar");`
`98`	`98`	`assertProjectMeasures(PROJECT, nullMeasures());`
`99`	`99`	`}`
`100`	`100`