diff options
| author | Michal Duda <michal.duda@sonarsource.com> | 2019-06-13 17:27:43 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2019-06-15 20:21:05 +0200 |
| commit | 7054dc9bf9ddd30eebf038094d6cc9b4a3be5db2 (patch) | |
| tree | 13edb4537b7f18299021b626aced6115fc0970d9 /sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs | |
| parent | 382e45e3126fadc557464d52eb9ce73ee9d1bcaa (diff) | |
| download | sonarqube-7054dc9bf9ddd30eebf038094d6cc9b4a3be5db2.tar.gz sonarqube-7054dc9bf9ddd30eebf038094d6cc9b4a3be5db2.zip | |
SONAR-12182 drop "sonar.branch" from SQ
Diffstat (limited to 'sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs')
2 files changed, 7 insertions, 2 deletions
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java index af073681944..cb1537ae00c 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java @@ -34,6 +34,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.sonar.api.CoreProperties; +import org.sonar.api.SonarEdition; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.fs.internal.DefaultInputFile; import org.sonar.api.utils.MessageException; @@ -65,6 +66,7 @@ public class FileSystemMediumTest { @Rule public ScannerMediumTester tester = new ScannerMediumTester() + .setEdition(SonarEdition.SONARCLOUD) .registerPlugin("xoo", new XooPlugin()) .addDefaultQProfile("xoo", "Sonar Way") .addDefaultQProfile("xoo2", "Sonar Way"); @@ -152,7 +154,7 @@ public class FileSystemMediumTest { } @Test - public void logBranchNameAndType() throws IOException { + public void logBranchNameAndType() { builder.put("sonar.branch.name", "my-branch"); File srcDir = new File(baseDir, "src"); assertThat(srcDir.mkdir()).isTrue(); @@ -1065,7 +1067,8 @@ public class FileSystemMediumTest { .execute(); assertThat(result.inputFiles()).hasSize(1); - assertThat(logTester.logs(LoggerLevel.WARN)).contains("File '" + xooFile2.getAbsolutePath() + "' is ignored. It is not located in module basedir '" + new File(baseDir, "moduleA") + "'."); + assertThat(logTester.logs(LoggerLevel.WARN)) + .contains("File '" + xooFile2.getAbsolutePath() + "' is ignored. It is not located in module basedir '" + new File(baseDir, "moduleA") + "'."); } @Test diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/ProjectBuilderMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/ProjectBuilderMediumTest.java index f61411b4898..b90b24d96e7 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/ProjectBuilderMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/ProjectBuilderMediumTest.java @@ -30,6 +30,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; +import org.sonar.api.SonarEdition; import org.sonar.api.batch.bootstrap.ProjectBuilder; import org.sonar.api.utils.MessageException; import org.sonar.scanner.mediumtest.AnalysisResult; @@ -56,6 +57,7 @@ public class ProjectBuilderMediumTest { @Rule public ScannerMediumTester tester = new ScannerMediumTester() + .setEdition(SonarEdition.SONARCLOUD) .registerPlugin("xoo", new XooPluginWithBuilder(projectBuilder)) .addRules(new XooRulesDefinition()) .addDefaultQProfile("xoo", "Sonar Way") |