use testFixtures instead of test configuration of db-dao

server/sonar-ce-common/build.gradle

@@ -35,7 +35,6 @@ dependencies {
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
   compile project(':server:sonar-ce-task')
-  compile project(':server:sonar-db-dao')
   compile project(':server:sonar-server-common')
   compile project(':sonar-core')
   compile project(path: ':sonar-plugin-api', configuration: 'shadow')

server/sonar-ce-task-projectanalysis/build.gradle

@@ -38,7 +38,6 @@ dependencies {
   
   compile project(':sonar-core')
   compile project(':server:sonar-ce-task')
-  compile project(':server:sonar-db-dao')
   compile project(':server:sonar-db-migration')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')

server/sonar-ce-task/build.gradle

@@ -22,7 +22,6 @@ dependencies {
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
 
-  compile project(':server:sonar-db-dao')
   compile project(':server:sonar-server-common')
   compile project(':sonar-core')
   compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow')

server/sonar-ce/build.gradle

@@ -18,7 +18,6 @@ dependencies {
   compile project(':server:sonar-ce-common')
   compile project(':server:sonar-ce-task')
   compile project(':server:sonar-ce-task-projectanalysis')
-  compile project(':server:sonar-db-dao')
   compile project(':server:sonar-process')
   compile project(':server:sonar-ce-task')
   compile project(':server:sonar-server-common')

server/sonar-ce/src/test/resources/logback-test.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
+
+</configuration>

server/sonar-db-dao/build.gradle

@@ -22,7 +22,6 @@ dependencies {
 
   compileOnly 'com.google.code.findbugs:jsr305'
 
-  testCompile 'com.h2database:h2'
   testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
@@ -30,7 +29,6 @@ dependencies {
   testCompile 'org.mockito:mockito-core'
   testCompile 'org.sonarsource.orchestrator:sonar-orchestrator'
   testCompile project(':sonar-testing-harness')
-  testCompile testFixtures(project(':server:sonar-db-core'))
   testCompile project(':sonar-plugin-api-impl')
 
   testCompileOnly 'com.google.code.findbugs:jsr305'
@@ -39,6 +37,12 @@ dependencies {
   testRuntime 'com.microsoft.sqlserver:mssql-jdbc'
   testRuntime 'com.oracle.jdbc:ojdbc8'
   testRuntime 'org.postgresql:postgresql'
+
+  testFixturesApi testFixtures(project(':server:sonar-db-core'))
+
+  testFixturesImplementation 'com.h2database:h2'
+
+  testFixturesCompileOnly 'com.google.code.findbugs:jsr305'
 }
 
 test {

server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDbTester.java → server/sonar-db-dao/src/testFixtures/java/org/sonar/db/component/ComponentDbTester.java

@@ -31,14 +31,6 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Arrays.asList;
 import static org.sonar.db.component.BranchType.LONG;
-import static org.sonar.db.component.ComponentTesting.newApplication;
-import static org.sonar.db.component.ComponentTesting.newBranchDto;
-import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto;
-import static org.sonar.db.component.ComponentTesting.newProjectBranch;
-import static org.sonar.db.component.ComponentTesting.newPublicProjectDto;
-import static org.sonar.db.component.ComponentTesting.newSubView;
-import static org.sonar.db.component.ComponentTesting.newView;
-import static org.sonar.db.component.SnapshotTesting.newAnalysis;
 
 public class ComponentDbTester {
   private final DbTester db;
@@ -61,7 +53,7 @@ public class ComponentDbTester {
 
   private SnapshotDto insertComponentAndSnapshot(ComponentDto component) {
     dbClient.componentDao().insert(dbSession, component);
-    SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, newAnalysis(component));
+    SnapshotDto snapshot = dbClient.snapshotDao().insert(dbSession, SnapshotTesting.newAnalysis(component));
     db.commit();
 
     return snapshot;
@@ -72,7 +64,7 @@ public class ComponentDbTester {
   }
 
   public ComponentDto insertPrivateProject() {
-    return insertComponentImpl(newPrivateProjectDto(db.getDefaultOrganization()), true, noExtraConfiguration());
+    return insertComponentImpl(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()), true, noExtraConfiguration());
   }
 
   public ComponentDto insertPublicProject() {
@@ -81,43 +73,43 @@ public class ComponentDbTester {
 
   @SafeVarargs
   public final ComponentDto insertPrivateProject(Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newPrivateProjectDto(db.getDefaultOrganization()), true, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()), true, dtoPopulators);
   }
 
   @SafeVarargs
   public final ComponentDto insertPublicProject(Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newPublicProjectDto(db.getDefaultOrganization()), false, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newPublicProjectDto(db.getDefaultOrganization()), false, dtoPopulators);
   }
 
   @SafeVarargs
   public final ComponentDto insertPrivateProject(OrganizationDto organizationDto, Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newPrivateProjectDto(organizationDto), true, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newPrivateProjectDto(organizationDto), true, dtoPopulators);
   }
 
   @SafeVarargs
   public final ComponentDto insertPublicProject(OrganizationDto organizationDto, Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newPublicProjectDto(organizationDto), false, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newPublicProjectDto(organizationDto), false, dtoPopulators);
   }
 
   public ComponentDto insertPrivateProject(OrganizationDto organizationDto) {
-    return insertComponentImpl(newPrivateProjectDto(organizationDto), true, noExtraConfiguration());
+    return insertComponentImpl(ComponentTesting.newPrivateProjectDto(organizationDto), true, noExtraConfiguration());
   }
 
   public ComponentDto insertPublicProject(OrganizationDto organizationDto) {
-    return insertComponentImpl(newPublicProjectDto(organizationDto), false, noExtraConfiguration());
+    return insertComponentImpl(ComponentTesting.newPublicProjectDto(organizationDto), false, noExtraConfiguration());
   }
 
   public ComponentDto insertPrivateProject(OrganizationDto organizationDto, String uuid) {
-    return insertComponentImpl(newPrivateProjectDto(organizationDto, uuid), true, noExtraConfiguration());
+    return insertComponentImpl(ComponentTesting.newPrivateProjectDto(organizationDto, uuid), true, noExtraConfiguration());
   }
 
   public ComponentDto insertPublicProject(OrganizationDto organizationDto, String uuid) {
-    return insertComponentImpl(newPublicProjectDto(organizationDto, uuid), false, noExtraConfiguration());
+    return insertComponentImpl(ComponentTesting.newPublicProjectDto(organizationDto, uuid), false, noExtraConfiguration());
   }
 
   @SafeVarargs
   public final ComponentDto insertPrivateProject(OrganizationDto organizationDto, String uuid, Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newPrivateProjectDto(organizationDto, uuid), true, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newPrivateProjectDto(organizationDto, uuid), true, dtoPopulators);
   }
 
   /**
@@ -126,7 +118,7 @@ public class ComponentDbTester {
    */
   @Deprecated
   public ComponentDto insertView() {
-    return insertComponentImpl(newView(db.getDefaultOrganization()), false, noExtraConfiguration());
+    return insertComponentImpl(ComponentTesting.newView(db.getDefaultOrganization()), false, noExtraConfiguration());
   }
 
   /**
@@ -134,7 +126,7 @@ public class ComponentDbTester {
    * @see #insertPublicPortfolio(OrganizationDto, Consumer[])
    */
   public ComponentDto insertView(Consumer<ComponentDto> dtoPopulator) {
-    return insertComponentImpl(newView(db.getDefaultOrganization()), false, dtoPopulator);
+    return insertComponentImpl(ComponentTesting.newView(db.getDefaultOrganization()), false, dtoPopulator);
   }
 
   /**
@@ -142,7 +134,7 @@ public class ComponentDbTester {
    * @see #insertPublicPortfolio(OrganizationDto, Consumer[])
    */
   public ComponentDto insertView(OrganizationDto organizationDto) {
-    return insertComponentImpl(newView(organizationDto), false, noExtraConfiguration());
+    return insertComponentImpl(ComponentTesting.newView(organizationDto), false, noExtraConfiguration());
   }
 
   /**
@@ -150,7 +142,7 @@ public class ComponentDbTester {
    * @see #insertPublicPortfolio(OrganizationDto, Consumer[])
    */
   public ComponentDto insertView(OrganizationDto organizationDto, Consumer<ComponentDto> dtoPopulator) {
-    return insertComponentImpl(newView(organizationDto), false, dtoPopulator);
+    return insertComponentImpl(ComponentTesting.newView(organizationDto), false, dtoPopulator);
   }
 
   /**
@@ -158,7 +150,7 @@ public class ComponentDbTester {
    * @see #insertPublicPortfolio(OrganizationDto, Consumer[])
    */
   public ComponentDto insertView(String uuid) {
-    return insertComponentImpl(newView(db.getDefaultOrganization(), uuid), false, noExtraConfiguration());
+    return insertComponentImpl(ComponentTesting.newView(db.getDefaultOrganization(), uuid), false, noExtraConfiguration());
   }
 
   /**
@@ -166,27 +158,27 @@ public class ComponentDbTester {
    * @see #insertPublicPortfolio(OrganizationDto, Consumer[])
    */
   public ComponentDto insertView(OrganizationDto organizationDto, String uuid) {
-    return insertComponentImpl(newView(organizationDto, uuid), false, noExtraConfiguration());
+    return insertComponentImpl(ComponentTesting.newView(organizationDto, uuid), false, noExtraConfiguration());
   }
 
   @SafeVarargs
   public final ComponentDto insertPublicPortfolio(OrganizationDto organization, Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newView(organization).setPrivate(false), false, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newView(organization).setPrivate(false), false, dtoPopulators);
   }
 
   @SafeVarargs
   public final ComponentDto insertPrivatePortfolio(OrganizationDto organization, Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newView(organization).setPrivate(true), true, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newView(organization).setPrivate(true), true, dtoPopulators);
   }
 
   @SafeVarargs
   public final ComponentDto insertPublicApplication(OrganizationDto organization, Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newApplication(organization).setPrivate(false), false, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newApplication(organization).setPrivate(false), false, dtoPopulators);
   }
 
   @SafeVarargs
   public final ComponentDto insertPrivateApplication(OrganizationDto organization, Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newApplication(organization).setPrivate(true), true, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newApplication(organization).setPrivate(true), true, dtoPopulators);
   }
 
   /**
@@ -195,12 +187,12 @@ public class ComponentDbTester {
    */
   @SafeVarargs
   public final ComponentDto insertApplication(OrganizationDto organizationDto, Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newApplication(organizationDto), false, dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newApplication(organizationDto), false, dtoPopulators);
   }
 
   @SafeVarargs
   public final ComponentDto insertSubView(ComponentDto view, Consumer<ComponentDto>... dtoPopulators) {
-    return insertComponentImpl(newSubView(view), view.isPrivate(), dtoPopulators);
+    return insertComponentImpl(ComponentTesting.newSubView(view), view.isPrivate(), dtoPopulators);
   }
 
   private static <T> Consumer<T> noExtraConfiguration() {
@@ -254,13 +246,13 @@ public class ComponentDbTester {
 
   @SafeVarargs
   public final ComponentDto insertMainBranch(OrganizationDto organization, Consumer<ComponentDto>... dtoPopulators) {
-    ComponentDto project = newPrivateProjectDto(organization);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(organization);
     Arrays.stream(dtoPopulators).forEach(dtoPopulator -> dtoPopulator.accept(project));
     return insertMainBranch(project);
   }
 
   public final ComponentDto insertMainBranch(ComponentDto project) {
-    BranchDto branchDto = newBranchDto(project, LONG);
+    BranchDto branchDto = ComponentTesting.newBranchDto(project, LONG);
     insertComponent(project);
     dbClient.branchDao().insert(dbSession, branchDto);
     db.commit();
@@ -269,8 +261,8 @@ public class ComponentDbTester {
 
   @SafeVarargs
   public final ComponentDto insertMainBranch(OrganizationDto organization, String mainBranchName, Consumer<ComponentDto>... dtoPopulators) {
-    ComponentDto project = newPrivateProjectDto(organization);
-    BranchDto branchDto = newBranchDto(project, LONG).setKey(mainBranchName);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(organization);
+    BranchDto branchDto = ComponentTesting.newBranchDto(project, LONG).setKey(mainBranchName);
     Arrays.stream(dtoPopulators).forEach(dtoPopulator -> dtoPopulator.accept(project));
     insertComponent(project);
     dbClient.branchDao().insert(dbSession, branchDto);
@@ -281,9 +273,9 @@ public class ComponentDbTester {
   @SafeVarargs
   public final ComponentDto insertProjectBranch(ComponentDto project, Consumer<BranchDto>... dtoPopulators) {
     // MainBranchProjectUuid will be null if it's a main branch
-    BranchDto branchDto = newBranchDto(firstNonNull(project.getMainBranchProjectUuid(), project.projectUuid()), LONG);
+    BranchDto branchDto = ComponentTesting.newBranchDto(firstNonNull(project.getMainBranchProjectUuid(), project.projectUuid()), LONG);
     Arrays.stream(dtoPopulators).forEach(dtoPopulator -> dtoPopulator.accept(branchDto));
-    ComponentDto branch = newProjectBranch(project, branchDto);
+    ComponentDto branch = ComponentTesting.newProjectBranch(project, branchDto);
     insertComponent(branch);
     dbClient.branchDao().insert(dbSession, branchDto);
     db.commit();
@@ -292,14 +284,14 @@ public class ComponentDbTester {
 
   @SafeVarargs
   public final ComponentDto insertProjectBranch(OrganizationDto organization, Consumer<BranchDto>... dtoPopulators) {
-    ComponentDto project = newPrivateProjectDto(organization);
+    ComponentDto project = ComponentTesting.newPrivateProjectDto(organization);
     return insertProjectBranch(project, dtoPopulators);
   }
 
   public final ComponentDto insertProjectBranch(ComponentDto project, BranchDto branchDto) {
     // MainBranchProjectUuid will be null if it's a main branch
     checkArgument(branchDto.getProjectUuid().equals(firstNonNull(project.getMainBranchProjectUuid(), project.projectUuid())));
-    ComponentDto branch = newProjectBranch(project, branchDto);
+    ComponentDto branch = ComponentTesting.newProjectBranch(project, branchDto);
     insertComponent(branch);
     dbClient.branchDao().insert(dbSession, branchDto);
     db.commit();

server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDbTester.java → server/sonar-db-dao/src/testFixtures/java/org/sonar/db/user/UserDbTester.java

@@ -61,24 +61,24 @@ public class UserDbTester {
   // USERS
 
   public UserDto insertUser() {
-    return insertUser(newUserDto());
+    return insertUser(UserTesting.newUserDto());
   }
 
   public UserDto insertUser(String login) {
-    UserDto dto = newUserDto().setLogin(login).setActive(true);
+    UserDto dto = UserTesting.newUserDto().setLogin(login).setActive(true);
     return insertUser(dto);
   }
 
   @SafeVarargs
   public final UserDto insertUser(Consumer<UserDto>... populators) {
-    UserDto dto = newUserDto().setActive(true);
+    UserDto dto = UserTesting.newUserDto().setActive(true);
     stream(populators).forEach(p -> p.accept(dto));
     return insertUser(dto);
   }
 
   @SafeVarargs
   public final UserDto insertDisabledUser(Consumer<UserDto>... populators) {
-    UserDto dto = newDisabledUser();
+    UserDto dto = UserTesting.newDisabledUser();
     stream(populators).forEach(p -> p.accept(dto));
     return insertUser(dto);
   }
@@ -121,7 +121,7 @@ public class UserDbTester {
 
   @SafeVarargs
   public final UserPropertyDto insertUserSetting(UserDto user, Consumer<UserPropertyDto>... populators) {
-    UserPropertyDto dto = newUserSettingDto(user);
+    UserPropertyDto dto = UserTesting.newUserSettingDto(user);
     stream(populators).forEach(p -> p.accept(dto));
     dbClient.userPropertiesDao().insertOrUpdate(db.getSession(), dto);
     db.commit();
@@ -131,7 +131,7 @@ public class UserDbTester {
   // GROUPS
 
   public GroupDto insertGroup(OrganizationDto organization, String name) {
-    GroupDto group = newGroupDto().setName(name).setOrganizationUuid(organization.getUuid());
+    GroupDto group = GroupTesting.newGroupDto().setName(name).setOrganizationUuid(organization.getUuid());
     return insertGroup(group);
   }
 
@@ -139,7 +139,7 @@ public class UserDbTester {
    * Create group in default organization
    */
   public GroupDto insertGroup() {
-    GroupDto group = newGroupDto().setOrganizationUuid(db.getDefaultOrganization().getUuid());
+    GroupDto group = GroupTesting.newGroupDto().setOrganizationUuid(db.getDefaultOrganization().getUuid());
     return insertGroup(group);
   }
 
@@ -147,7 +147,7 @@ public class UserDbTester {
    * Create group in specified organization
    */
   public GroupDto insertGroup(OrganizationDto organizationDto) {
-    GroupDto group = newGroupDto().setOrganizationUuid(organizationDto.getUuid());
+    GroupDto group = GroupTesting.newGroupDto().setOrganizationUuid(organizationDto.getUuid());
     return insertGroup(group);
   }
 
@@ -170,11 +170,11 @@ public class UserDbTester {
   }
 
   public GroupDto insertDefaultGroup(OrganizationDto organization, String name) {
-    return insertDefaultGroup(newGroupDto().setName(name).setOrganizationUuid(organization.getUuid()));
+    return insertDefaultGroup(GroupTesting.newGroupDto().setName(name).setOrganizationUuid(organization.getUuid()));
   }
 
   public GroupDto insertDefaultGroup(OrganizationDto organization) {
-    return insertDefaultGroup(newGroupDto().setOrganizationUuid(organization.getUuid()));
+    return insertDefaultGroup(GroupTesting.newGroupDto().setOrganizationUuid(organization.getUuid()));
   }
 
   @CheckForNull
@@ -368,7 +368,7 @@ public class UserDbTester {
 
   @SafeVarargs
   public final UserTokenDto insertToken(UserDto user, Consumer<UserTokenDto>... populators) {
-    UserTokenDto dto = newUserToken().setUserUuid(user.getUuid());
+    UserTokenDto dto = UserTokenTesting.newUserToken().setUserUuid(user.getUuid());
     stream(populators).forEach(p -> p.accept(dto));
     db.getDbClient().userTokenDao().insert(db.getSession(), dto);
     db.commit();

server/sonar-db-testing/build.gradle

@@ -9,5 +9,5 @@ dependencies {
 
   compile 'com.h2database:h2'
   compile testFixtures(project(':server:sonar-db-core'))
-  compile project(':server:sonar-db-dao').sourceSets.test.output
+  compile testFixtures(project(':server:sonar-db-dao'))
 }

server/sonar-webserver-api/build.gradle

@@ -21,7 +21,6 @@ dependencies {
   compile 'io.jsonwebtoken:jjwt-api'
   compile 'io.jsonwebtoken:jjwt-impl'
   compile project(':sonar-core')
-  compile project(':server:sonar-db-dao')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
   compile project(path: ':sonar-plugin-api', configuration: 'shadow')

server/sonar-webserver-auth/build.gradle

@@ -18,7 +18,6 @@ dependencies {
   compile 'io.jsonwebtoken:jjwt-api'
   compile 'io.jsonwebtoken:jjwt-impl'
   compile project(':sonar-core')
-  compile project(':server:sonar-db-dao')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
   compile project(':server:sonar-webserver-api')

server/sonar-webserver-core/build.gradle

@@ -39,7 +39,6 @@ dependencies {
   compile project(':server:sonar-ce-common')
   compile project(':server:sonar-ce-task')
   compile project(':server:sonar-ce-task-projectanalysis')
-  compile project(':server:sonar-db-dao')
   compile project(':server:sonar-db-migration')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')