Browse Source

use testFixtures instead of test configuration of db-core

tags/8.0
Sébastien Lesaint 4 years ago
parent
commit
b789401479

+ 0
- 1
server/sonar-ce-task-projectanalysis/build.gradle View File

compile project(':sonar-core') compile project(':sonar-core')
compile project(':server:sonar-ce-task') compile project(':server:sonar-ce-task')
compile project(':server:sonar-db-core')
compile project(':server:sonar-db-dao') compile project(':server:sonar-db-dao')
compile project(':server:sonar-db-migration') compile project(':server:sonar-db-migration')
compile project(':server:sonar-process') compile project(':server:sonar-process')

+ 0
- 1
server/sonar-ce/build.gradle View File

compile project(':server:sonar-ce-task') compile project(':server:sonar-ce-task')
compile project(':server:sonar-ce-task-projectanalysis') compile project(':server:sonar-ce-task-projectanalysis')
compile project(':server:sonar-db-dao') compile project(':server:sonar-db-dao')
compile project(':server:sonar-db-core')
compile project(':server:sonar-process') compile project(':server:sonar-process')
compile project(':server:sonar-ce-task') compile project(':server:sonar-ce-task')
compile project(':server:sonar-server-common') compile project(':server:sonar-server-common')

+ 5
- 14
server/sonar-db-core/build.gradle View File

testCompile 'com.microsoft.sqlserver:mssql-jdbc' testCompile 'com.microsoft.sqlserver:mssql-jdbc'
testCompile 'com.oracle.jdbc:ojdbc8' testCompile 'com.oracle.jdbc:ojdbc8'
testCompile 'com.tngtech.java:junit-dataprovider' testCompile 'com.tngtech.java:junit-dataprovider'
testCompile 'junit:junit'
testCompile 'org.assertj:assertj-core'
testCompile 'org.mockito:mockito-core' testCompile 'org.mockito:mockito-core'
testCompile 'org.postgresql:postgresql' testCompile 'org.postgresql:postgresql'
testCompile project(':sonar-testing-harness') testCompile project(':sonar-testing-harness')
testRuntime 'com.microsoft.sqlserver:mssql-jdbc' testRuntime 'com.microsoft.sqlserver:mssql-jdbc'
testRuntime 'com.oracle.jdbc:ojdbc8' testRuntime 'com.oracle.jdbc:ojdbc8'
testRuntime 'org.postgresql:postgresql' testRuntime 'org.postgresql:postgresql'

testFixturesApi 'junit:junit'
testFixturesApi 'org.assertj:assertj-core'

testFixturesCompileOnly 'com.google.code.findbugs:jsr305'
} }


test { test {
systemProperty 'orchestrator.configUrl', System.getProperty('orchestrator.configUrl') systemProperty 'orchestrator.configUrl', System.getProperty('orchestrator.configUrl')
} }


task testJar(type: Jar) {
classifier = 'tests'
from sourceSets.test.output
}

configurations { tests { extendsFrom testRuntime } }

artifacts {
tests testJar
}

artifactoryPublish.skip = false artifactoryPublish.skip = false


// Used by core plugins // Used by core plugins
if (release) { if (release) {
artifact sourcesJar artifact sourcesJar
artifact javadocJar artifact javadocJar
artifact testJar
} }
} }
} }

server/sonar-db-core/src/test/java/org/sonar/db/AbstractDbTester.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/AbstractDbTester.java View File


server/sonar-db-core/src/test/java/org/sonar/db/CoreDbTester.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/CoreDbTester.java View File


server/sonar-db-core/src/test/java/org/sonar/db/CoreH2Database.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/CoreH2Database.java View File


server/sonar-db-core/src/test/java/org/sonar/db/CoreTestDb.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/CoreTestDb.java View File


server/sonar-db-core/src/test/java/org/sonar/db/DefaultOrganizationTesting.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/DefaultOrganizationTesting.java View File


server/sonar-db-core/src/test/java/org/sonar/db/TestDb.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/TestDb.java View File


+ 1
- 1
server/sonar-db-dao/build.gradle View File

testCompile 'org.mockito:mockito-core' testCompile 'org.mockito:mockito-core'
testCompile 'org.sonarsource.orchestrator:sonar-orchestrator' testCompile 'org.sonarsource.orchestrator:sonar-orchestrator'
testCompile project(':sonar-testing-harness') testCompile project(':sonar-testing-harness')
testCompile project(':server:sonar-db-core').sourceSets.test.output
testCompile testFixtures(project(':server:sonar-db-core'))
testCompile project(':sonar-plugin-api-impl') testCompile project(':sonar-plugin-api-impl')


testCompileOnly 'com.google.code.findbugs:jsr305' testCompileOnly 'com.google.code.findbugs:jsr305'

+ 1
- 1
server/sonar-db-migration/build.gradle View File

testCompile 'org.mockito:mockito-core' testCompile 'org.mockito:mockito-core'
testCompile project(':sonar-scanner-protocol') testCompile project(':sonar-scanner-protocol')
testCompile project(':sonar-testing-harness') testCompile project(':sonar-testing-harness')
testCompile project(':server:sonar-db-core').sourceSets.test.output
testCompile testFixtures(project(':server:sonar-db-core'))


testRuntime 'com.h2database:h2' testRuntime 'com.h2database:h2'
testRuntime 'com.microsoft.sqlserver:mssql-jdbc' testRuntime 'com.microsoft.sqlserver:mssql-jdbc'

+ 1
- 1
server/sonar-db-testing/build.gradle View File

// please keep the list grouped by configuration and ordered by name // please keep the list grouped by configuration and ordered by name


compile 'com.h2database:h2' compile 'com.h2database:h2'
compile project(':server:sonar-db-core').sourceSets.test.output
compile testFixtures(project(':server:sonar-db-core'))
compile project(':server:sonar-db-dao').sourceSets.test.output compile project(':server:sonar-db-dao').sourceSets.test.output
} }

Loading…
Cancel
Save