4 files changed, 32 insertions, 39 deletions

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/PluginTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/PluginTest.java
index caa022c0290..2ef2d212e59 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/PluginTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/PluginTest.java
@@ -21,17 +21,21 @@ package org.sonar.api;
 
 import java.util.Arrays;
 import org.junit.Test;
+import org.sonar.api.internal.SonarRuntimeImpl;
+import org.sonar.api.utils.Version;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.sonar.api.SonarRuntime.V5_5;
 
 public class PluginTest {
 
+  private static final Version VERSION_5_6 = Version.create(5, 6);
+
   @Test
   public void test_context() {
-    Plugin.Context context = new Plugin.Context(new SonarRuntime(V5_5, SonarProduct.SONARQUBE, SonarQubeSide.SERVER));
+    SonarRuntime runtime = SonarRuntimeImpl.forSonarQube(VERSION_5_6, SonarQubeSide.SERVER);
+    Plugin.Context context = new Plugin.Context(runtime);
 
-    assertThat(context.getSonarQubeVersion()).isEqualTo(V5_5);
+    assertThat(context.getSonarQubeVersion()).isEqualTo(VERSION_5_6);
     assertThat(context.getExtensions()).isEmpty();
 
     context.addExtension("foo");
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/SonarQubeVersionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/SonarQubeVersionTest.java
index 8ee63aa98fd..ac430ad82f5 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/SonarQubeVersionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/SonarQubeVersionTest.java
@@ -19,22 +19,17 @@
  */
 package org.sonar.api;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.Version;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class SonarQubeVersionTest {
 
-  @Rule
-  public ExpectedException expectedException = ExpectedException.none();
-
   @Test
   public void isGte() {
     Version version = Version.parse("1.2.3");
-    SonarQubeVersion qubeVersion = new SonarQubeVersion(version, SonarProduct.SONARLINT, null);
+    SonarQubeVersion qubeVersion = new SonarQubeVersion(version);
     assertThat(qubeVersion.get()).isEqualTo(version);
     assertThat(qubeVersion.isGreaterThanOrEqual(version)).isTrue();
     assertThat(qubeVersion.isGreaterThanOrEqual(Version.parse("1.1"))).isTrue();
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/internal/SonarRuntimeFactoryTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/internal/ApiVersionTest.java
index 4db26447ca5..996b0648ddf 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/internal/SonarRuntimeFactoryTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/internal/ApiVersionTest.java
@@ -23,26 +23,24 @@ import java.io.File;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonar.api.SonarProduct;
-import org.sonar.api.SonarQubeVersion;
 import org.sonar.api.utils.System2;
+import org.sonar.api.utils.Version;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-public class SonarRuntimeFactoryTest {
+public class ApiVersionTest {
 
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
   @Test
-  public void create() {
-    SonarQubeVersion version = SonarRuntimeFactory.create(System2.INSTANCE, SonarProduct.SONARLINT, null);
+  public void load_version_from_file_in_classpath() {
+    Version version = ApiVersion.load(System2.INSTANCE);
     assertThat(version).isNotNull();
-    assertThat(version.getApiVersion().major()).isGreaterThanOrEqualTo(5);
-    assertThat(version.getProduct()).isEqualTo(SonarProduct.SONARLINT);
+    assertThat(version.major()).isGreaterThanOrEqualTo(5);
   }
 
   @Test
@@ -52,7 +50,7 @@ public class SonarRuntimeFactoryTest {
 
     System2 system = spy(System2.class);
     when(system.getResource(anyString())).thenReturn(new File("target/unknown").toURI().toURL());
-    SonarRuntimeFactory.create(system, SonarProduct.SONARLINT, null);
+    ApiVersion.load(system);
   }
 
 }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/SonarRuntimeTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/internal/SonarRuntimeImplTest.java
index 6d26a5678ce..ea214d5bef1 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/SonarRuntimeTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/internal/SonarRuntimeImplTest.java
@@ -17,42 +17,40 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.api;
+package org.sonar.api.internal;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.sonar.api.SonarProduct;
+import org.sonar.api.SonarQubeSide;
+import org.sonar.api.SonarRuntime;
 import org.sonar.api.utils.Version;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SonarRuntimeTest {
+
+public class SonarRuntimeImplTest {
+
+  private static final Version A_VERSION = Version.parse("6.0");
 
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
   @Test
-  public void isGteInSQ() {
-    Version version = Version.parse("1.2.3");
-    SonarRuntime apiVersion = new SonarRuntime(version, SonarProduct.SONARQUBE, SonarQubeSide.SCANNER);
-    assertThat(apiVersion.getApiVersion()).isEqualTo(version);
+  public void sonarQube_environment() {
+    SonarRuntime apiVersion = SonarRuntimeImpl.forSonarQube(A_VERSION, SonarQubeSide.SCANNER);
+    assertThat(apiVersion.getApiVersion()).isEqualTo(A_VERSION);
     assertThat(apiVersion.getProduct()).isEqualTo(SonarProduct.SONARQUBE);
     assertThat(apiVersion.getSonarQubeSide()).isEqualTo(SonarQubeSide.SCANNER);
-    assertThat(apiVersion.isGreaterThanOrEqual(version)).isTrue();
-    assertThat(apiVersion.isGreaterThanOrEqual(Version.parse("1.1"))).isTrue();
-    assertThat(apiVersion.isGreaterThanOrEqual(Version.parse("1.3"))).isFalse();
   }
 
   @Test
-  public void inSL() {
-    Version version = Version.parse("1.2.3");
-    SonarRuntime apiVersion = new SonarRuntime(version, SonarProduct.SONARLINT, null);
-    assertThat(apiVersion.getApiVersion()).isEqualTo(version);
+  public void sonarLint_environment() {
+    SonarRuntime apiVersion = SonarRuntimeImpl.forSonarLint(A_VERSION);
+    assertThat(apiVersion.getApiVersion()).isEqualTo(A_VERSION);
     assertThat(apiVersion.getProduct()).isEqualTo(SonarProduct.SONARLINT);
-    assertThat(apiVersion.isGreaterThanOrEqual(version)).isTrue();
-    assertThat(apiVersion.isGreaterThanOrEqual(Version.parse("1.1"))).isTrue();
-    assertThat(apiVersion.isGreaterThanOrEqual(Version.parse("1.3"))).isFalse();
     try {
       apiVersion.getSonarQubeSide();
       Assertions.fail("Expected exception");
@@ -62,12 +60,10 @@ public class SonarRuntimeTest {
   }
 
   @Test(expected = IllegalArgumentException.class)
-  public void testConstructorMissSide() throws Exception {
-    new SonarRuntime(Version.parse("1.2.3"), SonarProduct.SONARQUBE, null);
+  public void sonarqube_requires_side() throws Exception {
+    SonarRuntimeImpl.forSonarQube(A_VERSION, null);
   }
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testConstructorNoSideOnSonarLint() throws Exception {
-    new SonarRuntime(Version.parse("1.2.3"), SonarProduct.SONARLINT, SonarQubeSide.COMPUTE_ENGINE);
-  }
+
+
 }