Fix module uuid path in ComponentTesting

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
index 64ff8638acf3af5389e86000eaccb888aa42b934..8f59656ba35096372d2b0a299c876fb96bd765ea 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
@@ -35,13 +35,14 @@ public class ComponentTesting {
   }
 
   public static ComponentDto newFileDto(ComponentDto module, String fileUuid) {
+    String path = "src/main/xoo/org/sonar/samples/File.xoo";
     return newChildComponent(fileUuid, module)
       .setKey("KEY_" + fileUuid)
       .setName("NAME_" + fileUuid)
-      .setLongName("LONG_NAME_" + fileUuid)
+      .setLongName(path)
       .setScope(Scopes.FILE)
       .setQualifier(Qualifiers.FILE)
-      .setPath("src/main/xoo/org/sonar/samples/File.xoo")
+      .setPath(path)
       .setLanguage("xoo");
   }
 
@@ -57,7 +58,8 @@ public class ComponentTesting {
   }
 
   public static ComponentDto newModuleDto(String uuid, ComponentDto subProjectOrProject) {
-    return newChildComponent(uuid, subProjectOrProject, true)
+    return newChildComponent(uuid, subProjectOrProject)
+      .setModuleUuidPath(subProjectOrProject.moduleUuidPath() + uuid + MODULE_UUID_PATH_SEP)
       .setKey("KEY_" + uuid)
       .setName("NAME_" + uuid)
       .setLongName("LONG_NAME_" + uuid)
@@ -79,7 +81,7 @@ public class ComponentTesting {
     return new ComponentDto()
       .setUuid(uuid)
       .setProjectUuid(uuid)
-      .setModuleUuidPath(MODULE_UUID_PATH_SEP)
+      .setModuleUuidPath(MODULE_UUID_PATH_SEP + uuid + MODULE_UUID_PATH_SEP)
       .setParentProjectId(null)
       .setKey("KEY_" + uuid)
       .setName("NAME_" + uuid)
@@ -96,7 +98,7 @@ public class ComponentTesting {
     return new ComponentDto()
       .setUuid(uuid)
       .setProjectUuid(uuid)
-      .setModuleUuidPath(MODULE_UUID_PATH_SEP)
+      .setModuleUuidPath(MODULE_UUID_PATH_SEP + uuid + MODULE_UUID_PATH_SEP)
       .setParentProjectId(null)
       .setKey(uuid)
       .setName(name)
@@ -145,15 +147,11 @@ public class ComponentTesting {
   }
 
   private static ComponentDto newChildComponent(String uuid, ComponentDto module) {
-    return newChildComponent(uuid, module, false);
-  }
-
-  private static ComponentDto newChildComponent(String uuid, ComponentDto module, boolean isModule) {
     return new ComponentDto()
       .setUuid(uuid)
       .setProjectUuid(module.projectUuid())
       .setModuleUuid(module.uuid())
-      .setModuleUuidPath(module.moduleUuidPath() + module.uuid() + MODULE_UUID_PATH_SEP + (isModule ? uuid + MODULE_UUID_PATH_SEP : ""))
+      .setModuleUuidPath(module.moduleUuidPath())
       .setParentProjectId(module.getId())
       .setEnabled(true);
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
index 0a5e71aa09f7730ae43663131eb5c8abd3343f3d..c18d372aa25ecd05307ef21896a25eb9d5d2559b 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsMediumTest.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.issue.ws;
 
-import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -53,6 +52,8 @@ import org.sonar.server.view.index.ViewIndexer;
 import org.sonar.server.ws.WsTester;
 import org.sonar.server.ws.WsTester.Result;
 
+import java.util.List;
+
 import static com.google.common.collect.Lists.newArrayList;
 
 public class SearchActionComponentsMediumTest {
@@ -331,10 +332,10 @@ public class SearchActionComponentsMediumTest {
   public void display_module_facet() throws Exception {
     ComponentDto project = insertComponent(ComponentTesting.newProjectDto("ABCD").setKey("MyProject"));
     setDefaultProjectPermission(project);
-    ComponentDto module = insertComponent(ComponentTesting.newModuleDto(project).setUuid("BCDE").setKey("MyModule"));
-    ComponentDto subModule1 = insertComponent(ComponentTesting.newModuleDto(module).setUuid("CDEF").setKey("MySubModule1"));
-    ComponentDto subModule2 = insertComponent(ComponentTesting.newModuleDto(module).setUuid("DEFA").setKey("MySubModule2"));
-    ComponentDto subModule3 = insertComponent(ComponentTesting.newModuleDto(module).setUuid("EFAB").setKey("MySubModule3"));
+    ComponentDto module = insertComponent(ComponentTesting.newModuleDto("BCDE", project).setKey("MyModule"));
+    ComponentDto subModule1 = insertComponent(ComponentTesting.newModuleDto("CDEF", module).setKey("MySubModule1"));
+    ComponentDto subModule2 = insertComponent(ComponentTesting.newModuleDto("DEFA", module).setKey("MySubModule2"));
+    ComponentDto subModule3 = insertComponent(ComponentTesting.newModuleDto("EFAB", module).setKey("MySubModule3"));
     ComponentDto file1 = insertComponent(ComponentTesting.newFileDto(subModule1, "FEDC").setKey("MyComponent1"));
     ComponentDto file2 = insertComponent(ComponentTesting.newFileDto(subModule2, "EDCB").setKey("MyComponent2"));
     RuleDto newRule = newRule();