From acaf8ad497a5587fa05fe3a3b57ebd95d7025109 Mon Sep 17 00:00:00 2001
From: Daniel Schwarz <daniel.schwarz@sonarsource.com>
Date: Mon, 6 Mar 2017 16:53:37 +0100
Subject: [PATCH] SONAR-8857 deprecate to use org UUID in tests, provide org
 DTO instead

---
 .../batch/ProjectDataLoaderMediumTest.java    |  4 +-
 .../qualityprofile/QProfileTesting.java       | 46 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
index 0d45ecf027d..13bc7138812 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
@@ -602,7 +602,9 @@ public class ProjectDataLoaderMediumTest {
   }
 
   private void addDefaultProfile() {
-    QualityProfileDto profileDto = newQProfileDto("org-123", QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt(
+    OrganizationDto organizationDto = OrganizationTesting.newOrganizationDto();
+    dbClient.organizationDao().insert(dbSession, organizationDto);
+    QualityProfileDto profileDto = newQProfileDto(organizationDto, QProfileName.createFor(ServerTester.Xoo.KEY, "SonarQube way"), "abcd").setRulesUpdatedAt(
       formatDateTime(new Date())).setDefault(true);
     dbClient.qualityProfileDao().insert(dbSession, profileDto);
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java
index f6ea9d12059..19f531acdfb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java
@@ -19,7 +19,12 @@
  */
 package org.sonar.server.qualityprofile;
 
+import org.sonar.db.DbClient;
+import org.sonar.db.DbSession;
+import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.qualityprofile.QualityProfileDto;
+import org.sonar.server.organization.DefaultOrganizationProvider;
+import org.sonar.server.tester.ServerTester;
 
 /**
  * Utility class for tests involving quality profiles
@@ -33,19 +38,60 @@ public class QProfileTesting {
   public static final QProfileName XOO_P3_NAME = new QProfileName("xoo", "P3");
   public static final String XOO_P3_KEY = "XOO_P3";
 
+  /**
+   * @deprecated provide organization as dto
+   */
+  @Deprecated
   public static QualityProfileDto newQProfileDto(String organizationUuid, QProfileName name, String key) {
     return QualityProfileDto.createFor(key).setOrganizationUuid(organizationUuid).setName(name.getName()).setLanguage(name.getLanguage());
   }
 
+  /**
+   * @deprecated provide organization as dto
+   */
+  @Deprecated
   public static QualityProfileDto newXooP1(String organizationUuid) {
     return newQProfileDto(organizationUuid, XOO_P1_NAME, XOO_P1_KEY);
   }
 
+  /**
+   * @deprecated provide organization as dto
+   */
+  @Deprecated
   public static QualityProfileDto newXooP2(String organizationUuid) {
     return newQProfileDto(organizationUuid, XOO_P2_NAME, XOO_P2_KEY);
   }
 
+  /**
+   * @deprecated provide organization as dto
+   */
+  @Deprecated
   public static QualityProfileDto newXooP3(String organizationUuid) {
     return newQProfileDto(organizationUuid, XOO_P3_NAME, XOO_P3_KEY);
   }
+
+  public static QualityProfileDto newQProfileDto(OrganizationDto organization, QProfileName name, String key) {
+    return QualityProfileDto.createFor(key).setOrganizationUuid(organization.getUuid()).setName(name.getName()).setLanguage(name.getLanguage());
+  }
+
+  public static QualityProfileDto newXooP1(OrganizationDto organization) {
+    return newQProfileDto(organization, XOO_P1_NAME, XOO_P1_KEY);
+  }
+
+  public static QualityProfileDto newXooP2(OrganizationDto organization) {
+    return newQProfileDto(organization, XOO_P2_NAME, XOO_P2_KEY);
+  }
+
+  public static QualityProfileDto newXooP3(OrganizationDto organization) {
+    return newQProfileDto(organization, XOO_P3_NAME, XOO_P3_KEY);
+  }
+
+  /**
+   * Used in medium tests.
+   */
+  public static OrganizationDto getDefaultOrganization(ServerTester tester, DbClient db, DbSession session) {
+    String organizationKey = tester.get(DefaultOrganizationProvider.class).get().getKey();
+    return db.organizationDao().selectByKey(session, organizationKey)
+      .orElseThrow(() -> new IllegalStateException("Cannot load default organization (key='" + organizationKey + "')"));
+  }
 }
-- 
2.39.5