cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ImportKeys: Fix tests

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-02 22:11:52 +02:00
parent f3f9404081
commit 706840771a
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@@ -904,10 +904,6 @@ public class ProviderHelper {
} }
public SaveKeyringResult savePublicKeyRing(UncachedKeyRing keyRing) {
return savePublicKeyRing(keyRing, new ProgressScaler(), null, null, false);
}
/** /**
* Save a public keyring into the database. * Save a public keyring into the database.
* <p/> * <p/>
@@ -1029,11 +1025,15 @@ public class ProviderHelper {
} finally { } finally {
mIndent -= 1; mIndent -= 1;
} }
} }
public SaveKeyringResult saveSecretKeyRing(UncachedKeyRing secretRing, Progressable progress) { public SaveKeyringResult savePublicKeyRing(UncachedKeyRing publicRing, Progressable progress,
return saveSecretKeyRing(secretRing, progress, null, false); String expectedFingerprint) {
return savePublicKeyRing(publicRing, progress, expectedFingerprint, null, false);
}
public SaveKeyringResult savePublicKeyRing(UncachedKeyRing keyRing) {
return savePublicKeyRing(keyRing, new ProgressScaler(), null);
} }
public SaveKeyringResult saveSecretKeyRing(UncachedKeyRing secretRing, Progressable progress, public SaveKeyringResult saveSecretKeyRing(UncachedKeyRing secretRing, Progressable progress,
@@ -1153,7 +1153,10 @@ public class ProviderHelper {
} finally { } finally {
mIndent -= 1; mIndent -= 1;
} }
}
public SaveKeyringResult saveSecretKeyRing(UncachedKeyRing secretRing, Progressable progress) {
return saveSecretKeyRing(secretRing, progress, null, false);
} }
@NonNull @NonNull

6
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java
View File

@@ -24,19 +24,13 @@ import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricGradleTestRunner;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLog;
import org.sufficientlysecure.keychain.BuildConfig;
import org.sufficientlysecure.keychain.WorkaroundBuildConfig; import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@RunWith(RobolectricGradleTestRunner.class) @RunWith(RobolectricGradleTestRunner.class)
@Config(constants = WorkaroundBuildConfig.class, sdk = 23, manifest = "src/main/AndroidManifest.xml") @Config(constants = WorkaroundBuildConfig.class, sdk = 23, manifest = "src/main/AndroidManifest.xml")