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

Remove unused method StoreConfig.getInboxFolder()

Browse source
This commit is contained in:
cketti 2020-05-01 03:31:11 +02:00
parent 5abb0dc71f
commit fcfc7e6a22
6 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mail/common/src/main/java/com/fsck/k9/mail/store/StoreConfig.java
View file

@ -7,7 +7,6 @@ public interface StoreConfig {
boolean isSubscribedFoldersOnly();
boolean useCompression(NetworkType type);
String getInboxFolder();
String getOutboxFolder();
String getDraftsFolder();

1
mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/ImapFolderTest.java
View file

@ -72,7 +72,6 @@ public class ImapFolderTest {
BinaryTempFileBody.setTempDirectory(RuntimeEnvironment.application.getCacheDir());
imapStore = mock(ImapStore.class);
storeConfig = mock(StoreConfig.class);
when(storeConfig.getInboxFolder()).thenReturn("INBOX");
when(imapStore.getCombinedPrefix()).thenReturn("");
when(imapStore.getStoreConfig()).thenReturn(storeConfig);

10
mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreTest.java
View file

@ -39,13 +39,12 @@ import static org.mockito.Mockito.when;
public class ImapStoreTest {
private StoreConfig storeConfig;
private StoreConfig storeConfig = mock(StoreConfig.class);
private TestImapStore imapStore;
@Before
public void setUp() throws Exception {
ImapStoreSettings serverSettings = createImapStoreSettings();
storeConfig = createStoreConfig();
TrustedSocketFactory trustedSocketFactory = mock(TrustedSocketFactory.class);
ConnectivityManager connectivityManager = mock(ConnectivityManager.class);
OAuth2TokenProvider oauth2TokenProvider = mock(OAuth2TokenProvider.class);
@ -378,13 +377,6 @@ public class ImapStoreTest {
null);
}
private StoreConfig createStoreConfig() {
StoreConfig storeConfig = mock(StoreConfig.class);
when(storeConfig.getInboxFolder()).thenReturn("INBOX");
return storeConfig;
}
private Set<String> extractFolderServerIds(List<FolderListItem> folders) {
Set<String> folderServerIds = new HashSet<>(folders.size());
for (FolderListItem folder : folders) {

1
mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3FolderTest.java
View file

@ -43,7 +43,6 @@ public class Pop3FolderTest {
mockStoreConfig = mock(StoreConfig.class);
mockListener = mock(MessageRetrievalListener.class);
when(mockStore.getConfig()).thenReturn(mockStoreConfig);
when(mockStoreConfig.getInboxFolder()).thenReturn(Pop3Folder.INBOX);
when(mockStore.createConnection()).thenReturn(mockConnection);
when(mockConnection.executeSimpleCommand(Pop3Commands.STAT_COMMAND)).thenReturn("+OK 10 0");
folder = new Pop3Folder(mockStore, Pop3Folder.INBOX);

1
mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3StoreTest.java
View file

@ -61,7 +61,6 @@ public class Pop3StoreTest {
@Before
public void setUp() throws Exception {
ServerSettings serverSettings = createServerSettings();
when(mockStoreConfig.getInboxFolder()).thenReturn(Pop3Folder.INBOX);
when(mockTrustedSocketFactory.createSocket(null, "server", 12345, null)).thenReturn(mockSocket);
when(mockSocket.isConnected()).thenReturn(true);
when(mockSocket.isClosed()).thenReturn(false);

12
mail/protocols/webdav/src/test/java/com/fsck/k9/mail/store/webdav/WebDavStoreTest.java
View file

@ -47,12 +47,10 @@ import org.mockito.stubbing.OngoingStubbing;
import static junit.framework.Assert.assertSame;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@SuppressWarnings("deprecation")
@RunWith(K9LibRobolectricTestRunner.class)
public class WebDavStoreTest {
private static final HttpResponse OK_200_RESPONSE = createOkResponse();
@ -70,10 +68,11 @@ public class WebDavStoreTest {
private SchemeRegistry mockSchemeRegistry;
@Mock
private TrustManagerFactory trustManagerFactory;
@Mock
private StoreConfig storeConfig;
private ArgumentCaptor<HttpGeneric> requestCaptor;
private StoreConfig storeConfig;
private WebDavStoreSettings serverSettings;
private WebDavStore webDavStore;
@ -88,7 +87,6 @@ public class WebDavStoreTest {
when(mockHttpClient.getConnectionManager()).thenReturn(mockClientConnectionManager);
when(mockClientConnectionManager.getSchemeRegistry()).thenReturn(mockSchemeRegistry);
storeConfig = createStoreConfig();
serverSettings = createWebDavStoreSettings(ConnectionSecurity.SSL_TLS_REQUIRED);
webDavStore = createWebDavStore();
}
@ -338,12 +336,6 @@ public class WebDavStoreTest {
};
}
private StoreConfig createStoreConfig() {
StoreConfig storeConfig = mock(StoreConfig.class);
when(storeConfig.getInboxFolder()).thenReturn("INBOX");
return storeConfig;
}
private WebDavStoreSettings createWebDavStoreSettings(ConnectionSecurity connectionSecurity) {
return new WebDavStoreSettings(
"webdav.example.org",