Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edbda6df authored by cketti's avatar cketti
Browse files

Move test helper classes to different package

parent 82bc1867

k9mail-library/src/test/java/com/fsck/k9/mail/transport/mockServer/TestMessage.java→k9mail-library/src/test/java/com/fsck/k9/mail/helpers/TestMessage.java

+1 −1
Original line number Diff line number Diff line 
package com.fsck.k9.mail.transport.mockServer;

package com.fsck.k9.mail.helpers;





import com.fsck.k9.mail.Address;

k9mail-library/src/test/java/com/fsck/k9/testHelpers/TestTrustedSocketFactory.java→k9mail-library/src/test/java/com/fsck/k9/mail/helpers/TestTrustedSocketFactory.java

+1 −1
Original line number Diff line number Diff line 
package com.fsck.k9.testHelpers;

package com.fsck.k9.mail.helpers;





import java.io.IOException;

k9mail-library/src/test/java/com/fsck/k9/testHelpers/VeryTrustingTrustManager.java→k9mail-library/src/test/java/com/fsck/k9/mail/helpers/VeryTrustingTrustManager.java

+1 −1
Original line number Diff line number Diff line 
package com.fsck.k9.testHelpers;

package com.fsck.k9.mail.helpers;



import android.annotation.SuppressLint;

k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapConnectionTest.java

+1 −12
Original line number Diff line number Diff line
@@ -2,14 +2,8 @@ package com.fsck.k9.mail.store.imap; 




import java.io.IOException;

import java.net.Socket;

import java.net.UnknownHostException;

import java.security.KeyManagementException;

import java.security.NoSuchAlgorithmException;

import java.security.cert.CertificateException;

import java.security.cert.X509Certificate;



import android.annotation.SuppressLint;

import android.net.ConnectivityManager;



import com.fsck.k9.mail.AuthType;
@@ -21,12 +15,8 @@ import com.fsck.k9.mail.K9MailLib; 
import com.fsck.k9.mail.MessagingException;

import com.fsck.k9.mail.ssl.TrustedSocketFactory;

import com.fsck.k9.mail.store.imap.mockserver.MockImapServer;

import com.fsck.k9.testHelpers.TestTrustedSocketFactory;

import com.fsck.k9.mail.helpers.TestTrustedSocketFactory;



import javax.net.ssl.SSLContext;

import javax.net.ssl.SSLSocketFactory;

import javax.net.ssl.TrustManager;

import javax.net.ssl.X509TrustManager;

import okio.ByteString;

import org.junit.Before;

import org.junit.Test;
@@ -38,7 +28,6 @@ import org.robolectric.shadows.ShadowLog; 
import static org.hamcrest.core.StringContains.containsString;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertThat;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

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

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ import com.fsck.k9.mail.internet.MimeMessage; 
import com.fsck.k9.mail.ssl.TrustedSocketFactory;

import com.fsck.k9.mail.store.StoreConfig;

import com.fsck.k9.mail.transport.mockServer.MockSmtpServer;

import com.fsck.k9.mail.transport.mockServer.TestMessage;

import com.fsck.k9.mail.helpers.TestMessage;

import com.fsck.k9.mailstore.BinaryMemoryBody;

import com.fsck.k9.testHelpers.TestTrustedSocketFactory;

import com.fsck.k9.mail.helpers.TestTrustedSocketFactory;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;