Re-add test fixtures

This commit is contained in:
Sudarsan Balaji 2021-11-06 05:26:56 +05:30 committed by Steve Myers
parent 597d0685ae
commit 9131c37d8e
4 changed files with 33 additions and 33 deletions

View File

@ -25,12 +25,12 @@ android {
}
dependencies {
// implementation(project(':jvm')) {
// exclude group: 'net.java.dev.jna', module: 'jna'
// }
// api(project(':jvm')) {
// exclude group: 'net.java.dev.jna', module: 'jna'
// }
implementation(project(':jvm')) {
exclude group: 'net.java.dev.jna', module: 'jna'
}
api(project(':jvm')) {
exclude group: 'net.java.dev.jna', module: 'jna'
}
implementation 'net.java.dev.jna:jna:5.8.0@aar'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.3.0'
@ -38,12 +38,12 @@ dependencies {
api "org.slf4j:slf4j-api:1.7.30"
androidTestImplementation 'com.github.tony19:logback-android:2.0.0'
// androidTestImplementation(testFixtures(project(':jvm'))) {
// exclude group: 'net.java.dev.jna', module: 'jna'
// exclude group: 'ch.qos.logback', module: 'logback-core'
// exclude group: 'ch.qos.logback', module: 'logback-classic'
// exclude group: 'junit', module: 'junit'
// }
androidTestImplementation(testFixtures(project(':jvm'))) {
exclude group: 'net.java.dev.jna', module: 'jna'
exclude group: 'ch.qos.logback', module: 'logback-core'
exclude group: 'ch.qos.logback', module: 'logback-classic'
exclude group: 'junit', module: 'junit'
}
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'

View File

@ -11,11 +11,11 @@ import org.junit.runner.RunWith
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
//@RunWith(AndroidJUnit4::class)
//class AndroidLibTest : LibTest() {
// override fun getTestDataDir(): String {
// val context = ApplicationProvider.getApplicationContext<Application>()
// return context.getDir("bdk-test", MODE_PRIVATE).toString()
// }
//
//}
@RunWith(AndroidJUnit4::class)
class AndroidLibTest : LibTest() {
override fun getTestDataDir(): String {
val context = ApplicationProvider.getApplicationContext<Application>()
return context.getDir("bdk-test", MODE_PRIVATE).toString()
}
}

View File

@ -1,7 +1,7 @@
plugins {
id 'org.jetbrains.kotlin.jvm'
id 'java-library'
//id 'java-test-fixtures'
id 'java-test-fixtures'
id 'maven-publish'
id 'signing'
}
@ -25,9 +25,9 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "net.java.dev.jna:jna:5.8.0"
api "org.slf4j:slf4j-api:1.7.30"
// testFixturesImplementation "junit:junit:4.13.2"
// testFixturesImplementation "ch.qos.logback:logback-classic:1.2.3"
// testFixturesImplementation "ch.qos.logback:logback-core:1.2.3"
testFixturesImplementation "junit:junit:4.13.2"
testFixturesImplementation "ch.qos.logback:logback-classic:1.2.3"
testFixturesImplementation "ch.qos.logback:logback-core:1.2.3"
}
afterEvaluate {

View File

@ -1,16 +1,16 @@
package org.bitcoindevkit
//import java.nio.file.Files
import java.nio.file.Files
/**
* Library test, which will execute on linux host.
*
*/
//class JvmLibTest : LibTest() {
//
// override fun getTestDataDir(): String {
// return Files.createTempDirectory("bdk-test").toString()
// //return Paths.get(System.getProperty("java.io.tmpdir"), "bdk-test").toString()
// }
//
//}
class JvmLibTest : LibTest() {
override fun getTestDataDir(): String {
return Files.createTempDirectory("bdk-test").toString()
//return Paths.get(System.getProperty("java.io.tmpdir"), "bdk-test").toString()
}
}