From 9131c37d8ed8aeb2bdbceea85242854e0e925e4d Mon Sep 17 00:00:00 2001
From: Sudarsan Balaji <sudarsan.balaji@artfuldev.com>
Date: Sat, 6 Nov 2021 05:26:56 +0530
Subject: [PATCH] Re-add test fixtures

---
 bindings/bdk-kotlin/android/build.gradle      | 24 +++++++++----------
 .../org/bitcoindevkit/AndroidLibTest.kt       | 16 ++++++-------
 bindings/bdk-kotlin/jvm/build.gradle          |  8 +++----
 .../kotlin/org/bitcoindevkit/JvmLibTest.kt    | 18 +++++++-------
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/bindings/bdk-kotlin/android/build.gradle b/bindings/bdk-kotlin/android/build.gradle
index a77b20c..d4f9d19 100644
--- a/bindings/bdk-kotlin/android/build.gradle
+++ b/bindings/bdk-kotlin/android/build.gradle
@@ -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'
diff --git a/bindings/bdk-kotlin/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt b/bindings/bdk-kotlin/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
index 7021eb6..0905ae0 100644
--- a/bindings/bdk-kotlin/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
+++ b/bindings/bdk-kotlin/android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
@@ -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()
+   }
+
+}
diff --git a/bindings/bdk-kotlin/jvm/build.gradle b/bindings/bdk-kotlin/jvm/build.gradle
index 3a49979..036e7fb 100644
--- a/bindings/bdk-kotlin/jvm/build.gradle
+++ b/bindings/bdk-kotlin/jvm/build.gradle
@@ -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 {
diff --git a/bindings/bdk-kotlin/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt b/bindings/bdk-kotlin/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
index 7a0a317..76db175 100644
--- a/bindings/bdk-kotlin/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
+++ b/bindings/bdk-kotlin/jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
@@ -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()
+   }
+
+}