diff options
Diffstat (limited to 'server')
4 files changed, 21 insertions, 29 deletions
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java index dde5d621204..8110c87c780 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java @@ -36,7 +36,6 @@ import org.sonar.db.DbTester; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeQueueDto; import org.sonar.db.ce.CeTaskTypes; -import org.sonar.db.component.ComponentDbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.organization.OrganizationDto; import org.sonar.server.exceptions.BadRequestException; @@ -77,7 +76,6 @@ public class ActivityActionTest { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); - private ComponentDbTester componentDb = new ComponentDbTester(dbTester); private TaskFormatter formatter = new TaskFormatter(dbTester.getDbClient(), System2.INSTANCE); private ActivityAction underTest = new ActivityAction(userSession, dbTester.getDbClient(), formatter, new CeTaskProcessor[] {mock(CeTaskProcessor.class)}); private WsActionTester ws = new WsActionTester(underTest); @@ -237,9 +235,9 @@ public class ActivityActionTest { ComponentDto struts = newProjectDto(organizationDto).setName("old apache struts").setUuid("P1").setProjectUuid("P1"); ComponentDto zookeeper = newProjectDto(organizationDto).setName("new apache zookeeper").setUuid("P2").setProjectUuid("P2"); ComponentDto eclipse = newProjectDto(organizationDto).setName("eclipse").setUuid("P3").setProjectUuid("P3"); - componentDb.insertProjectAndSnapshot(struts); - componentDb.insertProjectAndSnapshot(zookeeper); - componentDb.insertProjectAndSnapshot(eclipse); + dbTester.components().insertProjectAndSnapshot(struts); + dbTester.components().insertProjectAndSnapshot(zookeeper); + dbTester.components().insertProjectAndSnapshot(eclipse); logInAsRoot(); insertActivity("T1", "P1", CeActivityDto.Status.SUCCESS); insertActivity("T2", "P2", CeActivityDto.Status.SUCCESS); @@ -255,8 +253,8 @@ public class ActivityActionTest { OrganizationDto organizationDto = dbTester.organizations().insert(); ComponentDto apacheView = newView(organizationDto).setName("Apache View").setUuid("V1").setProjectUuid("V1"); ComponentDto developer = newDeveloper(organizationDto, "Apache Developer").setUuid("D1").setProjectUuid("D1"); - componentDb.insertDeveloperAndSnapshot(developer); - componentDb.insertViewAndSnapshot(apacheView); + dbTester.components().insertDeveloperAndSnapshot(developer); + dbTester.components().insertViewAndSnapshot(apacheView); logInAsRoot(); insertActivity("T1", "D1", CeActivityDto.Status.SUCCESS); insertActivity("T2", "V1", CeActivityDto.Status.SUCCESS); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java index 6292e3463f3..bd04b54efee 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityStatusActionTest.java @@ -34,7 +34,6 @@ import org.sonar.db.DbSession; import org.sonar.db.DbTester; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeQueueDto; -import org.sonar.db.component.ComponentDbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.organization.OrganizationDto; import org.sonar.server.component.ComponentFinder; @@ -62,7 +61,6 @@ public class ActivityStatusActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); - private ComponentDbTester componentDb = new ComponentDbTester(db); private DbClient dbClient = db.getDbClient(); private DbSession dbSession = db.getSession(); private WsActionTester ws = new WsActionTester(new ActivityStatusAction(userSession, dbClient, new ComponentFinder(dbClient))); @@ -88,8 +86,8 @@ public class ActivityStatusActionTest { String anotherProjectUuid = "another-project-uuid"; userSession.logIn().addProjectUuidPermissions(UserRole.ADMIN, projectUuid); OrganizationDto organizationDto = db.organizations().insert(); - componentDb.insertComponent(newProjectDto(organizationDto, projectUuid)); - componentDb.insertComponent(newProjectDto(organizationDto, anotherProjectUuid)); + db.components().insertComponent(newProjectDto(organizationDto, projectUuid)); + db.components().insertComponent(newProjectDto(organizationDto, anotherProjectUuid)); // pending tasks returned insertInQueue(CeQueueDto.Status.PENDING, projectUuid); insertInQueue(CeQueueDto.Status.PENDING, projectUuid); @@ -121,7 +119,7 @@ public class ActivityStatusActionTest { @Test public void fail_if_component_uuid_and_key_are_provided() { ComponentDto project = newProjectDto(db.organizations().insert()); - componentDb.insertComponent(project); + db.components().insertComponent(project); expectedException.expect(IllegalArgumentException.class); callByComponentUuidOrComponentKey(project.uuid(), project.key()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java index 0f7d102132a..9849401bad8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java @@ -29,7 +29,6 @@ import org.sonar.db.DbTester; import org.sonar.db.ce.CeActivityDto; import org.sonar.db.ce.CeQueueDto; import org.sonar.db.ce.CeTaskTypes; -import org.sonar.db.component.ComponentDbTester; import org.sonar.db.component.ComponentDto; import org.sonar.db.organization.OrganizationDto; import org.sonar.server.component.ComponentFinder; @@ -57,14 +56,13 @@ public class ComponentActionTest { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); - ComponentDbTester componentDbTester = new ComponentDbTester(dbTester); - TaskFormatter formatter = new TaskFormatter(dbTester.getDbClient(), System2.INSTANCE); - ComponentAction underTest = new ComponentAction(userSession, dbTester.getDbClient(), formatter, new ComponentFinder(dbTester.getDbClient())); - WsActionTester ws = new WsActionTester(underTest); + private TaskFormatter formatter = new TaskFormatter(dbTester.getDbClient(), System2.INSTANCE); + private ComponentAction underTest = new ComponentAction(userSession, dbTester.getDbClient(), formatter, new ComponentFinder(dbTester.getDbClient())); + private WsActionTester ws = new WsActionTester(underTest); @Test public void empty_queue_and_empty_activity() { - componentDbTester.insertComponent(newProjectDto(dbTester.organizations().insert(), "PROJECT_1")); + dbTester.components().insertComponent(newProjectDto(dbTester.organizations().insert(), "PROJECT_1")); userSession.addComponentUuidPermission(UserRole.USER, "PROJECT_1", "PROJECT_1"); TestResponse wsResponse = ws.newRequest() @@ -80,7 +78,7 @@ public class ComponentActionTest { @Test public void project_tasks() { OrganizationDto organizationDto = dbTester.organizations().insert(); - componentDbTester.insertComponent(newProjectDto(organizationDto, "PROJECT_1")); + dbTester.components().insertComponent(newProjectDto(organizationDto, "PROJECT_1")); userSession.addComponentUuidPermission(UserRole.USER, "PROJECT_1", "PROJECT_1"); insertActivity("T1", "PROJECT_1", CeActivityDto.Status.SUCCESS); insertActivity("T2", "PROJECT_2", CeActivityDto.Status.FAILED); @@ -108,7 +106,7 @@ public class ComponentActionTest { @Test public void search_tasks_by_component_key() { - ComponentDto project = componentDbTester.insertProject(); + ComponentDto project = dbTester.components().insertProject(); logInWithBrowsePermission(project); insertActivity("T1", project.uuid(), CeActivityDto.Status.SUCCESS); @@ -123,7 +121,7 @@ public class ComponentActionTest { @Test public void canceled_tasks_must_not_be_picked_as_current_analysis() { - componentDbTester.insertComponent(newProjectDto(dbTester.getDefaultOrganization(), "PROJECT_1")); + dbTester.components().insertComponent(newProjectDto(dbTester.getDefaultOrganization(), "PROJECT_1")); userSession.addComponentUuidPermission(UserRole.USER, "PROJECT_1", "PROJECT_1"); insertActivity("T1", "PROJECT_1", CeActivityDto.Status.SUCCESS); insertActivity("T2", "PROJECT_2", CeActivityDto.Status.FAILED); @@ -156,7 +154,7 @@ public class ComponentActionTest { @Test public void throw_ForbiddenException_if_user_cant_access_project() { - ComponentDto project = componentDbTester.insertProject(); + ComponentDto project = dbTester.components().insertProject(); userSession.logIn(); expectedException.expect(ForbiddenException.class); @@ -170,7 +168,7 @@ public class ComponentActionTest { @Test public void fail_when_no_component_parameter() { expectedException.expect(IllegalArgumentException.class); - logInWithBrowsePermission(componentDbTester.insertProject()); + logInWithBrowsePermission(dbTester.components().insertProject()); ws.newRequest().execute(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java index 6492598a639..7e5814bc20b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java @@ -25,7 +25,6 @@ import org.junit.rules.ExpectedException; import org.sonar.api.utils.System2; import org.sonar.db.DbSession; import org.sonar.db.DbTester; -import org.sonar.db.component.ComponentDbTester; import org.sonar.db.component.ComponentDto; import org.sonar.server.exceptions.NotFoundException; @@ -41,10 +40,9 @@ public class ComponentFinderTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); - ComponentDbTester componentDb = new ComponentDbTester(db); - final DbSession dbSession = db.getSession(); - ComponentFinder underTest = new ComponentFinder(db.getDbClient()); + private final DbSession dbSession = db.getSession(); + private ComponentFinder underTest = new ComponentFinder(db.getDbClient()); @Test public void fail_when_the_uuid_and_key_are_null() { @@ -97,7 +95,7 @@ public class ComponentFinderTest { @Test public void get_component_by_uuid() { - componentDb.insertComponent(newProjectDto(db.organizations().insert(), "project-uuid")); + db.components().insertComponent(newProjectDto(db.organizations().insert(), "project-uuid")); ComponentDto component = underTest.getByUuidOrKey(dbSession, "project-uuid", null, ID_AND_KEY); @@ -106,7 +104,7 @@ public class ComponentFinderTest { @Test public void get_component_by_key() { - componentDb.insertComponent(newProjectDto(db.getDefaultOrganization()).setKey("project-key")); + db.components().insertComponent(newProjectDto(db.getDefaultOrganization()).setKey("project-key")); ComponentDto component = underTest.getByUuidOrKey(dbSession, null, "project-key", ID_AND_KEY); |