From e9f00dcb750190e4d7f56b0e01e975f9e339a767 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Mon, 18 Oct 2021 13:53:05 -0700 Subject: [PATCH] Move bdk-kotlin test-fixtures tests to jvm module --- bindings/bdk-kotlin/android/build.gradle | 4 +- bindings/bdk-kotlin/jvm/build.gradle | 42 +++++++++---------- .../kotlin/org/bitcoindevkit/bdk/LibTest.kt | 24 +++++++++-- bindings/bdk-kotlin/settings.gradle | 2 +- .../bdk-kotlin/test-fixtures/build.gradle | 18 -------- 5 files changed, 45 insertions(+), 45 deletions(-) rename bindings/bdk-kotlin/{test-fixtures/src/main => jvm/src/testFixtures}/kotlin/org/bitcoindevkit/bdk/LibTest.kt (80%) delete mode 100644 bindings/bdk-kotlin/test-fixtures/build.gradle diff --git a/bindings/bdk-kotlin/android/build.gradle b/bindings/bdk-kotlin/android/build.gradle index f3bcdc8..f06c838 100644 --- a/bindings/bdk-kotlin/android/build.gradle +++ b/bindings/bdk-kotlin/android/build.gradle @@ -62,8 +62,10 @@ dependencies { api "org.slf4j:slf4j-api:1.7.30" androidTestImplementation 'com.github.tony19:logback-android:2.0.0' - androidTestImplementation(project(':test-fixtures')) { + 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' } androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/bindings/bdk-kotlin/jvm/build.gradle b/bindings/bdk-kotlin/jvm/build.gradle index 58eefc8..ea9408a 100644 --- a/bindings/bdk-kotlin/jvm/build.gradle +++ b/bindings/bdk-kotlin/jvm/build.gradle @@ -1,7 +1,8 @@ plugins { - id 'org.jetbrains.kotlin.jvm' - id 'java-library' - id 'maven-publish' + id 'org.jetbrains.kotlin.jvm' + id 'java-library' + id 'java-test-fixtures' + id 'maven-publish' } java { @@ -10,30 +11,29 @@ java { } test { - testLogging { - events "PASSED", "SKIPPED", "FAILED", "STANDARD_OUT", "STANDARD_ERROR" - } + testLogging { + events "PASSED", "SKIPPED", "FAILED", "STANDARD_OUT", "STANDARD_ERROR" + } } dependencies { - implementation platform('org.jetbrains.kotlin:kotlin-bom') - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "net.java.dev.jna:jna:5.8.0" - implementation "junit:junit:4.13.2" - api "org.slf4j:slf4j-api:1.7.30" - testImplementation "ch.qos.logback:logback-classic:1.2.3" - testImplementation "ch.qos.logback:logback-core:1.2.3" - testImplementation(project(':test-fixtures')) + implementation platform('org.jetbrains.kotlin:kotlin-bom') + 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" } publishing { - publications { - maven(MavenPublication) { - groupId = 'org.bitcoindevkit' - artifactId = 'bdk' - version = '0.0.1-SNAPSHOT' + publications { + maven(MavenPublication) { + groupId = 'org.bitcoindevkit' + artifactId = 'bdk' + version = '0.0.1-SNAPSHOT' - from components.java + from components.java + } } - } } diff --git a/bindings/bdk-kotlin/test-fixtures/src/main/kotlin/org/bitcoindevkit/bdk/LibTest.kt b/bindings/bdk-kotlin/jvm/src/testFixtures/kotlin/org/bitcoindevkit/bdk/LibTest.kt similarity index 80% rename from bindings/bdk-kotlin/test-fixtures/src/main/kotlin/org/bitcoindevkit/bdk/LibTest.kt rename to bindings/bdk-kotlin/jvm/src/testFixtures/kotlin/org/bitcoindevkit/bdk/LibTest.kt index 1ac682f..8b946b4 100644 --- a/bindings/bdk-kotlin/test-fixtures/src/main/kotlin/org/bitcoindevkit/bdk/LibTest.kt +++ b/bindings/bdk-kotlin/jvm/src/testFixtures/kotlin/org/bitcoindevkit/bdk/LibTest.kt @@ -32,7 +32,7 @@ abstract class LibTest { assertEquals(address, "bcrt1qzg4mckdh50nwdm9hkzq06528rsu73hjxytqkxs") } - @Test(expected= BdkException.Descriptor::class) + @Test(expected = BdkException.Descriptor::class) fun invalidDescriptorExceptionIsThrown() { val config = DatabaseConfig.Memory("") OfflineWallet("invalid-descriptor", Network.REGTEST, config) @@ -52,14 +52,22 @@ abstract class LibTest { @Test fun onlineWalletInMemory() { val db = DatabaseConfig.Memory("") - val client = BlockchainConfig.Electrum(ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5u, null, 100u)) + val client = BlockchainConfig.Electrum( + ElectrumConfig( + "ssl://electrum.blockstream.info:60002", + null, + 5u, + null, + 100u + ) + ) val wallet = OnlineWallet(desc, Network.TESTNET, db, client) assertNotNull(wallet) val network = wallet.getNetwork() assertEquals(network, Network.TESTNET) } - class LogProgress: BdkProgress { + class LogProgress : BdkProgress { val log: Logger = LoggerFactory.getLogger(LibTest::class.java) override fun update(progress: Float, message: String?) { @@ -70,7 +78,15 @@ abstract class LibTest { @Test fun onlineWalletSyncGetBalance() { val db = DatabaseConfig.Memory("") - val client = BlockchainConfig.Electrum(ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5u, null, 100u)) + val client = BlockchainConfig.Electrum( + ElectrumConfig( + "ssl://electrum.blockstream.info:60002", + null, + 5u, + null, + 100u + ) + ) val wallet = OnlineWallet(desc, Network.TESTNET, db, client) wallet.sync(LogProgress(), null) val balance = wallet.getBalance() diff --git a/bindings/bdk-kotlin/settings.gradle b/bindings/bdk-kotlin/settings.gradle index 4c3c912..9d76d9e 100644 --- a/bindings/bdk-kotlin/settings.gradle +++ b/bindings/bdk-kotlin/settings.gradle @@ -1,4 +1,4 @@ rootProject.name = 'bdk-kotlin' -include ':jvm',':demo',':test-fixtures',':android' +include ':jvm',':demo',':android' diff --git a/bindings/bdk-kotlin/test-fixtures/build.gradle b/bindings/bdk-kotlin/test-fixtures/build.gradle deleted file mode 100644 index 44f2c40..0000000 --- a/bindings/bdk-kotlin/test-fixtures/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' - id 'java-library' -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -dependencies { - implementation platform('org.jetbrains.kotlin:kotlin-bom') - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - - implementation(project(':jvm')) - implementation "junit:junit:4.13.2" - api "org.slf4j:slf4j-api:1.7.30" -}