SONAR-2693 Make it possible to pass the sonar version to the matcher

- In order to remove the magic of getting the version of Sonar via
  the POM
- Documentation also added on the I18nMatchers static methods

2 files changed, 4 insertions, 6 deletions

diff --git a/sonar-testing-harness/src/test/java/org/sonar/test/i18n/BundleSynchronizedTest.java b/sonar-testing-harness/src/test/java/org/sonar/test/i18n/BundleSynchronizedTest.java
index 3edc655ddfd..9eee351687a 100644
--- a/sonar-testing-harness/src/test/java/org/sonar/test/i18n/BundleSynchronizedTest.java
+++ b/sonar-testing-harness/src/test/java/org/sonar/test/i18n/BundleSynchronizedTest.java
@@ -41,7 +41,7 @@ public class BundleSynchronizedTest {
 
   @Before
   public void test() throws Exception {
-    matcher = new BundleSynchronizedMatcher();
+    matcher = new BundleSynchronizedMatcher(null);
   }
 
   @Test
@@ -70,10 +70,10 @@ public class BundleSynchronizedTest {
   // The case of a Sonar Language Pack that translates the Core bundles
   public void testBundlesOfLanguagePack() {
     // synchronized bundle
-    assertThat("core_fr_CA.properties", new BundleSynchronizedMatcher(GITHUB_RAW_FILE_PATH));
+    assertThat("core_fr_CA.properties", new BundleSynchronizedMatcher(null, GITHUB_RAW_FILE_PATH));
     // missing keys
     try {
-      assertThat("core_fr.properties", new BundleSynchronizedMatcher(GITHUB_RAW_FILE_PATH));
+      assertThat("core_fr.properties", new BundleSynchronizedMatcher(null, GITHUB_RAW_FILE_PATH));
     } catch (AssertionError e) {
       assertThat(e.getMessage(), containsString("Missing keys are:\n\t- second.prop"));
     }
@@ -91,7 +91,7 @@ public class BundleSynchronizedTest {
 
   @Test
   public void testGetBundleFileFromGithub() throws Exception {
-    matcher = new BundleSynchronizedMatcher(GITHUB_RAW_FILE_PATH);
+    matcher = new BundleSynchronizedMatcher(null, GITHUB_RAW_FILE_PATH);
     matcher.getBundleFileFromGithub("core.properties");
     assertTrue(new File("target/l10n/download/core.properties").exists());
   }
diff --git a/sonar-testing-harness/src/test/resources/version.properties b/sonar-testing-harness/src/test/resources/version.properties
deleted file mode 100644
index f57ea3a66e4..00000000000
--- a/sonar-testing-harness/src/test/resources/version.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# The version here in this test file does not matter as the Harmcrest matcher will always look at master if there's a "-SNAPSHOT" suffix
-sonar.version=2.11-SNAPSHOT
\ No newline at end of file