SONAR-19888 Update test framework to not use addProjectPermission(java.lang.String, org.sonar.db.component.ComponentDto...)10.2.0.77647

1 files changed, 18 insertions, 1 deletions

diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java
index cf638ea7a4d..f16fd49a392 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentTesting.java
@@ -177,6 +177,10 @@ public class ComponentTesting {
     return newProjectCopy(Uuids.createFast(), project.getMainBranchComponent(), view.getMainBranchComponent());
   }
 
+  public static ComponentDto newProjectCopy(ProjectData project, PortfolioData view) {
+    return newProjectCopy(Uuids.createFast(), project.getMainBranchComponent(), view.getRootComponent());
+  }
+
   public static ComponentDto newProjectCopy(ComponentDto project, ComponentDto view) {
     return newProjectCopy(Uuids.createFast(), project, view);
   }
@@ -254,10 +258,23 @@ public class ComponentTesting {
       .setBranchType(BranchType.BRANCH);
   }
 
+  public static BranchDto newMainBranchDto(String projectUUid) {
+    return new BranchDto()
+      .setKey(DEFAULT_MAIN_BRANCH_NAME)
+      .setIsMain(true)
+      .setUuid(Uuids.createFast())
+      .setProjectUuid(projectUUid)
+      .setBranchType(BranchType.BRANCH);
+  }
+
   public static ProjectDto newProjectDto() {
+    return newProjectDto("uuid").setPrivate(true);
+  }
+
+  public static ProjectDto newProjectDto(String projectUuid) {
     return new ProjectDto()
       .setKey("projectKey")
-      .setUuid("uuid")
+      .setUuid(projectUuid)
       .setName("projectName")
       .setQualifier(Qualifiers.PROJECT);
   }