diff options
author | Michal Duda <michal.duda@sonarsource.com> | 2020-01-08 22:03:02 +0100 |
---|---|---|
committer | SonarTech <sonartech@sonarsource.com> | 2020-01-31 20:46:09 +0100 |
commit | 1ad6b113111429a43c009ecc92e793971109852b (patch) | |
tree | 4394c86b43b41c3e74703709d72cc518e956e96d /server/sonar-webserver-es | |
parent | ace9a50d55d831ec71b7db421aa04d1198392c6c (diff) | |
download | sonarqube-1ad6b113111429a43c009ecc92e793971109852b.tar.gz sonarqube-1ad6b113111429a43c009ecc92e793971109852b.zip |
SONAR-12689 migrated tags, updated test framework
Diffstat (limited to 'server/sonar-webserver-es')
2 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueQueryFactoryTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueQueryFactoryTest.java index 28922bbf6dc..050eb283ae7 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueQueryFactoryTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/issue/index/IssueQueryFactoryTest.java @@ -263,7 +263,7 @@ public class IssueQueryFactoryTest { public void application_search_project_issues() { ComponentDto project1 = db.components().insertPublicProject(); ComponentDto project2 = db.components().insertPublicProject(); - ComponentDto application = db.components().insertApplication(db.getDefaultOrganization()); + ComponentDto application = db.components().insertPublicApplication(db.getDefaultOrganization()); db.components().insertComponents(newProjectCopy("PC1", project1, application)); db.components().insertComponents(newProjectCopy("PC2", project2, application)); userSession.registerComponents(application, project1, project2); @@ -279,9 +279,9 @@ public class IssueQueryFactoryTest { ComponentDto project1 = db.components().insertPublicProject(); SnapshotDto analysis1 = db.components().insertSnapshot(project1, s -> s.setPeriodDate(addDays(now, -14).getTime())); ComponentDto project2 = db.components().insertPublicProject(); - SnapshotDto analysis2 = db.components().insertSnapshot(project2, s -> s.setPeriodDate(null)); + db.components().insertSnapshot(project2, s -> s.setPeriodDate(null)); ComponentDto project3 = db.components().insertPublicProject(); - ComponentDto application = db.components().insertApplication(db.getDefaultOrganization()); + ComponentDto application = db.components().insertPublicApplication(db.getDefaultOrganization()); db.components().insertComponents(newProjectCopy("PC1", project1, application)); db.components().insertComponents(newProjectCopy("PC2", project2, application)); db.components().insertComponents(newProjectCopy("PC3", project3, application)); diff --git a/server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java b/server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java index c6aa6438261..55f31f0795b 100644 --- a/server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java +++ b/server/sonar-webserver-es/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java @@ -83,7 +83,7 @@ public class PermissionIndexerDaoTest { privateProject2 = componentDbTester.insertPrivateProject(organization); view1 = componentDbTester.insertView(organization); view2 = componentDbTester.insertView(organization); - application = componentDbTester.insertApplication(organization); + application = componentDbTester.insertPublicApplication(organization); user1 = userDbTester.insertUser(); user2 = userDbTester.insertUser(); group = userDbTester.insertGroup(organization); |