wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

incorporate tests feedback

Browse source
This commit is contained in:
Vincent Breitmoser 2016-07-24 20:34:29 +02:00
parent 773600c717
commit 526448d18b
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
k9mail/src/main/java/com/fsck/k9/Globals.java
View file

@ -8,8 +8,7 @@ import android.support.annotation.VisibleForTesting;
public class Globals {
private static Context context;
@VisibleForTesting
public static void setContext(Context context) {
static void setContext(Context context) {
Globals.context = context;
}

11
k9mail/src/test/java/com/fsck/k9/GlobalsHelper.java Normal file
View file

@ -0,0 +1,11 @@
package com.fsck.k9;
import android.content.Context;
public class GlobalsHelper {
public static void setContext(Context context) {
Globals.setContext(context);
}
}

15
k9mail/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java
View file

@ -7,7 +7,9 @@ import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
import com.fsck.k9.Globals;
import android.app.Application;
import com.fsck.k9.GlobalsHelper;
import com.fsck.k9.activity.K9ActivityCommon;
import com.fsck.k9.helper.HtmlSanitizer;
import com.fsck.k9.helper.HtmlSanitizerHelper;
@ -45,15 +47,18 @@ public class MessageViewInfoExtractorTest {
private MessageViewInfoExtractor messageViewInfoExtractor;
private Application context;
@Before
public void setUp() throws Exception {
Globals.setContext(RuntimeEnvironment.application);
context = RuntimeEnvironment.application;
GlobalsHelper.setContext(context);
HtmlSanitizer dummyHtmlSanitizer = HtmlSanitizerHelper.getDummyHtmlSanitizer();
messageViewInfoExtractor = new MessageViewInfoExtractor(RuntimeEnvironment.application,
messageViewInfoExtractor = new MessageViewInfoExtractor(context,
null, dummyHtmlSanitizer);
}
@ -69,7 +74,7 @@ public class MessageViewInfoExtractorTest {
// Prepare fixture
HtmlSanitizer htmlSanitizer = mock(HtmlSanitizer.class);
MessageViewInfoExtractor messageViewInfoExtractor =
new MessageViewInfoExtractor(RuntimeEnvironment.application, null, htmlSanitizer);
new MessageViewInfoExtractor(context, null, htmlSanitizer);
String value = "--sanitized html--";
when(htmlSanitizer.sanitize(any(String.class))).thenReturn(value);
@ -181,7 +186,7 @@ public class MessageViewInfoExtractorTest {
@Test
public void testTextPlusRfc822Message() throws MessagingException {
K9ActivityCommon.setLanguage(RuntimeEnvironment.application, "en");
K9ActivityCommon.setLanguage(context, "en");
Locale.setDefault(Locale.US);
TimeZone.setDefault(TimeZone.getTimeZone("GMT+01:00"));