TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix broken unit tests

Browse Source 
fixes #4534
// FREEBIE
This commit is contained in:
Jake McGinty 2015-11-16 12:15:15 -08:00 committed by Moxie Marlinspike
parent 36426a74c1
commit 487f8cbb38
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/unitTest/java/org/thoughtcrime/securesms/BaseUnitTest.java
View File

@ -1,8 +1,10 @@
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import org.junit.Before; import org.junit.Before;
@ -14,14 +16,23 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunner;
import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.MasterSecret;
import java.util.Set;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyFloat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
import static org.powermock.api.mockito.PowerMockito.doReturn;
import static org.powermock.api.mockito.PowerMockito.mock; import static org.powermock.api.mockito.PowerMockito.mock;
import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.mockStatic;
import static org.powermock.api.mockito.PowerMockito.when;
@RunWith(PowerMockRunner.class) @RunWith(PowerMockRunner.class)
@PrepareForTest({ Log.class, Handler.class, Looper.class }) @PrepareForTest({ Log.class, Handler.class, Looper.class, TextUtils.class })
public abstract class BaseUnitTest { public abstract class BaseUnitTest {
protected Context context; protected Context context;
protected MasterSecret masterSecret; protected MasterSecret masterSecret;
@ -34,8 +45,9 @@ public abstract class BaseUnitTest {
mockStatic(Looper.class); mockStatic(Looper.class);
mockStatic(Log.class); mockStatic(Log.class);
mockStatic(Handler.class); mockStatic(Handler.class);
mockStatic(TextUtils.class);
PowerMockito.when(Looper.getMainLooper()).thenReturn(null); when(Looper.getMainLooper()).thenReturn(null);
PowerMockito.whenNew(Handler.class).withAnyArguments().thenReturn(null); PowerMockito.whenNew(Handler.class).withAnyArguments().thenReturn(null);
Answer<?> logAnswer = new Answer<Void>() { Answer<?> logAnswer = new Answer<Void>() {
@ -51,5 +63,21 @@ public abstract class BaseUnitTest {
PowerMockito.doAnswer(logAnswer).when(Log.class, "w", anyString(), anyString()); PowerMockito.doAnswer(logAnswer).when(Log.class, "w", anyString(), anyString());
PowerMockito.doAnswer(logAnswer).when(Log.class, "e", anyString(), anyString()); PowerMockito.doAnswer(logAnswer).when(Log.class, "e", anyString(), anyString());
PowerMockito.doAnswer(logAnswer).when(Log.class, "wtf", anyString(), anyString()); PowerMockito.doAnswer(logAnswer).when(Log.class, "wtf", anyString(), anyString());
PowerMockito.doAnswer(new Answer<Boolean>() {
@Override
public Boolean answer(InvocationOnMock invocation) throws Throwable {
final String s = (String)invocation.getArguments()[0];
return s == null || s.length() == 0;
}
}).when(TextUtils.class, "isEmpty", anyString());
SharedPreferences mockSharedPreferences = mock(SharedPreferences.class);
when(mockSharedPreferences.getString(anyString(), anyString())).thenReturn("");
when(mockSharedPreferences.getLong(anyString(), anyLong())).thenReturn(0L);
when(mockSharedPreferences.getInt(anyString(), anyInt())).thenReturn(0);
when(mockSharedPreferences.getBoolean(anyString(), anyBoolean())).thenReturn(false);
when(mockSharedPreferences.getFloat(anyString(), anyFloat())).thenReturn(0f);
when(context.getSharedPreferences(anyString(), anyInt())).thenReturn(mockSharedPreferences);
} }
} }

4
test/unitTest/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJobTest.java
View File

@ -1,7 +1,5 @@
package org.thoughtcrime.securesms.jobs; package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.thoughtcrime.securesms.BaseUnitTest; import org.thoughtcrime.securesms.BaseUnitTest;
@ -19,7 +17,7 @@ public class AttachmentDownloadJobTest extends BaseUnitTest {
@Override @Override
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
job = new AttachmentDownloadJob(mock(Context.class), 1L, new AttachmentId(1L, 1L)); job = new AttachmentDownloadJob(context, 1L, new AttachmentId(1L, 1L));
} }
@Test(expected = InvalidPartException.class) @Test(expected = InvalidPartException.class)