From 0640eca01b5ef6dbfa5068cc80299a3ab5551e9f Mon Sep 17 00:00:00 2001 From: Daniel Schwarz Date: Wed, 26 Apr 2017 14:58:51 +0200 Subject: [PATCH] SONAR-9106 fix quality flaws: use OrganizationDbTester more often --- .../java/org/sonar/server/project/ws/CreateActionTest.java | 6 ++---- .../java/org/sonar/server/ui/ws/OrganizationActionTest.java | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) 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 cc6e2ba5f52..9d725c79277 100644 --- 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 19279a939bb..3feab3cae3d 100644 --- 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\"}}"); } -- 2.39.5