SONAR-9106 fix quality flaws: use OrganizationDbTester more often

diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java
index cc6e2ba5f52d8f937a53329c2a3869e2afd74a3c..9d725c7927717e18433fc261aed49fed46239c6e 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java
@@ -216,8 +216,7 @@ public class CreateActionTest {
   @Test
   public void apply_default_project_visibility_public() {
     OrganizationDto organization = db.organizations().insert();
-    db.getDbClient().organizationDao().setNewProjectPrivate(db.getSession(), organization, false);
-    db.commit();
+    db.organizations().setNewProjectPrivate(organization, false);
     userSession.addPermission(PROVISION_PROJECTS, organization);
     expectSuccessfulCallToComponentUpdater();
 
@@ -233,8 +232,7 @@ public class CreateActionTest {
   @Test
   public void apply_default_project_visibility_private() {
     OrganizationDto organization = db.organizations().insert();
-    db.getDbClient().organizationDao().setNewProjectPrivate(db.getSession(), organization, true);
-    db.commit();
+    db.organizations().setNewProjectPrivate(organization, true);
     userSession.addPermission(PROVISION_PROJECTS, organization);
     expectSuccessfulCallToComponentUpdater();
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
index 19279a939bbddbdb159e1758f9a113c6b4f2a854..3feab3cae3d09404e4e43e94e110c555d502d580 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
@@ -241,8 +241,7 @@ public class OrganizationActionTest {
   @Test
   public void returns_project_visibility_private() {
     OrganizationDto organization = dbTester.organizations().insert();
-    dbClient.organizationDao().setNewProjectPrivate(dbTester.getSession(), organization, true);
-    dbTester.commit();
+    dbTester.organizations().setNewProjectPrivate(organization, true);
     userSession.logIn().addPermission(PROVISION_PROJECTS, organization);
     assertJson(executeRequest(organization).getInput()).isSimilarTo("{\"organization\": {\"projectVisibility\": \"private\"}}");
   }
@@ -250,8 +249,7 @@ public class OrganizationActionTest {
   @Test
   public void returns_project_visibility_public() {
     OrganizationDto organization = dbTester.organizations().insert();
-    dbClient.organizationDao().setNewProjectPrivate(dbTester.getSession(), organization, false);
-    dbTester.commit();
+    dbTester.organizations().setNewProjectPrivate(organization, false);
     userSession.logIn().addPermission(PROVISION_PROJECTS, organization);
     assertJson(executeRequest(organization).getInput()).isSimilarTo("{\"organization\": {\"projectVisibility\": \"public\"}}");
   }