From 4a6400c4193e4e1e323215deb23642ef48586f51 Mon Sep 17 00:00:00 2001
From: Duarte Meneses <duarte.meneses@sonarsource.com>
Date: Thu, 6 Aug 2015 12:11:28 +0200
Subject: [PATCH] SONAR-6767 Default mode should be named "publish" mode

---
 .../org/sonar/batch/scan/ProjectAnalysisMode.java   |  7 +++++++
 .../sonar/batch/scan/ProjectAnalysisModeTest.java   | 13 +++++++++++++
 .../main/java/org/sonar/api/batch/AnalysisMode.java |  2 ++
 .../batch/sensor/internal/SensorContextTester.java  |  5 +++++
 4 files changed, 27 insertions(+)

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 cab19aee1f0..f92a2577cf8 100644
--- 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 a5bfe6ce70d..29b866f8903 100644
--- 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 a4bc432cb08..6df398b84f3 100644
--- 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 75d3baf8a38..df0e22ab041 100644
--- 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 {
-- 
2.39.5