Parcourir la source

use testFixtures instead of test configuration of db-core

tags/8.0
Sébastien Lesaint il y a 4 ans
Parent
révision
b789401479

+ 0
- 1
server/sonar-ce-task-projectanalysis/build.gradle Voir le fichier

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

+ 0
- 1
server/sonar-ce/build.gradle Voir le fichier

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

+ 5
- 14
server/sonar-db-core/build.gradle Voir le fichier

@@ -28,8 +28,6 @@ dependencies {
testCompile 'com.microsoft.sqlserver:mssql-jdbc'
testCompile 'com.oracle.jdbc:ojdbc8'
testCompile 'com.tngtech.java:junit-dataprovider'
testCompile 'junit:junit'
testCompile 'org.assertj:assertj-core'
testCompile 'org.mockito:mockito-core'
testCompile 'org.postgresql:postgresql'
testCompile project(':sonar-testing-harness')
@@ -38,6 +36,11 @@ dependencies {
testRuntime 'com.microsoft.sqlserver:mssql-jdbc'
testRuntime 'com.oracle.jdbc:ojdbc8'
testRuntime 'org.postgresql:postgresql'

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

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

test {
@@ -45,17 +48,6 @@ test {
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

// Used by core plugins
@@ -66,7 +58,6 @@ publishing {
if (release) {
artifact sourcesJar
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 Voir le fichier


server/sonar-db-core/src/test/java/org/sonar/db/CoreDbTester.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/CoreDbTester.java Voir le fichier


server/sonar-db-core/src/test/java/org/sonar/db/CoreH2Database.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/CoreH2Database.java Voir le fichier


server/sonar-db-core/src/test/java/org/sonar/db/CoreTestDb.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/CoreTestDb.java Voir le fichier


server/sonar-db-core/src/test/java/org/sonar/db/DefaultOrganizationTesting.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/DefaultOrganizationTesting.java Voir le fichier


server/sonar-db-core/src/test/java/org/sonar/db/TestDb.java → server/sonar-db-core/src/testFixtures/java/org/sonar/db/TestDb.java Voir le fichier


+ 1
- 1
server/sonar-db-dao/build.gradle Voir le fichier

@@ -30,7 +30,7 @@ dependencies {
testCompile 'org.mockito:mockito-core'
testCompile 'org.sonarsource.orchestrator:sonar-orchestrator'
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')

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

+ 1
- 1
server/sonar-db-migration/build.gradle Voir le fichier

@@ -27,7 +27,7 @@ dependencies {
testCompile 'org.mockito:mockito-core'
testCompile project(':sonar-scanner-protocol')
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.microsoft.sqlserver:mssql-jdbc'

+ 1
- 1
server/sonar-db-testing/build.gradle Voir le fichier

@@ -8,6 +8,6 @@ dependencies {
// please keep the list grouped by configuration and ordered by name

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
}

Chargement…
Annuler
Enregistrer