SONAR-7958 fix UUID_PATH of file created by ComponentTesting

SonarSource · Aug 10, 2016 · 97f71ab · 97f71ab
1 parent 6322127
commit 97f71ab
Show file tree

Hide file tree

Showing 49 changed files with 310 additions and 307 deletions.
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
@@ -99,7 +99,7 @@ public void before() {
   public void return_minimal_fields() throws Exception {
     ComponentDto project = ComponentTesting.newProjectDto(PROJECT_UUID).setKey(PROJECT_KEY);
     ComponentDto module = ComponentTesting.newModuleDto(MODULE_UUID, project).setKey(MODULE_KEY);
-    ComponentDto file = ComponentTesting.newFileDto(module, FILE_UUID).setKey(FILE_KEY).setPath(null);
+    ComponentDto file = ComponentTesting.newFileDto(module, null, FILE_UUID).setKey(FILE_KEY).setPath(null);
     db.getDbClient().componentDao().insert(db.getSession(), project, module, file);
     db.getSession().commit();
 
@@ -137,7 +137,7 @@ public void return_minimal_fields() throws Exception {
   public void issues_from_project() throws Exception {
     ComponentDto project = ComponentTesting.newProjectDto(PROJECT_UUID).setKey(PROJECT_KEY);
     ComponentDto module = ComponentTesting.newModuleDto(MODULE_UUID, project).setKey(MODULE_KEY);
-    ComponentDto file = ComponentTesting.newFileDto(module, FILE_UUID).setKey(FILE_KEY).setPath("src/org/struts/Action.java");
+    ComponentDto file = ComponentTesting.newFileDto(module, null, FILE_UUID).setKey(FILE_KEY).setPath("src/org/struts/Action.java");
     db.getDbClient().componentDao().insert(db.getSession(), project, module, file);
     db.getSession().commit();
 
@@ -175,7 +175,7 @@ public void issues_from_project() throws Exception {
   public void issues_from_module() throws Exception {
     ComponentDto project = ComponentTesting.newProjectDto(PROJECT_UUID).setKey(PROJECT_KEY);
     ComponentDto module = ComponentTesting.newModuleDto(MODULE_UUID, project).setKey(MODULE_KEY);
-    ComponentDto file = ComponentTesting.newFileDto(module, FILE_UUID).setKey(FILE_KEY).setPath("src/org/struts/Action.java");
+    ComponentDto file = ComponentTesting.newFileDto(module, null, FILE_UUID).setKey(FILE_KEY).setPath("src/org/struts/Action.java");
     db.getDbClient().componentDao().insert(db.getSession(), project, module, file);
     db.getSession().commit();
 
@@ -213,7 +213,7 @@ public void issues_from_module() throws Exception {
   public void issues_from_file() throws Exception {
     ComponentDto project = ComponentTesting.newProjectDto(PROJECT_UUID).setKey(PROJECT_KEY);
     ComponentDto module = ComponentTesting.newModuleDto(MODULE_UUID, project).setKey(MODULE_KEY);
-    ComponentDto file = ComponentTesting.newFileDto(module, FILE_UUID).setKey(FILE_KEY).setPath("src/org/struts/Action.java");
+    ComponentDto file = ComponentTesting.newFileDto(module, null, FILE_UUID).setKey(FILE_KEY).setPath("src/org/struts/Action.java");
     db.getDbClient().componentDao().insert(db.getSession(), project, module, file);
     db.getSession().commit();
 
@@ -289,7 +289,7 @@ public void project_issues_attached_file_on_removed_module() throws Exception {
     ComponentDto project = ComponentTesting.newProjectDto(PROJECT_UUID).setKey(PROJECT_KEY);
     // File and module are removed
     ComponentDto module = ComponentTesting.newModuleDto(MODULE_UUID, project).setKey(MODULE_KEY).setEnabled(false);
-    ComponentDto file = ComponentTesting.newFileDto(module, FILE_UUID).setKey(FILE_KEY).setPath("src/org/struts/Action.java").setEnabled(false);
+    ComponentDto file = ComponentTesting.newFileDto(module, null, FILE_UUID).setKey(FILE_KEY).setPath("src/org/struts/Action.java").setEnabled(false);
     db.getDbClient().componentDao().insert(db.getSession(), project, module, file);
     db.getSession().commit();
 

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
@@ -495,7 +495,7 @@ public void return_file_data_from_single_project() {
     tester.get(DbClient.class).componentDao().insert(dbSession, project);
     addDefaultProfile();
 
-    ComponentDto file = ComponentTesting.newFileDto(project, "file");
+    ComponentDto file = ComponentTesting.newFileDto(project, null, "file");
     tester.get(DbClient.class).componentDao().insert(dbSession, file);
     tester.get(FileSourceDao.class).insert(newFileSourceDto(file).setSrcHash("123456"));
 
@@ -515,15 +515,15 @@ public void return_file_data_from_multi_modules() {
     addDefaultProfile();
 
     // File on project
-    ComponentDto projectFile = ComponentTesting.newFileDto(project, "projectFile");
+    ComponentDto projectFile = ComponentTesting.newFileDto(project, null, "projectFile");
     tester.get(DbClient.class).componentDao().insert(dbSession, projectFile);
     tester.get(FileSourceDao.class).insert(newFileSourceDto(projectFile).setSrcHash("123456"));
 
     ComponentDto module = ComponentTesting.newModuleDto(project);
     tester.get(DbClient.class).componentDao().insert(dbSession, module);
 
     // File on module
-    ComponentDto moduleFile = ComponentTesting.newFileDto(module, "moduleFile");
+    ComponentDto moduleFile = ComponentTesting.newFileDto(module, null, "moduleFile");
     tester.get(DbClient.class).componentDao().insert(dbSession, moduleFile);
     tester.get(FileSourceDao.class).insert(newFileSourceDto(moduleFile).setSrcHash("789456"));
 
@@ -541,7 +541,7 @@ public void return_file_data_from_module() {
     addDefaultProfile();
 
     // File on project
-    ComponentDto projectFile = ComponentTesting.newFileDto(project, "projectFile");
+    ComponentDto projectFile = ComponentTesting.newFileDto(project, null, "projectFile");
     tester.get(DbClient.class).componentDao().insert(dbSession, projectFile);
     tester.get(FileSourceDao.class).insert(newFileSourceDto(projectFile).setSrcHash("123456").setRevision("987654321"));
 
@@ -550,7 +550,7 @@ public void return_file_data_from_module() {
     tester.get(DbClient.class).componentDao().insert(dbSession, module);
 
     // File on module
-    ComponentDto moduleFile = ComponentTesting.newFileDto(module, "moduleFile");
+    ComponentDto moduleFile = ComponentTesting.newFileDto(module, null, "moduleFile");
     tester.get(DbClient.class).componentDao().insert(dbSession, moduleFile);
     tester.get(FileSourceDao.class).insert(newFileSourceDto(moduleFile).setSrcHash("789456").setRevision("123456789"));
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java
@@ -114,7 +114,7 @@ public void check_module_keys_before_renaming() {
     ComponentDto module = ComponentTesting.newModuleDto(project).setKey("sample:root:module");
     dbClient.componentDao().insert(dbSession, module);
 
-    ComponentDto file = newFileDto(module).setKey("sample:root:module:src/File.xoo");
+    ComponentDto file = newFileDto(module, null).setKey("sample:root:module:src/File.xoo");
     dbClient.componentDao().insert(dbSession, file);
 
     dbSession.commit();
@@ -301,7 +301,7 @@ public void should_return_project_uuids() {
     ComponentDto module = ComponentTesting.newModuleDto(project).setKey(moduleKey);
     dbClient.componentDao().insert(dbSession, module);
     String fileKey = "sample:root:module:Foo.xoo";
-    ComponentDto file = newFileDto(module).setKey(fileKey);
+    ComponentDto file = newFileDto(module, null).setKey(fileKey);
     dbClient.componentDao().insert(dbSession, file);
     dbSession.commit();
 

diff --git a/.../sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java b/.../sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java
@@ -70,7 +70,7 @@ public void setUp() {
   @Test
   public void update_project_key() {
     ComponentDto project = insertSampleRootProject();
-    ComponentDto file = ComponentTesting.newFileDto(project).setKey("sample:root:src/File.xoo");
+    ComponentDto file = ComponentTesting.newFileDto(project, null).setKey("sample:root:src/File.xoo");
     dbClient.componentDao().insert(dbSession, file);
 
     dbSession.commit();
@@ -94,7 +94,7 @@ public void update_module_key() {
     ComponentDto module = ComponentTesting.newModuleDto(project).setKey("sample:root:module");
     dbClient.componentDao().insert(dbSession, module);
 
-    ComponentDto file = ComponentTesting.newFileDto(module).setKey("sample:root:module:src/File.xoo");
+    ComponentDto file = ComponentTesting.newFileDto(module, null).setKey("sample:root:module:src/File.xoo");
     dbClient.componentDao().insert(dbSession, file);
 
     dbSession.commit();
@@ -171,7 +171,7 @@ public void fail_if_new_key_is_not_formatted_correctly() {
   public void fail_if_update_is_not_on_module_or_project() {
     setGlobalAdminPermission();
     ComponentDto project = insertSampleRootProject();
-    ComponentDto file = componentDb.insertComponent(newFileDto(project));
+    ComponentDto file = componentDb.insertComponent(newFileDto(project, null));
 
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Component updated must be a module or a key");

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java
@@ -154,7 +154,7 @@ private void insertComponentsAndAnalysis() {
     ComponentDto module = ComponentTesting.newModuleDto(MODULE_UUID, project)
       .setLongName("SonarQube :: Plugin API")
       .setKey(MODULE_KEY);
-    ComponentDto file = ComponentTesting.newFileDto(module, FILE_UUID)
+    ComponentDto file = ComponentTesting.newFileDto(module, null, FILE_UUID)
       .setKey(FILE_KEY)
       .setName("Plugin.java")
       .setLongName("src/main/java/org/sonar/api/Plugin.java")

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/BulkUpdateKeyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/BulkUpdateKeyActionTest.java
@@ -91,7 +91,7 @@ public void json_example() {
     ComponentDto anotherProject = componentDb.insertComponent(newProjectDto().setKey("another_project"));
     componentDb.insertComponent(newModuleDto(anotherProject).setKey("my_new_project:module_1"));
     ComponentDto module2 = componentDb.insertComponent(newModuleDto(project).setKey("my_project:module_2"));
-    componentDb.insertComponent(newFileDto(module2));
+    componentDb.insertComponent(newFileDto(module2, null));
 
     String result = ws.newRequest()
       .setParam(PARAM_KEY, "my_project")
@@ -117,7 +117,7 @@ public void dry_run_by_key() {
   public void bulk_update_project_key() {
     ComponentDto project = insertMyProject();
     ComponentDto module = componentDb.insertComponent(newModuleDto(project).setKey("my_project:root:module"));
-    ComponentDto file = componentDb.insertComponent(newFileDto(module).setKey("my_project:root:module:src/File.xoo"));
+    ComponentDto file = componentDb.insertComponent(newFileDto(module, null).setKey("my_project:root:module:src/File.xoo"));
 
     BulkUpdateKeyWsResponse result = callByUuid(project.uuid(), FROM, TO);
 
@@ -167,7 +167,7 @@ public void fail_to_bulk_update_with_invalid_new_key() {
   @Test
   public void fail_to_bulk_update_if_not_project_or_module() {
     ComponentDto project = insertMyProject();
-    ComponentDto file = componentDb.insertComponent(newFileDto(project));
+    ComponentDto file = componentDb.insertComponent(newFileDto(project, null));
 
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Component updated must be a module or a key");

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java
@@ -92,13 +92,13 @@ public void search_json_example() {
       newModuleDto("module-uuid", project)
         .setName("Module Name")
         .setKey("module-key"));
+    ComponentDto directory = newDirectory(module, "path/to/directoy")
+      .setUuid("directory-uuid")
+      .setKey("directory-key")
+      .setName("Directory Name");
+    componentDb.insertComponent(directory);
     componentDb.insertComponent(
-      newDirectory(module, "path/to/directoy")
+      newFileDto(module, directory, "file-uuid")
-        .setUuid("directory-uuid")
-        .setKey("directory-key")
-        .setName("Directory Name"));
-    componentDb.insertComponent(
-      newFileDto(module, "file-uuid")
         .setKey("file-key")
         .setLanguage("java")
         .setName("File Name"));

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java
@@ -153,7 +153,7 @@ private void insertJsonExampleComponentsAndSnapshots() {
       .setQualifier(Qualifiers.DIRECTORY);
     componentDb.insertComponent(directory);
     componentDb.insertComponent(
-      newFileDto(directory, "AVIF-FffA3Ax6PH2efPD")
+      newFileDto(directory, directory, "AVIF-FffA3Ax6PH2efPD")
         .setKey("com.sonarsource:java-markdown:src/main/java/com/sonarsource/markdown/impl/Rule.java")
         .setName("Rule.java")
         .setPath("src/main/java/com/sonarsource/markdown/impl/Rule.java")

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.util.Date;
 import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Rule;
@@ -117,7 +118,7 @@ public void return_children() throws IOException {
     }
     ComponentDto directory = newDirectory(module, "directory-path-1");
     componentDb.insertComponent(directory);
-    componentDb.insertComponent(newFileDto(directory, 10));
+    componentDb.insertComponent(newFileDto(module, directory, 10));
     db.commit();
     componentDb.indexAllComponents();
 
@@ -147,7 +148,7 @@ public void return_descendants() throws IOException {
     }
     ComponentDto directory = newDirectory(module, "directory-path-1");
     componentDb.insertComponent(directory);
-    componentDb.insertComponent(newFileDto(directory, 1));
+    componentDb.insertComponent(newFileDto(module, directory, 1));
     db.commit();
     componentDb.indexAllComponents();
 
@@ -193,7 +194,7 @@ public void return_leaves() throws IOException {
     componentDb.insertComponent(newFileDto(module, 2));
     ComponentDto directory = newDirectory(project, "directory-path-1");
     componentDb.insertComponent(directory);
-    componentDb.insertComponent(newFileDto(directory, 3));
+    componentDb.insertComponent(newFileDto(module, directory, 3));
     db.commit();
     componentDb.indexAllComponents();
 
@@ -385,11 +386,15 @@ private TreeWsResponse call(TestRequest request) {
     }
   }
 
-  private static ComponentDto newFileDto(ComponentDto parentComponent, int i) {
+  private static ComponentDto newFileDto(ComponentDto moduleOrProject, @Nullable ComponentDto directory, int i) {
-    return ComponentTesting.newFileDto(parentComponent, "file-uuid-" + i)
+    return ComponentTesting.newFileDto(moduleOrProject, directory, "file-uuid-" + i)
-      .setName("file-name-" + i)
+        .setName("file-name-" + i)
-      .setKey("file-key-" + i)
+        .setKey("file-key-" + i)
-      .setPath("file-path-" + i);
+        .setPath("file-path-" + i);
+  }
+
+  private static ComponentDto newFileDto(ComponentDto moduleOrProject, int i) {
+    return newFileDto(moduleOrProject, null, i);
   }
 
   private ComponentDto initJsonExampleComponents() throws IOException {
@@ -404,7 +409,7 @@ private ComponentDto initJsonExampleComponents() throws IOException {
     for (JsonElement componentAsJsonElement : components) {
       JsonObject componentAsJsonObject = componentAsJsonElement.getAsJsonObject();
       String uuid = getJsonField(componentAsJsonObject, "id");
-      componentDb.insertComponent(ComponentTesting.newChildComponent(uuid, project)
+      componentDb.insertComponent(ComponentTesting.newChildComponent(uuid, project, project)
         .setKey(getJsonField(componentAsJsonObject, "key"))
         .setName(getJsonField(componentAsJsonObject, "name"))
         .setLanguage(getJsonField(componentAsJsonObject, "language"))

diff --git a/...a/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java b/...a/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java
@@ -277,7 +277,7 @@ public void remove_uuid_of_original_file_from_componentsWithUnprocessedIssues_if
 
   private void addBaseIssue(RuleKey ruleKey) {
     ComponentDto project = ComponentTesting.newProjectDto(PROJECT_UUID).setKey(PROJECT_KEY);
-    ComponentDto file = ComponentTesting.newFileDto(project, FILE_UUID).setKey(FILE_KEY);
+    ComponentDto file = ComponentTesting.newFileDto(project, null, FILE_UUID).setKey(FILE_KEY);
     dbTester.getDbClient().componentDao().insert(dbTester.getSession(), project, file);
 
     RuleDto ruleDto = RuleTesting.newDto(ruleKey);

diff --git a/...va/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java b/...va/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java
@@ -174,8 +174,9 @@ public void compute_keys_and_uuids() {
   public void return_existing_uuids() {
     ComponentDto project = insertComponent(newProjectDto("ABCD").setKey(REPORT_PROJECT_KEY));
     ComponentDto module = insertComponent(newModuleDto("BCDE", project).setKey(REPORT_MODULE_KEY));
-    insertComponent(newDirectory(module, "CDEF", REPORT_DIR_KEY_1).setKey(REPORT_MODULE_KEY + ":" + REPORT_DIR_KEY_1));
+    ComponentDto directory = newDirectory(module, "CDEF", REPORT_DIR_KEY_1);
-    insertComponent(newFileDto(module, "DEFG").setKey(REPORT_MODULE_KEY + ":" + REPORT_FILE_KEY_1));
+    insertComponent(directory.setKey(REPORT_MODULE_KEY + ":" + REPORT_DIR_KEY_1));
+    insertComponent(newFileDto(module, directory, "DEFG").setKey(REPORT_MODULE_KEY + ":" + REPORT_FILE_KEY_1));
 
     reportReader.putComponent(componentWithKey(ROOT_REF, PROJECT, REPORT_PROJECT_KEY, MODULE_REF));
     reportReader.putComponent(componentWithKey(MODULE_REF, MODULE, REPORT_MODULE_KEY, DIR_REF_1));
@@ -253,7 +254,7 @@ public void return_existing_uuids_when_components_were_removed() {
     ComponentDto project = insertComponent(newProjectDto("ABCD").setKey(REPORT_PROJECT_KEY));
     ComponentDto removedModule = insertComponent(newModuleDto("BCDE", project).setKey(REPORT_MODULE_KEY).setEnabled(false));
     ComponentDto removedDirectory = insertComponent(newDirectory(removedModule, "CDEF", REPORT_DIR_KEY_1).setKey(REPORT_MODULE_KEY + ":" + REPORT_DIR_KEY_1).setEnabled(false));
-    insertComponent(newFileDto(removedDirectory, "DEFG").setKey(REPORT_MODULE_KEY + ":" + REPORT_FILE_KEY_1).setEnabled(false));
+    insertComponent(newFileDto(removedModule, removedModule, "DEFG").setKey(REPORT_MODULE_KEY + ":" + REPORT_FILE_KEY_1).setEnabled(false));
 
     reportReader.putComponent(componentWithKey(ROOT_REF, PROJECT, REPORT_PROJECT_KEY, MODULE_REF));
     reportReader.putComponent(componentWithKey(MODULE_REF, MODULE, REPORT_MODULE_KEY, DIR_REF_1));

diff --git a/...computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java b/...computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java
@@ -340,7 +340,7 @@ private SnapshotDto createProjectSnapshot(ComponentDto project) {
   }
 
   private ComponentDto createFile(String fileKey, ComponentDto project) {
-    ComponentDto file = ComponentTesting.newFileDto(project)
+    ComponentDto file = ComponentTesting.newFileDto(project, null)
       .setKey(fileKey)
       .setLanguage(XOO_LANGUAGE);
     dbClient.componentDao().insert(dbSession, file);

diff --git a/...st/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java b/...st/java/org/sonar/server/computation/task/projectanalysis/step/PersistIssuesStepTest.java
@@ -100,7 +100,7 @@ public void insert_new_issue() {
     dbClient.ruleDao().insert(session, rule);
     ComponentDto project = ComponentTesting.newProjectDto();
     dbClient.componentDao().insert(session, project);
-    ComponentDto file = ComponentTesting.newFileDto(project);
+    ComponentDto file = ComponentTesting.newFileDto(project, null);
     dbClient.componentDao().insert(session, file);
     session.commit();
 

diff --git a/...org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java b/...org/sonar/server/computation/task/projectanalysis/step/ReportPersistAnalysisStepTest.java
@@ -104,7 +104,7 @@ public void persist_analysis() {
     dbClient.componentDao().insert(dbTester.getSession(), moduleDto);
     ComponentDto directoryDto = ComponentTesting.newDirectory(moduleDto, "CDEF", "MODULE_KEY:src/main/java/dir").setKey("MODULE_KEY:src/main/java/dir");
     dbClient.componentDao().insert(dbTester.getSession(), directoryDto);
-    ComponentDto fileDto = ComponentTesting.newFileDto(moduleDto, "DEFG").setKey("MODULE_KEY:src/main/java/dir/Foo.java");
+    ComponentDto fileDto = ComponentTesting.newFileDto(moduleDto, directoryDto, "DEFG").setKey("MODULE_KEY:src/main/java/dir/Foo.java");
     dbClient.componentDao().insert(dbTester.getSession(), fileDto);
     dbTester.getSession().commit();
 
@@ -173,7 +173,7 @@ public void only_persist_snapshots_with_periods_on_project_and_module() {
     ComponentDto directoryDto = ComponentTesting.newDirectory(moduleDto, "CDEF", "MODULE_KEY:src/main/java/dir").setKey("MODULE_KEY:src/main/java/dir");
     dbClient.componentDao().insert(dbTester.getSession(), directoryDto);
 
-    ComponentDto fileDto = ComponentTesting.newFileDto(moduleDto, "DEFG").setKey("MODULE_KEY:src/main/java/dir/Foo.java");
+    ComponentDto fileDto = ComponentTesting.newFileDto(moduleDto, directoryDto, "DEFG").setKey("MODULE_KEY:src/main/java/dir/Foo.java");
     dbClient.componentDao().insert(dbTester.getSession(), fileDto);
 
     dbTester.getSession().commit();