From 1fa29f89f90ac0f769f26810dcabcdebfb278612 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 30 Jul 2015 13:03:44 -0700 Subject: [PATCH] Fix broken tests. // FREEBIE --- .../org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java | 4 +--- .../thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/test/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java b/test/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java index 584d30475d..72ef293f12 100644 --- a/test/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java +++ b/test/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java @@ -1,7 +1,5 @@ package org.thoughtcrime.securesms.jobs; -import android.test.AndroidTestCase; - import org.thoughtcrime.securesms.TextSecureTestCase; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule; @@ -144,7 +142,7 @@ public class CleanPreKeysJobTest extends TextSecureTestCase { AxolotlStorageModule.SignedPreKeyStoreFactory provideSignedPreKeyStore() { return new AxolotlStorageModule.SignedPreKeyStoreFactory() { @Override - public SignedPreKeyStore create(MasterSecret masterSecret) { + public SignedPreKeyStore create() { return signedPreKeyStore; } }; diff --git a/test/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java b/test/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java index 0291bda2dc..7bcdc5136a 100644 --- a/test/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java +++ b/test/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java @@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.jobs; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.thoughtcrime.securesms.TextSecureTestCase; -import org.thoughtcrime.securesms.crypto.MasterSecret; import org.whispersystems.textsecure.api.TextSecureMessageSender; import org.whispersystems.textsecure.api.push.TextSecureAddress; import org.whispersystems.textsecure.api.push.exceptions.NotFoundException; @@ -90,7 +89,7 @@ public class DeliveryReceiptJobTest extends TextSecureTestCase { @Provides TextSecureMessageSenderFactory provideTextSecureMessageSenderFactory() { return new TextSecureMessageSenderFactory() { @Override - public TextSecureMessageSender create(MasterSecret masterSecret) { + public TextSecureMessageSender create() { return textSecureMessageSender; } };