From 6789a2ec09f916b67bb34400f332570d2ca26b94 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Tue, 5 Jan 2021 12:19:25 -0600 Subject: SONAR-14245 Drop organization related tables --- .../scanner/mediumtest/fs/FileSystemMediumTest.java | 19 ------------------- .../repository/DefaultQualityProfileLoaderTest.java | 12 ------------ 2 files changed, 31 deletions(-) (limited to 'sonar-scanner-engine/src') 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 7ffc341b009..08fb1328223 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 @@ -127,25 +127,6 @@ public class FileSystemMediumTest { .execute(); } - @Test - public void dontLogInvalidOrganization() throws IOException { - File srcDir = new File(baseDir, "src"); - srcDir.mkdir(); - - File xooFile = new File(srcDir, "sample.xoo"); - FileUtils.write(xooFile, "Sample xoo\ncontent", StandardCharsets.UTF_8); - - tester.newAnalysis() - .properties(builder - .put("sonar.sources", "src") - .build()) - .execute(); - - assertThat(logTester.logs()).contains("Project key: com.foo.project"); - assertThat(logTester.logs().stream().collect(joining("\n"))).doesNotContain("Organization key"); - assertThat(logTester.logs().stream().collect(joining("\n"))).doesNotContain("Branch key"); - } - @Test public void onlyGenerateMetadataIfNeeded() throws IOException { File srcDir = new File(baseDir, "src"); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java index b1d7fa7888f..f85f94f27fc 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/repository/DefaultQualityProfileLoaderTest.java @@ -82,18 +82,6 @@ public class DefaultQualityProfileLoaderTest { verifyNoMoreInteractions(wsClient); } - @Test - public void load_throws_MessageException_if_organization_is_not_found_after_trying_default() { - HttpException e = new HttpException("", 404, "{\"errors\":[{\"msg\":\"No organization with key 'myorg'\"}]}"); - WsTestUtil.mockException(wsClient, e); - - exception.expect(MessageException.class); - exception.expectMessage("Failed to load the default quality profiles: No organization with key 'myorg'"); - - underTest.load("project"); - verifyNoMoreInteractions(wsClient); - } - private void verifyCalledPath(String expectedPath) { WsTestUtil.verifyCall(wsClient, expectedPath); } -- cgit v1.2.3