SONAR-8595 ComponentTesting support for root components' organization

diff --git a/sonar-db/src/test/java/org/sonar/db/component/ComponentDbTester.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentDbTester.java
index 07fab0ab11e442fce7b00257a7cab26d5a959a41..d496f35f45184afcbcdd2c2b16421086099c61ca 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/component/ComponentDbTester.java
+++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentDbTester.java
@@ -42,22 +42,18 @@ public class ComponentDbTester {
   }
 
   public SnapshotDto insertProjectAndSnapshot(ComponentDto component) {
-    dbClient.componentDao().insert(dbSession, component);
-    SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(component));
-    db.commit();
-
-    return snapshot;
+    return insertComponentAndSnapshot(component);
   }
 
   public SnapshotDto insertViewAndSnapshot(ComponentDto component) {
-    dbClient.componentDao().insert(dbSession, component);
-    SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(component));
-    db.commit();
-
-    return snapshot;
+    return insertComponentAndSnapshot(component);
   }
 
   public SnapshotDto insertDeveloperAndSnapshot(ComponentDto component) {
+    return insertComponentAndSnapshot(component);
+  }
+
+  private SnapshotDto insertComponentAndSnapshot(ComponentDto component) {
     dbClient.componentDao().insert(dbSession, component);
     SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(component));
     db.commit();

diff --git a/sonar-db/src/test/java/org/sonar/db/component/ComponentTesting.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentTesting.java
index a028e2850558e40286ce4078f4b8b048df12111e..178160a3c0ebd7eb65623b94bae3fd81f41489cd 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/component/ComponentTesting.java
+++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentTesting.java
@@ -24,6 +24,7 @@ import javax.annotation.Nullable;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.Scopes;
 import org.sonar.core.util.Uuids;
+import org.sonar.db.organization.OrganizationDto;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.sonar.db.component.ComponentDto.UUID_PATH_SEPARATOR;
@@ -90,13 +91,25 @@ public class ComponentTesting {
     return newModuleDto(Uuids.createFast(), subProjectOrProject);
   }
 
+  public static ComponentDto newProjectDto(OrganizationDto organizationDto) {
+    return newProjectDto(organizationDto.getUuid(), Uuids.createFast());
+  }
+
   public static ComponentDto newProjectDto() {
-    return newProjectDto(Uuids.createFast());
+    return newProjectDto(Uuids.createFast(), Uuids.createFast());
+  }
+
+  public static ComponentDto newProjectDto(OrganizationDto organizationDto, String uuid) {
+    return newProjectDto(organizationDto.getUuid(), uuid);
   }
 
   public static ComponentDto newProjectDto(String uuid) {
+    return newProjectDto(Uuids.createFast(), uuid);
+  }
+
+  private static ComponentDto newProjectDto(String organizationUuid, String uuid) {
     return new ComponentDto()
-      .setOrganizationUuid(Uuids.createFast())
+      .setOrganizationUuid(organizationUuid)
       .setUuid(uuid)
       .setUuidPath(ComponentDto.UUID_PATH_OF_ROOT)
       .setProjectUuid(uuid)
@@ -114,28 +127,24 @@ public class ComponentTesting {
   }
 
   public static ComponentDto newDeveloper(String name) {
-    String uuid = Uuids.createFast();
-    return new ComponentDto()
-      .setOrganizationUuid(Uuids.createFast())
-      .setUuid(uuid)
-      .setUuidPath(ComponentDto.UUID_PATH_OF_ROOT)
-      .setProjectUuid(uuid)
-      .setModuleUuidPath(UUID_PATH_SEPARATOR + uuid + UUID_PATH_SEPARATOR)
-      .setRootUuid(uuid)
-      .setKey(uuid)
-      .setName(name)
-      .setLongName(name)
-      .setScope(Scopes.PROJECT)
-      // XXX No constant !
-      .setQualifier("DEV")
-      .setPath(null)
-      .setLanguage(null)
-      .setEnabled(true);
+    return newDeveloper(Uuids.createFast(), name, Uuids.createFast());
+  }
+
+  public static ComponentDto newDeveloper(OrganizationDto organizationDto, String name) {
+    return newDeveloper(organizationDto.getUuid(), name, Uuids.createFast());
   }
 
   public static ComponentDto newDeveloper(String name, String uuid) {
+    return newDeveloper(Uuids.createFast(), name, uuid);
+  }
+
+  public static ComponentDto newDeveloper(OrganizationDto organizationDto, String name, String uuid) {
+    return newDeveloper(organizationDto.getUuid(), name, uuid);
+  }
+
+  private static ComponentDto newDeveloper(String organizationUuid, String name, String uuid) {
     return new ComponentDto()
-      .setOrganizationUuid(Uuids.createFast())
+      .setOrganizationUuid(organizationUuid)
       .setUuid(uuid)
       .setUuidPath(ComponentDto.UUID_PATH_OF_ROOT)
       .setProjectUuid(uuid)
@@ -152,15 +161,30 @@ public class ComponentTesting {
       .setEnabled(true);
   }
 
+  public static ComponentDto newView() {
+    return newView(Uuids.createFast());
+  }
+
+  public static ComponentDto newView(OrganizationDto organizationDto) {
+    return newView(organizationDto.getUuid(), Uuids.createFast());
+  }
+
   public static ComponentDto newView(String uuid) {
-    return newProjectDto(uuid)
+    return newView(Uuids.createFast(), uuid);
+  }
+
+  public static ComponentDto newView(OrganizationDto organizationDto, String uuid) {
+    return newProjectDto(organizationDto, uuid)
       .setUuid(uuid)
       .setScope(Scopes.PROJECT)
       .setQualifier(Qualifiers.VIEW);
   }
 
-  public static ComponentDto newView() {
-    return newView(Uuids.createFast());
+  private static ComponentDto newView(String organizationUuid, String uuid) {
+    return newProjectDto(organizationUuid, uuid)
+        .setUuid(uuid)
+        .setScope(Scopes.PROJECT)
+        .setQualifier(Qualifiers.VIEW);
   }
 
   public static ComponentDto newProjectCopy(String uuid, ComponentDto project, ComponentDto view) {