SONAR-6767 Default mode should be named "publish" mode

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectAnalysisMode.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectAnalysisMode.java
index cab19aee1f0954c256de87183628d98c12ab85df..f92a2577cf8c4ae9bd9fe999dc083409237351e3 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectAnalysisMode.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectAnalysisMode.java
@@ -55,6 +55,11 @@ public class ProjectAnalysisMode implements AnalysisMode {
   public boolean isIssues() {
     return issues;
   }
+  
+  @Override
+  public boolean isPublish() {
+    return !preview && !issues;
+  }
 
   public boolean isMediumTest() {
     return mediumTestMode;
@@ -88,6 +93,8 @@ public class ProjectAnalysisMode implements AnalysisMode {
       LOG.info("Preview mode");
     } else if (issues) {
       LOG.info("Issues mode");
+    } else {
+      LOG.info("Publish mode");
     }
     if (mediumTestMode) {
       LOG.info("Medium test mode");

diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectAnalysisModeTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectAnalysisModeTest.java
index a5bfe6ce70d909a5550113c1443c45887afe8d0f..29b866f8903a1d89fc76a92ebf8038b1b17e30ab 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectAnalysisModeTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectAnalysisModeTest.java
@@ -63,6 +63,19 @@ public class ProjectAnalysisModeTest {
 
     assertThat(mode.isPreview()).isTrue();
   }
+  
+  @Test
+  public void default_publish_mode() {
+    ProjectAnalysisMode mode = createMode(CoreProperties.ANALYSIS_MODE_PREVIEW);
+    assertThat(mode.isPublish()).isFalse();
+    
+    mode = createMode(CoreProperties.ANALYSIS_MODE_ISSUES);
+    assertThat(mode.isPublish()).isFalse();
+    
+    mode = createMode(null);
+
+    assertThat(mode.isPublish()).isTrue();
+  }
 
   @Test
   public void support_issues_mode() {

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/AnalysisMode.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AnalysisMode.java
index a4bc432cb082d311b93f820ff2d7b3f8e73fb703..6df398b84f3f9fdd4bef0c81e75c54956185dd7b 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/AnalysisMode.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AnalysisMode.java
@@ -30,4 +30,6 @@ public interface AnalysisMode {
 
   boolean isIssues();
 
+  boolean isPublish();
+
 }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorContextTester.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorContextTester.java
index 75d3baf8a3835376bece46df267acbc69515b588..df0e22ab0418a23d3055495177cd8e81d048670b 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorContextTester.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/internal/SensorContextTester.java
@@ -236,6 +236,11 @@ public class SensorContextTester implements SensorContext {
     public void setIssues(boolean issues) {
       this.isIssues = issues;
     }
+
+    @Override
+    public boolean isPublish() {
+      return !isPreview && !isIssues;
+    }
   }
 
   private static class InMemorySensorStorage implements SensorStorage {