status-im
/
status-keycard
mirror of https://github.com/status-im/status-keycard.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove deprecated junit plugin

This commit is contained in:
Michele Balistreri 2019-09-02 12:33:10 +03:00
parent 08be5158da
commit 5e0bcc8bbb
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.gradle
View File

@ -1,5 +1,4 @@
apply plugin: 'javacard'
apply plugin: 'org.junit.platform.gradle.plugin'
buildscript {
repositories {
@ -10,7 +9,6 @@ buildscript {
dependencies {
classpath 'com.fidesmo:gradle-javacard:0.2.7'
classpath 'org.junit.platform:junit-platform-gradle-plugin:1.1.1'
classpath 'com.github.status-im.status-keycard-java:desktop:2.0.0'
}
}
@ -57,17 +55,15 @@ dependencies {
testCompile(files("../jcardsim/jcardsim-3.0.5-SNAPSHOT.jar"))
testCompile('org.web3j:core:2.3.1')
testCompile('org.bitcoinj:bitcoinj-core:0.14.5')
testCompile('com.github.status-im.status-keycard-java:desktop:239505b')
testCompile('com.github.status-im.status-keycard-java:desktop:b50c12c')
testCompile('org.bouncycastle:bcprov-jdk15on:1.60')
testCompile("org.junit.jupiter:junit-jupiter-api:5.1.1")
testRuntime("org.junit.jupiter:junit-jupiter-engine:5.1.1")
}
junitPlatform {
filters {
tags {
exclude 'manual'
}
test {
useJUnitPlatform {
excludeTags 'manual'
}
}
@ -99,6 +95,6 @@ afterEvaluate {
jvmArgs.push('-noverify')
}
def junitPlatformTestTask = tasks.getByName('junitPlatformTest')
def junitPlatformTestTask = tasks.getByName('test')
junitPlatformTestTask.jvmArgs(jvmArgs)
}

2
buildSrc/build.gradle
View File

@ -4,5 +4,5 @@ repositories {
}
dependencies {
compile 'com.github.status-im.status-keycard-java:desktop:239505b'
compile 'com.github.status-im.status-keycard-java:desktop:b50c12c'
}

4
src/test/java/im/status/keycard/KeycardTest.java
View File

@ -179,7 +179,7 @@ public class KeycardTest {
private static void initIfNeeded() throws Exception {
KeycardCommandSet cmdSet = new KeycardCommandSet(sdkChannel);
byte[] data = cmdSet.select().checkOK().getData();
cmdSet.select().checkOK();
initCapabilities(cmdSet.getApplicationInfo());
@ -187,6 +187,8 @@ public class KeycardTest {
if (!cmdSet.getApplicationInfo().isInitializedCard()) {
assertEquals(0x9000, cmdSet.init("000000", "123456789012", sharedSecret).getSw());
cmdSet.select().checkOK();
initCapabilities(cmdSet.getApplicationInfo());
}
}