diff --git a/.circleci/config.yml b/.circleci/config.yml index 132beccb7..6d36528fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,14 +13,20 @@ machine_ubuntu: &machine_ubuntu android_machine_ubuntu: &android_machine_ubuntu working_directory: ~/circleci-caver-java-android machine: - image: ubuntu-1604:201903-01 + image: android:202102-01 + +setup_android_test_files: &setup_android_test_files + run: + name: "Setup android instrumented test environment" + command: | + bash .circleci/setup_android_instrumented_test.sh pull_klaytn_image: &pull_klaytn_image run: name: "Pull and tag Klaytn image" command: | - docker pull klaytn/build_base:latest - docker image tag klaytn/build_base:latest klaytn + docker pull klaytn/build_base:latest + docker image tag klaytn/build_base:latest klaytn check_test_network: &check_test_network run: @@ -56,7 +62,15 @@ build_test: &build_test name: "Build and test" command: | ./gradlew clean - ./gradlew build --debug + ./gradlew build --debug -x :android_instrumented_test:build + +build_test_android: &build_test_android + run: + name: "Build and test" + command: | + ./gradlew clean + ./gradlew connectedAndroidTest + ./gradlew build --debug -x :android_instrumented_test:build -x test jobs: build: @@ -76,6 +90,8 @@ jobs: awk '/version '\''/' build.gradle fi - *build_test + - store_test_results: + path: core/build/test-results/test - persist_to_workspace: root: ~/ paths: @@ -85,6 +101,7 @@ jobs: <<: *android_machine_ubuntu steps: - checkout + - *setup_android_test_files - *pull_klaytn_image - *start_test_network - *check_test_network @@ -107,7 +124,30 @@ jobs: awk '/version '\''/' build.gradle awk '/ext.web3jVersion = '\''/' build.gradle - - *build_test + - run: + name: Create avd + command: | + SYSTEM_IMAGES="system-images;android-29;default;x86" + sdkmanager "$SYSTEM_IMAGES" + echo "no" | avdmanager --verbose create avd -n test -k "$SYSTEM_IMAGES" + - run: + name: Launch emulator + command: | + emulator -avd test -delay-adb -verbose -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim + background: true + - run: + name: Wait for emulator to start + command: | + circle-android wait-for-boot + - run: + name: Disable emulator animations + command: | + adb shell settings put global window_animation_scale 0.0 + adb shell settings put global transition_animation_scale 0.0 + adb shell settings put global animator_duration_scale 0.0 + - *build_test_android + - store_test_results: + path: android_instrumented_test/build/outputs/androidTest-results/connected - persist_to_workspace: root: ~/ paths: diff --git a/.circleci/setup_android_instrumented_test.sh b/.circleci/setup_android_instrumented_test.sh new file mode 100755 index 000000000..bb4cb0ae4 --- /dev/null +++ b/.circleci/setup_android_instrumented_test.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +PROJECT_DIR=~/circleci-caver-java-android + +CORE_DIR=$PROJECT_DIR/core +CORE_TEST_DIR=$PROJECT_DIR/core/src/test +CORE_TEST_CAVER_DIR=$CORE_TEST_DIR/java/com/klaytn/caver + +ANDROID_DIR=$PROJECT_DIR/android_instrumented_test +ANDROID_TEST_DIR=$ANDROID_DIR/src/androidTest +ANDROID_TEST_CAVER_DIR=$ANDROID_TEST_DIR/java/com/klaytn/caver/android_instrumented_test + +mkdir -p $ANDROID_TEST_CAVER_DIR + +## To do instrumented tests on Android Emulator, we use test files we already have at `core/src/test/java/com.klaytn.caver/*`. +# 1. Copy unit test files of core to re-use without re-writing same test-cases just for instrumented test. +cp -r $CORE_TEST_CAVER_DIR/base $ANDROID_TEST_CAVER_DIR/ +cp -r $CORE_TEST_CAVER_DIR/common $ANDROID_TEST_CAVER_DIR/ + +# 2. To make instrumented test works, we need to replace some contents. +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i 's/package com.klaytn.caver/package com.klaytn.caver.android_instrumented_test/g' +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i 's/import static com.klaytn.caver/import static com.klaytn.caver.android_instrumented_test/g' +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i 's/import com.klaytn.caver.base/import com.klaytn.caver.android_instrumented_test.base/g' +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i 's/Caver.DEFAULT_URL/"http:\/\/10.0.2.2:8551"/g' +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i 's/localhost/10.0.2.2/g' +## \ No newline at end of file diff --git a/.circleci/setup_android_instrumented_test_mac.sh b/.circleci/setup_android_instrumented_test_mac.sh new file mode 100755 index 000000000..805ef1596 --- /dev/null +++ b/.circleci/setup_android_instrumented_test_mac.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +PROJECT_DIR=/Users/denver.lee/klaytn/sdk-cell/github-aeharvlee/caver-java + +CORE_DIR=$PROJECT_DIR/core +CORE_TEST_DIR=$PROJECT_DIR/core/src/test +CORE_TEST_CAVER_DIR=$CORE_TEST_DIR/java/com/klaytn/caver + +ANDROID_DIR=$PROJECT_DIR/android_instrumented_test +ANDROID_TEST_DIR=$ANDROID_DIR/src/androidTest +ANDROID_TEST_CAVER_DIR=$ANDROID_TEST_DIR/java/com/klaytn/caver/android_instrumented_test + +mkdir -p $ANDROID_TEST_CAVER_DIR + +cp -r $CORE_TEST_CAVER_DIR/base $ANDROID_TEST_CAVER_DIR/ +cp -r $CORE_TEST_CAVER_DIR/common $ANDROID_TEST_CAVER_DIR/ + +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i '' 's/package com.klaytn.caver/package com.klaytn.caver.android_instrumented_test/g' +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i '' 's/import static com.klaytn.caver/import static com.klaytn.caver.android_instrumented_test/g' +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i '' 's/import com.klaytn.caver.base/import com.klaytn.caver.android_instrumented_test.base/g' +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i '' 's/Caver.DEFAULT_URL/"http:\/\/10.0.2.2:8551"/g' +find $ANDROID_TEST_CAVER_DIR -type f -name '*.java' | xargs sed -i '' 's/localhost/10.0.2.2/g' \ No newline at end of file diff --git a/.gitignore b/.gitignore index 65b76317a..1da9c4112 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,6 @@ .idea/**/gradle.xml .idea/**/libraries .gradle/ -gradle.properties # Output build @@ -71,3 +70,82 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser + +## Gitignores for Android Project +# Built application files +*.apk +*.aar +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +# Uncomment the following line in case you need and you don't have the release build type files in your app +# release/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +.idea/assetWizardSettings.xml +# Android Studio 3 in .gitignore file. +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild +.cxx/ + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ + +# Android Profiling +*.hprof +## diff --git a/android_instrumented_test/build.gradle b/android_instrumented_test/build.gradle new file mode 100644 index 000000000..d82019069 --- /dev/null +++ b/android_instrumented_test/build.gradle @@ -0,0 +1,46 @@ +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:4.1.3' + } + +} + +repositories { + google() + mavenCentral() + maven { url 'https://jitpack.io' } +} + +apply plugin: 'com.android.application' + +android { + compileSdkVersion 30 + buildToolsVersion "30.0.3" + + defaultConfig { + applicationId "com.klaytn.caver.android_instrumented_test" + minSdkVersion 24 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + compileOptions { + sourceCompatibility 1.8 + targetCompatibility 1.8 + } +} + +dependencies { + implementation project(':core') + androidTestImplementation "androidx.test.ext:junit:1.1.2" + androidTestImplementation "junit:junit:$project.junitVersion" + androidTestImplementation "androidx.test:runner:1.3.0" + androidTestImplementation "androidx.test:rules:1.3.0" +} diff --git a/android_instrumented_test/src/main/AndroidManifest.xml b/android_instrumented_test/src/main/AndroidManifest.xml new file mode 100644 index 000000000..3cac8e171 --- /dev/null +++ b/android_instrumented_test/src/main/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/build.gradle b/build.gradle index 84e982327..7ebfdba69 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext.javapoetVersion = '1.7.0' - ext.web3jVersion = '4.6.0' + ext.web3jVersion = '4.6.0-android' ext.picocliVersion = '3.0.0' ext.junitVersion = '4.12' ext.slf4jVersion = '1.7.25' @@ -22,13 +22,15 @@ apply plugin: 'io.codearte.nexus-staging' allprojects { - version '1.6.1' + version '1.6.1-android' group 'com.klaytn.caver' description 'caver-java project' sourceCompatibility = 1.8 targetCompatibility = 1.8 +} +configure(allprojects.findAll {it.name != 'android_instrumented_test'}) { apply plugin: 'java' repositories { @@ -47,7 +49,7 @@ allprojects { } } -configure(subprojects.findAll {it.name != 'integration-test' }) { +configure(subprojects.findAll {it.name != 'integration-test' && it.name != 'android_instrumented_test' }) { apply plugin: 'signing' apply plugin: 'maven-publish' diff --git a/core/src/test/java/com/klaytn/caver/common/abi/ABITest.java b/core/src/test/java/com/klaytn/caver/common/abi/ABITest.java index e644e0370..cf5f9821f 100644 --- a/core/src/test/java/com/klaytn/caver/common/abi/ABITest.java +++ b/core/src/test/java/com/klaytn/caver/common/abi/ABITest.java @@ -8,6 +8,8 @@ import com.klaytn.caver.contract.Contract; import com.klaytn.caver.contract.ContractIOType; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -19,6 +21,8 @@ import static org.junit.Assert.assertEquals; +@RunWith(Suite.class) +@Suite.SuiteClasses({ABITest.encodeFunctionSig.class, ABITest.encodeEventSig.class, ABITest.encodeFunctionCall.class, ABITest.decodeParameter.class, ABITest.decodeLog.class, ABITest.buildFunctionEventString.class}) public class ABITest { static Caver caver = new Caver(Caver.DEFAULT_URL); public static class encodeFunctionSig { diff --git a/core/src/test/java/com/klaytn/caver/common/account/AccountKeyTest.java b/core/src/test/java/com/klaytn/caver/common/account/AccountKeyTest.java index 30d4c2a24..e690c3b13 100644 --- a/core/src/test/java/com/klaytn/caver/common/account/AccountKeyTest.java +++ b/core/src/test/java/com/klaytn/caver/common/account/AccountKeyTest.java @@ -18,6 +18,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({AccountKeyTest.AccountKeyFailTests.class, AccountKeyTest.AccountKeyLegacyTest.class, AccountKeyTest.AccountKeyPublicTest.class, AccountKeyTest.AccountKeyWeightedMultiSigTest.class, AccountKeyTest.AccountKeyRoleBasedTest.class}) public class AccountKeyTest { public static class AccountKeyFailTests { diff --git a/core/src/test/java/com/klaytn/caver/common/contract/FeeDelegationWithContractTest.java b/core/src/test/java/com/klaytn/caver/common/contract/FeeDelegationWithContractTest.java index 27196f27e..bfa396a59 100644 --- a/core/src/test/java/com/klaytn/caver/common/contract/FeeDelegationWithContractTest.java +++ b/core/src/test/java/com/klaytn/caver/common/contract/FeeDelegationWithContractTest.java @@ -32,6 +32,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.protocol.exceptions.TransactionException; import java.io.IOException; @@ -43,6 +45,8 @@ import static com.klaytn.caver.base.Accounts.LUMAN; import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegationWithContractTest.deployAndSendBasicTransaction.class, FeeDelegationWithContractTest.deployAndSendFeeDelegatedTransaction.class, FeeDelegationWithContractTest.deployAndSendFeeDelegatedWithRatioTransaction.class, FeeDelegationWithContractTest.signBasicTransaction.class, FeeDelegationWithContractTest.signFeeDelegatedTransaction.class, FeeDelegationWithContractTest.signFeeDelegatedTransactionWitRatio.class, FeeDelegationWithContractTest.signAsFeePayerFeeDelegatedTransaction.class, FeeDelegationWithContractTest.FeeDelegationInDefaultSendOptions.class, FeeDelegationWithContractTest.FeePayerInDefaultSendOptions.class, FeeDelegationWithContractTest.FeeRatioInDefaultSendOptions.class}) public class FeeDelegationWithContractTest { public static String byteCodeWithoutConstructor = "608060405234801561001057600080fd5b5061051f806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063693ec85e1461003b578063e942b5161461016f575b600080fd5b6100f46004803603602081101561005157600080fd5b810190808035906020019064010000000081111561006e57600080fd5b82018360208201111561008057600080fd5b803590602001918460018302840111640100000000831117156100a257600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192905050506102c1565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610134578082015181840152602081019050610119565b50505050905090810190601f1680156101615780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6102bf6004803603604081101561018557600080fd5b81019080803590602001906401000000008111156101a257600080fd5b8201836020820111156101b457600080fd5b803590602001918460018302840111640100000000831117156101d657600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192908035906020019064010000000081111561023957600080fd5b82018360208201111561024b57600080fd5b8035906020019184600183028401116401000000008311171561026d57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505091929192905050506103cc565b005b60606000826040518082805190602001908083835b602083106102f957805182526020820191506020810190506020830392506102d6565b6001836020036101000a03801982511681845116808217855250505050505090500191505090815260200160405180910390208054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156103c05780601f10610395576101008083540402835291602001916103c0565b820191906000526020600020905b8154815290600101906020018083116103a357829003601f168201915b50505050509050919050565b806000836040518082805190602001908083835b6020831061040357805182526020820191506020810190506020830392506103e0565b6001836020036101000a0380198251168184511680821785525050505050509050019150509081526020016040518091039020908051906020019061044992919061044e565b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061048f57805160ff19168380011785556104bd565b828001600101855582156104bd579182015b828111156104bc5782518255916020019190600101906104a1565b5b5090506104ca91906104ce565b5090565b6104f091905b808211156104ec5760008160009055506001016104d4565b5090565b9056fea165627a7a723058203ffebc792829e0434ecc495da1b53d24399cd7fff506a4fd03589861843e14990029"; public static String abiWithoutConstructor = "[\n" + diff --git a/core/src/test/java/com/klaytn/caver/common/kct/kip17/KIP17Test.java b/core/src/test/java/com/klaytn/caver/common/kct/kip17/KIP17Test.java index 97584dff1..765874ac2 100644 --- a/core/src/test/java/com/klaytn/caver/common/kct/kip17/KIP17Test.java +++ b/core/src/test/java/com/klaytn/caver/common/kct/kip17/KIP17Test.java @@ -19,6 +19,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.protocol.exceptions.TransactionException; import java.io.IOException; @@ -30,6 +32,8 @@ import static com.klaytn.caver.base.Accounts.LUMAN; import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({KIP17Test.BurnableTest.class, KIP17Test.CommonTest.class, KIP17Test.DetectInterfaceTest.class, KIP17Test.EnumerableTest.class, KIP17Test.MintableTest.class, KIP17Test.PausableTest.class}) public class KIP17Test { public static KIP17 kip17Contract; public static final String CONTRACT_NAME = "NFT"; diff --git a/core/src/test/java/com/klaytn/caver/common/kct/kip37/KIP37Test.java b/core/src/test/java/com/klaytn/caver/common/kct/kip37/KIP37Test.java index a3a92f8db..8279cd754 100644 --- a/core/src/test/java/com/klaytn/caver/common/kct/kip37/KIP37Test.java +++ b/core/src/test/java/com/klaytn/caver/common/kct/kip37/KIP37Test.java @@ -32,6 +32,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.protocol.exceptions.TransactionException; import java.io.IOException; @@ -43,6 +45,8 @@ import static com.klaytn.caver.base.Accounts.*; import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({KIP37Test.ConstructorTest.class, KIP37Test.MintableTest.class, KIP37Test.PausableTest.class, KIP37Test.BurnableTest.class, KIP37Test.IKIP37Test.class, KIP37Test.DetectInterfaceTest.class, KIP37Test.UriTest.class}) public class KIP37Test { public static KIP37 kip37; private static final String tokenURI = "https://kip37.example/{id}.json"; diff --git a/core/src/test/java/com/klaytn/caver/common/kct/kip7/KIP7Test.java b/core/src/test/java/com/klaytn/caver/common/kct/kip7/KIP7Test.java index c3d502eca..db3840b1f 100644 --- a/core/src/test/java/com/klaytn/caver/common/kct/kip7/KIP7Test.java +++ b/core/src/test/java/com/klaytn/caver/common/kct/kip7/KIP7Test.java @@ -21,6 +21,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.protocol.exceptions.TransactionException; import org.web3j.utils.Numeric; @@ -32,6 +34,8 @@ import static com.klaytn.caver.base.Accounts.*; import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({KIP7Test.ConstructorTest.class, KIP7Test.PausableTest.class, KIP7Test.BurnableTest.class, KIP7Test.MintableTest.class, KIP7Test.CommonTest.class, KIP7Test.DetectInterfaceTest.class}) public class KIP7Test { public static KIP7 kip7contract; diff --git a/core/src/test/java/com/klaytn/caver/common/rpc/RpcTest.java b/core/src/test/java/com/klaytn/caver/common/rpc/RpcTest.java index 709734fcd..08eba6c54 100644 --- a/core/src/test/java/com/klaytn/caver/common/rpc/RpcTest.java +++ b/core/src/test/java/com/klaytn/caver/common/rpc/RpcTest.java @@ -26,6 +26,8 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.protocol.ObjectMapperFactory; import org.web3j.protocol.Web3jService; import org.web3j.protocol.core.DefaultBlockParameterName; @@ -50,6 +52,8 @@ import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({RpcTest.encodeAccountKeyTest.class, RpcTest.decodeAccountKeyTest.class, RpcTest.signTransactionTest.class, RpcTest.signTransactionAsFeePayerTest.class, RpcTest.sendTransactionAsFeePayerTest.class, RpcTest.getAccountKeyTest.class, RpcTest.otherRPCTest.class}) public class RpcTest extends Accounts { static Caver caver = new Caver(Caver.DEFAULT_URL); static Klay klay = caver.rpc.klay; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/AccountUpdateTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/AccountUpdateTest.java index ef45e7ddb..1bacba150 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/AccountUpdateTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/AccountUpdateTest.java @@ -14,6 +14,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -24,7 +26,8 @@ import static org.junit.Assert.*; - +@RunWith(Suite.class) +@Suite.SuiteClasses({AccountUpdateTest.createInstanceBuilder.class, AccountUpdateTest.createInstance.class, AccountUpdateTest.getRLPEncodingTest.class, AccountUpdateTest.signWithKeyTest.class, AccountUpdateTest.signWithKeysTest.class, AccountUpdateTest.appendSignaturesTest.class, AccountUpdateTest.combineSignatureTest.class, AccountUpdateTest.getRawTransactionTest.class, AccountUpdateTest.getTransactionHashTest.class, AccountUpdateTest.getSenderTxHashTest.class, AccountUpdateTest.getRLPEncodingForSignatureTest.class}) public class AccountUpdateTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/CancelTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/CancelTest.java index 0e2a41c43..90420b41f 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/CancelTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/CancelTest.java @@ -12,6 +12,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -22,6 +24,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({CancelTest.createInstanceBuilder.class, CancelTest.createInstance.class, CancelTest.getRLPEncodingTest.class, CancelTest.signWithKeyTest.class, CancelTest.signWithKeysTest.class, CancelTest.appendSignaturesTest.class, CancelTest.combineSignatureTest.class, CancelTest.getRawTransactionTest.class, CancelTest.getTransactionHashTest.class, CancelTest.getSenderTxHashTest.class, CancelTest.getRLPEncodingForSignatureTest.class}) public class CancelTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/ChainDataAnchoringTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/ChainDataAnchoringTest.java index 41a779e00..30c35b7dd 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/ChainDataAnchoringTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/ChainDataAnchoringTest.java @@ -12,6 +12,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -21,7 +23,8 @@ import static org.junit.Assert.*; - +@RunWith(Suite.class) +@Suite.SuiteClasses({ChainDataAnchoringTest.createInstanceBuilder.class, ChainDataAnchoringTest.createInstance.class, ChainDataAnchoringTest.getRLPEncodingTest.class, ChainDataAnchoringTest.signTest.class, ChainDataAnchoringTest.signWithKeysTest.class, ChainDataAnchoringTest.appendSignaturesTest.class, ChainDataAnchoringTest.combineSignatureTest.class, ChainDataAnchoringTest.getRawTransactionTest.class, ChainDataAnchoringTest.getTransactionHashTest.class, ChainDataAnchoringTest.getSenderTxHashTest.class, ChainDataAnchoringTest.getRLPEncodingForSignatureTest.class}) public class ChainDataAnchoringTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateTest.java index c04b60707..31e79fcf5 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateTest.java @@ -12,6 +12,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -22,6 +24,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedAccountUpdateTest.createInstanceBuilder.class, FeeDelegatedAccountUpdateTest.createInstance.class, FeeDelegatedAccountUpdateTest.getRLPEncodingTest.class, FeeDelegatedAccountUpdateTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedAccountUpdateTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedAccountUpdateTest.appendFeePayerSignaturesTest.class, FeeDelegatedAccountUpdateTest.combineSignatureTest.class, FeeDelegatedAccountUpdateTest.getRawTransactionTest.class, FeeDelegatedAccountUpdateTest.getTransactionHashTest.class, FeeDelegatedAccountUpdateTest.getSenderTxHashTest.class, FeeDelegatedAccountUpdateTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedAccountUpdateTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateWithRatioTest.java index d1a30534c..3edc356b8 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedAccountUpdateWithRatioTest.java @@ -12,6 +12,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -22,7 +24,8 @@ import static org.junit.Assert.*; - +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedAccountUpdateWithRatioTest.createInstanceBuilder.class, FeeDelegatedAccountUpdateWithRatioTest.createInstance.class, FeeDelegatedAccountUpdateWithRatioTest.getRLPEncodingTest.class, FeeDelegatedAccountUpdateWithRatioTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedAccountUpdateWithRatioTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedAccountUpdateWithRatioTest.appendFeePayerSignaturesTest.class, FeeDelegatedAccountUpdateWithRatioTest.combineSignatureTest.class, FeeDelegatedAccountUpdateWithRatioTest.getRawTransactionTest.class, FeeDelegatedAccountUpdateWithRatioTest.getTransactionHashTest.class, FeeDelegatedAccountUpdateWithRatioTest.getSenderTxHashTest.class, FeeDelegatedAccountUpdateWithRatioTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedAccountUpdateWithRatioTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelTest.java index 5529b604f..cbb862a38 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelTest.java @@ -11,6 +11,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -20,7 +22,8 @@ import static org.junit.Assert.*; - +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedCancelTest.createInstanceBuilder.class, FeeDelegatedCancelTest.createInstance.class, FeeDelegatedCancelTest.getRLPEncodingTest.class, FeeDelegatedCancelTest.signAsFeePayer_OneKeyTest.class}) public class FeeDelegatedCancelTest { static Caver caver = new Caver(Caver.DEFAULT_URL); static String senderPrivateKey = "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelWithRatioTest.java index dfa0e6fd6..4092e0487 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedCancelWithRatioTest.java @@ -10,6 +10,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -20,7 +22,8 @@ import static org.junit.Assert.*; - +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedCancelWithRatioTest.createInstanceBuilder.class, FeeDelegatedCancelWithRatioTest.createInstance.class, FeeDelegatedCancelWithRatioTest.getRLPEncodingTest.class, FeeDelegatedCancelWithRatioTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedCancelWithRatioTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedCancelWithRatioTest.appendFeePayerSignaturesTest.class, FeeDelegatedCancelWithRatioTest.combineSignatureTest.class, FeeDelegatedCancelWithRatioTest.getRawTransactionTest.class, FeeDelegatedCancelWithRatioTest.getTransactionHashTest.class, FeeDelegatedCancelWithRatioTest.getSenderTxHashTest.class, FeeDelegatedCancelWithRatioTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedCancelWithRatioTest { static Caver caver = new Caver(Caver.DEFAULT_URL); static String senderPrivateKey = "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringTest.java index 0d7291998..1974c5da8 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringTest.java @@ -10,6 +10,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -19,7 +21,8 @@ import static org.junit.Assert.*; - +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedChainDataAnchoringTest.createInstanceBuilder.class, FeeDelegatedChainDataAnchoringTest.createInstance.class, FeeDelegatedChainDataAnchoringTest.getRLPEncodingTest.class, FeeDelegatedChainDataAnchoringTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedChainDataAnchoringTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedChainDataAnchoringTest.appendFeePayerSignaturesTest.class, FeeDelegatedChainDataAnchoringTest.combineSignatureTest.class, FeeDelegatedChainDataAnchoringTest.getRawTransactionTest.class, FeeDelegatedChainDataAnchoringTest.getTransactionHashTest.class, FeeDelegatedChainDataAnchoringTest.getSenderTxHashTest.class, FeeDelegatedChainDataAnchoringTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedChainDataAnchoringTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringWithRatioTest.java index f959cefd8..f45d7fc7b 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedChainDataAnchoringWithRatioTest.java @@ -10,6 +10,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -20,6 +22,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedChainDataAnchoringWithRatioTest.createInstanceBuilder.class, FeeDelegatedChainDataAnchoringWithRatioTest.createInstance.class, FeeDelegatedChainDataAnchoringWithRatioTest.getRLPEncodingTest.class, FeeDelegatedChainDataAnchoringWithRatioTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedChainDataAnchoringWithRatioTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedChainDataAnchoringWithRatioTest.appendFeePayerSignaturesTest.class, FeeDelegatedChainDataAnchoringWithRatioTest.combineSignatureTest.class, FeeDelegatedChainDataAnchoringWithRatioTest.getRawTransactionTest.class, FeeDelegatedChainDataAnchoringWithRatioTest.getTransactionHashTest.class, FeeDelegatedChainDataAnchoringWithRatioTest.getSenderTxHashTest.class, FeeDelegatedChainDataAnchoringWithRatioTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedChainDataAnchoringWithRatioTest { static Caver caver = new Caver(Caver.DEFAULT_URL); static String senderPrivateKey = "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployTest.java index 3de467723..8096a1b15 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployTest.java @@ -11,6 +11,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -20,6 +22,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedSmartContractDeployTest.createInstanceBuilder.class, FeeDelegatedSmartContractDeployTest.createInstance.class, FeeDelegatedSmartContractDeployTest.getRLPEncodingTest.class, FeeDelegatedSmartContractDeployTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedSmartContractDeployTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedSmartContractDeployTest.appendFeePayerSignaturesTest.class, FeeDelegatedSmartContractDeployTest.combineSignatureTest.class, FeeDelegatedSmartContractDeployTest.getRawTransactionTest.class, FeeDelegatedSmartContractDeployTest.getTransactionHashTest.class, FeeDelegatedSmartContractDeployTest.getSenderTxHashTest.class, FeeDelegatedSmartContractDeployTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedSmartContractDeployTest { static Caver caver = new Caver(Caver.DEFAULT_URL); static String privateKey = "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployWithRatioTest.java index 6c317d3f5..a281f7105 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractDeployWithRatioTest.java @@ -11,6 +11,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -21,7 +23,8 @@ import static org.junit.Assert.*; - +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedSmartContractDeployWithRatioTest .createInstanceBuilder.class, FeeDelegatedSmartContractDeployWithRatioTest.createInstance.class, FeeDelegatedSmartContractDeployWithRatioTest.getRLPEncodingTest.class, FeeDelegatedSmartContractDeployWithRatioTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedSmartContractDeployWithRatioTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedSmartContractDeployWithRatioTest.appendFeePayerSignaturesTest.class, FeeDelegatedSmartContractDeployWithRatioTest.combineSignatureTest.class, FeeDelegatedSmartContractDeployWithRatioTest.getRawTransactionTest.class, FeeDelegatedSmartContractDeployWithRatioTest.getTransactionHashTest.class, FeeDelegatedSmartContractDeployWithRatioTest.getSenderTxHashTest.class, FeeDelegatedSmartContractDeployWithRatioTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedSmartContractDeployWithRatioTest { static Caver caver = new Caver(Caver.DEFAULT_URL); static String privateKey = "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionTest.java index 19fd3986a..4991e46a1 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionTest.java @@ -10,6 +10,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -19,6 +21,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedSmartContractExecutionTest.createInstanceBuilder.class, FeeDelegatedSmartContractExecutionTest.createInstance.class, FeeDelegatedSmartContractExecutionTest.getRLPEncodingTest.class, FeeDelegatedSmartContractExecutionTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedSmartContractExecutionTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedSmartContractExecutionTest.appendFeePayerSignaturesTest.class, FeeDelegatedSmartContractExecutionTest.combineSignatureTest.class, FeeDelegatedSmartContractExecutionTest.getRawTransactionTest.class, FeeDelegatedSmartContractExecutionTest.getTransactionHashTest.class, FeeDelegatedSmartContractExecutionTest.getSenderTxHashTest.class, FeeDelegatedSmartContractExecutionTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedSmartContractExecutionTest { static Caver caver = new Caver(Caver.DEFAULT_URL); static String privateKey = "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionWithRatioTest.java index d61315ff4..c78b19b5f 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedSmartContractExecutionWithRatioTest.java @@ -9,6 +9,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -19,7 +21,8 @@ import static org.junit.Assert.*; - +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedSmartContractExecutionWithRatioTest.createInstanceBuilder.class, FeeDelegatedSmartContractExecutionWithRatioTest.createInstance.class, FeeDelegatedSmartContractExecutionWithRatioTest.getRLPEncodingTest.class, FeeDelegatedSmartContractExecutionWithRatioTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedSmartContractExecutionWithRatioTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedSmartContractExecutionWithRatioTest.appendFeePayerSignaturesTest.class, FeeDelegatedSmartContractExecutionWithRatioTest.combineSignatureTest.class, FeeDelegatedSmartContractExecutionWithRatioTest.getRawTransactionTest.class, FeeDelegatedSmartContractExecutionWithRatioTest.getTransactionHashTest.class, FeeDelegatedSmartContractExecutionWithRatioTest.getSenderTxHashTest.class, FeeDelegatedSmartContractExecutionWithRatioTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedSmartContractExecutionWithRatioTest { static Caver caver = new Caver(Caver.DEFAULT_URL); static String privateKey = "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoTest.java index ac57f62d7..fadf261fc 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoTest.java @@ -10,6 +10,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -19,7 +21,8 @@ import static org.junit.Assert.*; - +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedValueTransferMemoTest.createInstanceBuilder.class, FeeDelegatedValueTransferMemoTest.createInstance.class, FeeDelegatedValueTransferMemoTest.getRLPEncodingTest.class, FeeDelegatedValueTransferMemoTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedValueTransferMemoTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedValueTransferMemoTest.appendFeePayerSignaturesTest.class, FeeDelegatedValueTransferMemoTest.combineSignatureTest.class, FeeDelegatedValueTransferMemoTest.getRawTransactionTest.class, FeeDelegatedValueTransferMemoTest.getTransactionHashTest.class, FeeDelegatedValueTransferMemoTest.getSenderTxHashTest.class, FeeDelegatedValueTransferMemoTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedValueTransferMemoTest { static Caver caver = new Caver(Caver.DEFAULT_URL); static String privateKey = "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoWithRatioTest.java index f67e1dd38..b99099171 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferMemoWithRatioTest.java @@ -10,6 +10,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -20,8 +22,9 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedValueTransferMemoWithRatioTest.createInstanceBuilder.class, FeeDelegatedValueTransferMemoWithRatioTest.createInstance.class, FeeDelegatedValueTransferMemoWithRatioTest.getRLPEncodingTest.class, FeeDelegatedValueTransferMemoWithRatioTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedValueTransferMemoWithRatioTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedValueTransferMemoWithRatioTest.appendFeePayerSignaturesTest.class, FeeDelegatedValueTransferMemoWithRatioTest.combineSignatureTest.class, FeeDelegatedValueTransferMemoWithRatioTest.getRawTransactionTest.class, FeeDelegatedValueTransferMemoWithRatioTest.getTransactionHashTest.class, FeeDelegatedValueTransferMemoWithRatioTest.getSenderTxHashTest.class, FeeDelegatedValueTransferMemoWithRatioTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedValueTransferMemoWithRatioTest { - static Caver caver = new Caver(Caver.DEFAULT_URL); static String privateKey = "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"; static String feePayerPrivateKey = "0xb9d5558443585bca6f225b935950e3f6e69f9da8a5809a83f51c3365dff53936"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferTest.java index 93b27b2b7..83bcc55d1 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferTest.java @@ -10,6 +10,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -19,6 +21,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedValueTransferTest.createInstanceBuilder.class, FeeDelegatedValueTransferTest.createInstance.class, FeeDelegatedValueTransferTest.getRLPEncodingTest.class, FeeDelegatedValueTransferTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedValueTransferTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedValueTransferTest.appendFeePayerSignaturesTest.class, FeeDelegatedValueTransferTest.combineSignatureTest.class, FeeDelegatedValueTransferTest.getRawTransactionTest.class, FeeDelegatedValueTransferTest.getTransactionHashTest.class, FeeDelegatedValueTransferTest.getSenderTxHashTest.class, FeeDelegatedValueTransferTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedValueTransferTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferWithRatioTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferWithRatioTest.java index b7d00d695..44e23fa18 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferWithRatioTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/FeeDelegatedValueTransferWithRatioTest.java @@ -10,6 +10,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -20,6 +22,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({FeeDelegatedValueTransferWithRatioTest.createInstanceBuilder.class, FeeDelegatedValueTransferWithRatioTest.createInstance.class, FeeDelegatedValueTransferWithRatioTest.getRLPEncodingTest.class, FeeDelegatedValueTransferWithRatioTest.signAsFeePayer_OneKeyTest.class, FeeDelegatedValueTransferWithRatioTest.signAsFeePayer_AllKeyTest.class, FeeDelegatedValueTransferWithRatioTest.appendFeePayerSignaturesTest.class, FeeDelegatedValueTransferWithRatioTest.combineSignatureTest.class, FeeDelegatedValueTransferWithRatioTest.getRawTransactionTest.class, FeeDelegatedValueTransferWithRatioTest.getTransactionHashTest.class, FeeDelegatedValueTransferWithRatioTest.getSenderTxHashTest.class, FeeDelegatedValueTransferWithRatioTest.getRLPEncodingForFeePayerSignatureTest.class}) public class FeeDelegatedValueTransferWithRatioTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/LegacyTransactionTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/LegacyTransactionTest.java index 6bff4d034..d8611a15b 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/LegacyTransactionTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/LegacyTransactionTest.java @@ -12,6 +12,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -23,6 +25,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +@RunWith(Suite.class) +@Suite.SuiteClasses({LegacyTransactionTest.createInstance.class, LegacyTransactionTest.createInstanceBuilder.class, LegacyTransactionTest.signWithKeyTest.class, LegacyTransactionTest.signWithKeysTest.class, LegacyTransactionTest.getRLPEncodingTest.class, LegacyTransactionTest.combineSignatureTest.class, LegacyTransactionTest.getRawTransactionTest.class, LegacyTransactionTest.getTransactionHashTest.class, LegacyTransactionTest.getSenderTxHashTest.class, LegacyTransactionTest.getRLPEncodingForSignatureTest.class, LegacyTransactionTest.appendSignaturesTest.class}) public class LegacyTransactionTest { public static class createInstance { diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/SmartContractDeployTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/SmartContractDeployTest.java index 6acffa396..52312d1aa 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/SmartContractDeployTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/SmartContractDeployTest.java @@ -13,6 +13,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -23,6 +25,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({SmartContractDeployTest.createInstanceBuilder.class, SmartContractDeployTest.createInstance.class, SmartContractDeployTest.getRLPEncodingTest.class, SmartContractDeployTest.signWithKeyTest.class, SmartContractDeployTest.signWithKeysTest.class, SmartContractDeployTest.appendSignaturesTest.class, SmartContractDeployTest.combineSignatureTest.class, SmartContractDeployTest.getRawTransactionTest.class, SmartContractDeployTest.getTransactionHashTest.class, SmartContractDeployTest.getSenderTxHashTest.class, SmartContractDeployTest.getRLPEncodingForSignatureTest.class}) public class SmartContractDeployTest { public static final String BYTECODE = "0x60806040526000805534801561001457600080fd5b506101ea806100246000396000f30060806040526004361061006d576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306661abd1461007257806342cbb15c1461009d578063767800de146100c8578063b22636271461011f578063d14e62b814610150575b600080fd5b34801561007e57600080fd5b5061008761017d565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b2610183565b6040518082815260200191505060405180910390f35b3480156100d457600080fd5b506100dd61018b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561012b57600080fd5b5061014e60048036038101908080356000191690602001909291905050506101b1565b005b34801561015c57600080fd5b5061017b600480360381019080803590602001909291905050506101b4565b005b60005481565b600043905090565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b50565b80600081905550505600a165627a7a7230582053c65686a3571c517e2cf4f741d842e5ee6aa665c96ce70f46f9a594794f11eb0029"; diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/SmartContractExecutionTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/SmartContractExecutionTest.java index c2658b43c..10fd2442e 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/SmartContractExecutionTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/SmartContractExecutionTest.java @@ -13,6 +13,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -22,6 +24,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({SmartContractExecutionTest.createInstanceBuilder.class, SmartContractExecutionTest.createInstance.class, SmartContractExecutionTest.getRLPEncodingTest.class, SmartContractExecutionTest.signWithKeyTest.class, SmartContractExecutionTest.signWithKeysTest.class, SmartContractExecutionTest.appendSignaturesTest.class, SmartContractExecutionTest.combineSignatureTest.class, SmartContractExecutionTest.getRawTransactionTest.class, SmartContractExecutionTest.getTransactionHashTest.class, SmartContractExecutionTest.getSenderTxHashTest.class, SmartContractExecutionTest.getRLPEncodingForSignatureTest.class}) public class SmartContractExecutionTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/ValueTransferMemoTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/ValueTransferMemoTest.java index 92dfbbce5..37e0e3899 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/ValueTransferMemoTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/ValueTransferMemoTest.java @@ -12,6 +12,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -22,6 +24,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({ValueTransferMemoTest.createInstanceBuilder.class, ValueTransferMemoTest.createInstance.class, ValueTransferMemoTest.getRLPEncodingTest.class, ValueTransferMemoTest.signWithKeyTest.class, ValueTransferMemoTest.signWithKeysTest.class, ValueTransferMemoTest.appendSignaturesTest.class, ValueTransferMemoTest.combineSignatureTest.class, ValueTransferMemoTest.getRawTransactionTest.class, ValueTransferMemoTest.getTransactionHashTest.class, ValueTransferMemoTest.getSenderTxHashTest.class, ValueTransferMemoTest.getRLPEncodingForSignatureTest.class}) public class ValueTransferMemoTest { static Caver caver = new Caver(Caver.DEFAULT_URL); diff --git a/core/src/test/java/com/klaytn/caver/common/transaction/ValueTransferTest.java b/core/src/test/java/com/klaytn/caver/common/transaction/ValueTransferTest.java index e67e7f1e6..b1dce4de9 100644 --- a/core/src/test/java/com/klaytn/caver/common/transaction/ValueTransferTest.java +++ b/core/src/test/java/com/klaytn/caver/common/transaction/ValueTransferTest.java @@ -11,6 +11,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.web3j.utils.Numeric; import java.io.IOException; @@ -21,6 +23,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({ValueTransferTest.createInstanceBuilder.class, ValueTransferTest.createInstance.class, ValueTransferTest.getRLPEncodingTest.class, ValueTransferTest.signWithKeyTest.class, ValueTransferTest.signWithKeysTest.class, ValueTransferTest.appendSignaturesTest.class, ValueTransferTest.combineSignatureTest.class, ValueTransferTest.getRawTransactionTest.class, ValueTransferTest.getTransactionHashTest.class, ValueTransferTest.getSenderTxHashTest.class, ValueTransferTest.getRLPEncodingForSignatureTest.class}) public class ValueTransferTest { public static AbstractKeyring generateRoleBaseKeyring(int[] numArr, String address) { diff --git a/core/src/test/java/com/klaytn/caver/common/utils/UtilsTest.java b/core/src/test/java/com/klaytn/caver/common/utils/UtilsTest.java index 24079fddf..7ad5b8ffd 100644 --- a/core/src/test/java/com/klaytn/caver/common/utils/UtilsTest.java +++ b/core/src/test/java/com/klaytn/caver/common/utils/UtilsTest.java @@ -7,12 +7,16 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import java.math.BigDecimal; import java.util.Arrays; import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({UtilsTest.isAddressTest.class, UtilsTest.isValidPrivateKeyTest.class, UtilsTest.isKlaytnWalletKeyTest.class, UtilsTest.isValidPublicKeyTest.class, UtilsTest.decompressPublicKeyTest.class, UtilsTest.compressedPublicKeyTest.class, UtilsTest.hashMessageTest.class, UtilsTest.parseKlaytnWalletKeyTest.class, UtilsTest.isHexTest.class, UtilsTest.isHexStrictTest.class, UtilsTest.addHexPrefixTest.class, UtilsTest.stripHexPrefixTest.class, UtilsTest.convertToPebTest.class, UtilsTest.convertFromPebTest.class, UtilsTest.isNumberTest.class, UtilsTest.isEmptySigTest.class, UtilsTest.generateRandomBytesTest.class}) public class UtilsTest { static Caver caver = new Caver(Caver.DEFAULT_URL); public static class isAddressTest { diff --git a/core/src/test/java/com/klaytn/caver/common/wallet/KeyringContainerTest.java b/core/src/test/java/com/klaytn/caver/common/wallet/KeyringContainerTest.java index dc20f6cbe..52f32084e 100644 --- a/core/src/test/java/com/klaytn/caver/common/wallet/KeyringContainerTest.java +++ b/core/src/test/java/com/klaytn/caver/common/wallet/KeyringContainerTest.java @@ -13,6 +13,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; import java.io.IOException; import java.util.Arrays; @@ -20,6 +22,8 @@ import static org.junit.Assert.*; +@RunWith(Suite.class) +@Suite.SuiteClasses({KeyringContainerTest.generateTest.class, KeyringContainerTest.newKeyringTest.class, KeyringContainerTest.getKeyringTest.class, KeyringContainerTest.addTest.class, KeyringContainerTest.removeTest.class, KeyringContainerTest.signMessageTest.class, KeyringContainerTest.signTest.class, KeyringContainerTest.signAsFeePayerTest.class}) public class KeyringContainerTest { static void validateSingleKeyring(AbstractKeyring actual, String expectAddress, String expectKey) { diff --git a/core/src/test/java/com/klaytn/caver/common/wallet/KeyringTest.java b/core/src/test/java/com/klaytn/caver/common/wallet/KeyringTest.java index d7493144b..45eb87543 100644 --- a/core/src/test/java/com/klaytn/caver/common/wallet/KeyringTest.java +++ b/core/src/test/java/com/klaytn/caver/common/wallet/KeyringTest.java @@ -19,7 +19,9 @@ import static org.junit.Assert.*; -public class KeyringTest { +@RunWith(Suite.class) +@Suite.SuiteClasses({KeyringTest.generateTest.class, KeyringTest.createFromPrivateKeyTest.class, KeyringTest.createFromKlaytnWalletKeyTest.class, KeyringTest.copyTest.class, KeyringTest.createWithSingleKeyTest.class, KeyringTest.createWithMultipleKeyTest.class, KeyringTest.createWithRoleBasedKeyTest.class, KeyringTest.copyTest.class, KeyringTest.signWithKeyTest.class, KeyringTest.signWithKeysTest.class, KeyringTest.signMessageTest.class, KeyringTest.recoverTest.class, KeyringTest.decryptTest.class, KeyringTest.encryptTest.class, KeyringTest.encryptV3Test.class, KeyringTest.getKeyByRoleTest.class, KeyringTest.getKlaytnWalletKeyTest.class, KeyringTest.getPublicKeyTest.class, KeyringTest.isDecoupledTest.class, KeyringTest.toAccountTest.class}) +class KeyringTest { public static void checkValidateSingleKey(SingleKeyring actualKeyring, String expectedAddress, String expectedPrivateKey) { assertTrue(Utils.isAddress(actualKeyring.getAddress())); diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..8e8129d37 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,15 @@ +## For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +#Wed May 26 17:07:02 KST 2021 +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 43e06337b..329035c53 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun May 19 17:33:00 KST 2019 +#Wed May 26 17:06:31 KST 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 939a6a958..ba68ce6ea 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,4 +2,5 @@ rootProject.name = 'caver-java' include 'codegen' include 'core' include 'console' +include 'android_instrumented_test' include 'integration-test'