Skip to content

Commit

Permalink
Update Mockito for running tests on Mac M1 (#7208)
Browse files Browse the repository at this point in the history
* Update Mockito for running tests on Mac M1

* Added comments for JNA library dependency
  • Loading branch information
h7kanna authored Oct 20, 2021
1 parent e821919 commit 67b01e7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
6 changes: 6 additions & 0 deletions airbyte-db/jooq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ dependencies {
// jOOQ code generation
implementation 'org.jooq:jooq-codegen:3.13.4'
implementation "org.testcontainers:postgresql:1.15.3"
// These are required because gradle might be using lower version of Jna from other
// library transitive dependency. Can be removed if we can figure out which library is the cause.
// Refer: https://github.com/testcontainers/testcontainers-java/issues/3834#issuecomment-825409079
implementation 'net.java.dev.jna:jna:5.8.0'
implementation 'net.java.dev.jna:jna-platform:5.8.0'

// The jOOQ code generator only has access to classes added to the jooqGenerator configuration
jooqGenerator project(':airbyte-db:lib')
}
Expand Down
6 changes: 6 additions & 0 deletions airbyte-db/lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ dependencies {
implementation project(':airbyte-json-validation')
implementation "org.flywaydb:flyway-core:7.14.0"
implementation "org.testcontainers:postgresql:1.15.3"
// These are required because gradle might be using lower version of Jna from other
// library transitive dependency. Can be removed if we can figure out which library is the cause.
// Refer: https://github.com/testcontainers/testcontainers-java/issues/3834#issuecomment-825409079
implementation 'net.java.dev.jna:jna:5.8.0'
implementation 'net.java.dev.jna:jna-platform:5.8.0'


testImplementation project(':airbyte-test-utils')
testImplementation 'org.apache.commons:commons-lang3:3.11'
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,10 @@ subprojects {
implementation 'software.amazon.awssdk:s3:2.16.84'


testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.1'
testImplementation 'org.mockito:mockito-junit-jupiter:3.9.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
testImplementation 'org.assertj:assertj-core:3.21.0'
}

Expand Down

0 comments on commit 67b01e7

Please sign in to comment.