Skip to content

Commit

Permalink
Issue #414: Set resources test dir for 'modules' and 'modules_core'
Browse files Browse the repository at this point in the history
EPL-1530: Add mockito dependency
  • Loading branch information
valeg-etendo committed May 31, 2024
1 parent 74cb4ad commit c9fa537
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pipelines/unittests/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pipeline {
GITHUB_TOKEN = credentials('github-read-package-token')
LANG = 'en_US.UTF-8'

ACCESS_TOKEN = credentials('access_token')
ACCESS_TOKEN = credentials('access_token_github')
EMAIL_ADDRESS = credentials('email_builds')

URL_REPO = 'https://github.com/etendosoftware/etendo_core'
Expand Down
5 changes: 3 additions & 2 deletions tests.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dependencies {
testImplementation 'org.spockframework:spock-core'
testImplementation 'org.spockframework:spock-junit4'
testImplementation 'junit:junit:4.13.1'
testImplementation 'org.mockito:mockito-core:3.2.4'
testImplementation( "com.athaydes:spock-reports:2.0-groovy-2.5" ) {
transitive = false // this avoids affecting your version of Groovy/Spock
}
Expand Down Expand Up @@ -47,6 +48,7 @@ sourceSets{
if(file('modules').exists() && file('modules').isDirectory()){
file('modules').eachDir {
sourceSets.test.java.srcDirs += it.toString()+"/src-test/src"
sourceSets.test.resources.srcDirs += it.toString()+"/src-test/resources"
sourceSets.test.java.outputDir = file("src-test/build/classes")
sourceSets.test.groovy.srcDirs += it.toString()+"/src-test/test/groovy"
sourceSets.test.groovy.outputDir = file("src-test/build/classes")
Expand All @@ -55,12 +57,11 @@ if(file('modules').exists() && file('modules').isDirectory()){
if(file('modules_core').exists() && file('modules_core').isDirectory()){
file('modules_core').eachDir {
sourceSets.test.java.srcDirs += it.toString()+"/src-test"
sourceSets.test.resources.srcDirs += it.toString()+"/src-test/resources"
sourceSets.test.java.outputDir = file("src-test/build/classes")
}
}

test.dependsOn('ant.compile.test')

task depsTest {
doLast {
configurations.compileClasspath.getFiles().each { file ->
Expand Down

0 comments on commit c9fa537

Please sign in to comment.