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

Override hostname used for EHLO command in tests

Browse source
This commit is contained in:
cketti 2016-10-19 10:20:27 +02:00
parent 21d4ceb0d8
commit e2f5719826
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
k9mail-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java
View file

@ -1,6 +1,7 @@
package com.fsck.k9.mail.transport;
import android.support.annotation.VisibleForTesting;
import android.util.Log;
import com.fsck.k9.mail.*;
@ -241,7 +242,7 @@ public class SmtpTransport extends Transport {
executeSimpleCommand(null);
InetAddress localAddress = mSocket.getLocalAddress();
String localHost = localAddress.getCanonicalHostName();
String localHost = getCanonicalHostName(localAddress);
String ipAddr = localAddress.getHostAddress();
if (localHost.equals("") || localHost.equals(ipAddr) || localHost.contains("_")) {
@ -761,6 +762,11 @@ public class SmtpTransport extends Transport {
Base64.encode(username)), false);
}
@VisibleForTesting
protected String getCanonicalHostName(InetAddress localAddress) {
return localAddress.getCanonicalHostName();
}
/**
* Exception that is thrown when the server sends a negative reply (reply codes 4xx or 5xx).
*/

17
k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportTest.java
View file

@ -2,6 +2,7 @@ package com.fsck.k9.mail.transport;
import java.io.IOException;
import java.net.InetAddress;
import com.fsck.k9.mail.AuthType;
import com.fsck.k9.mail.CertificateValidationException;
@ -33,6 +34,7 @@ import static org.mockito.Mockito.when;
@RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE, sdk = 21)
public class SmtpTransportTest {
private static final String LOCALHOST_NAME = "localhost";
private static final String USERNAME = "user";
private static final String PASSWORD = "password";
private static final String CLIENT_CERTIFICATE_ALIAS = null;
@ -411,7 +413,7 @@ public class SmtpTransportTest {
String uri = SmtpTransport.createUri(serverSettings);
StoreConfig storeConfig = createStoreConfigWithTransportUri(uri);
return new SmtpTransport(storeConfig, socketFactory);
return new TestSmtpTransport(storeConfig, socketFactory);
}
private StoreConfig createStoreConfigWithTransportUri(String value) {
@ -447,4 +449,17 @@ public class SmtpTransportTest {
return server;
}
static class TestSmtpTransport extends SmtpTransport {
TestSmtpTransport(StoreConfig storeConfig, TrustedSocketFactory trustedSocketFactory)
throws MessagingException {
super(storeConfig, trustedSocketFactory);
}
@Override
protected String getCanonicalHostName(InetAddress localAddress) {
return LOCALHOST_NAME;
}
}
}