From bf4762ef6f33543657f0eace12164bc0c5093054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 29 Dec 2014 13:32:28 +0100 Subject: [PATCH] Cleanup UncachedKeyringTest --- .../keychain/pgp/UncachedKeyringTest.java | 8 +------- build.gradle | 6 ++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java index 6ed37bbbb..f679015ba 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java @@ -26,15 +26,13 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowLog; import org.spongycastle.bcpg.sig.KeyFlags; -import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.operations.results.EditKeyResult; +import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; -import org.sufficientlysecure.keychain.support.KeyringTestingHelper.RawPacket; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.util.ArrayList; import java.util.Iterator; @RunWith(RobolectricTestRunner.class) @@ -43,10 +41,6 @@ public class UncachedKeyringTest { static UncachedKeyRing staticRing, staticPubRing; UncachedKeyRing ring, pubRing; - ArrayList onlyA = new ArrayList(); - ArrayList onlyB = new ArrayList(); - PgpKeyOperation op; - SaveKeyringParcel parcel; @BeforeClass public static void setUpOnce() throws Exception { diff --git a/build.gradle b/build.gradle index 2ccd5e6fd..f6fff5d3c 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,12 @@ task wrapper(type: Wrapper) { gradleVersion = '2.2.1' } +subprojects { + tasks.withType(Test) { + maxParallelForks = 5 + } +} + // Ignore tests for external dependency project(':extern:spongycastle') { subprojects {