Convert `SimpleImapSettings` to Kotlin (99f6e42b) · Commits · e / os / Mail

mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapConnectionTest.kt

+48 −27

Original line number	Diff line number	Diff line
		@@ -38,10 +38,6 @@ private val OAUTHBEARER_STRING = "n,a=$USERNAME,\u0001auth=Bearer $XOAUTH_TOKEN\
		class RealImapConnectionTest {
		private var socketFactory = TestTrustedSocketFactory.newInstance()
		private var oAuth2TokenProvider = TestTokenProvider()
		private var settings = SimpleImapSettings().apply {
		username = USERNAME
		password = PASSWORD
		}

		@Before
		fun setUp() {
		@@ -646,8 +642,7 @@ class RealImapConnectionTest {

		@Test
		fun `open() with connection error should throw`() {
		settings.host = "127.1.2.3"
		settings.port = 143
		val settings = createImapSettings(host = "127.1.2.3")
		val imapConnection = createImapConnection(settings, socketFactory, oAuth2TokenProvider)

		try {
		@@ -661,8 +656,7 @@ class RealImapConnectionTest {

		@Test
		fun `open() with invalid hostname should throw`() {
		settings.host = "host name"
		settings.port = 143
		val settings = createImapSettings(host = "host name")
		val imapConnection = createImapConnection(settings, socketFactory, oAuth2TokenProvider)

		try {
		@@ -676,7 +670,6 @@ class RealImapConnectionTest {

		@Test
		fun `open() with STARTTLS capability should issue STARTTLS command`() {
		settings.connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED
		val server = MockImapServer().apply {
		preAuthenticationDialog(capabilities = "STARTTLS LOGINDISABLED")
		expect("2 STARTTLS")
		@@ -691,7 +684,11 @@ class RealImapConnectionTest {
		output("* NAMESPACE ((\"\" \"/\")) NIL NIL")
		output("5 OK command completed")
		}
		val imapConnection = startServerAndCreateImapConnection(server, authType = AuthType.PLAIN)
		val imapConnection = startServerAndCreateImapConnection(
		server,
		connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
		authType = AuthType.PLAIN
		)

		imapConnection.open()

		@@ -701,11 +698,13 @@ class RealImapConnectionTest {

		@Test
		fun `open() with STARTTLS but without STARTTLS capability should throw`() {
		settings.connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED
		val server = MockImapServer().apply {
		preAuthenticationDialog()
		}
		val imapConnection = startServerAndCreateImapConnection(server)
		val imapConnection = startServerAndCreateImapConnection(
		server,
		connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
		)

		try {
		imapConnection.open()
		@@ -721,7 +720,6 @@ class RealImapConnectionTest {

		@Test
		fun `open() with untagged CAPABILITY after STARTTLS should not throw`() {
		settings.connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED
		val server = MockImapServer().apply {
		preAuthenticationDialog(capabilities = "STARTTLS LOGINDISABLED")
		expect("2 STARTTLS")
		@@ -735,7 +733,11 @@ class RealImapConnectionTest {
		output("4 OK [CAPABILITY IMAP4REV1] LOGIN completed")
		simplePostAuthenticationDialog(tag = 5)
		}
		val imapConnection = startServerAndCreateImapConnection(server, authType = AuthType.PLAIN)
		val imapConnection = startServerAndCreateImapConnection(
		server,
		connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
		authType = AuthType.PLAIN
		)

		imapConnection.open()

		@@ -745,13 +747,16 @@ class RealImapConnectionTest {

		@Test
		fun `open() with negative response to STARTTLS command should throw`() {
		settings.connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED
		val server = MockImapServer().apply {
		preAuthenticationDialog(capabilities = "STARTTLS")
		expect("2 STARTTLS")
		output("2 NO")
		}
		val imapConnection = startServerAndCreateImapConnection(server, authType = AuthType.PLAIN)
		val imapConnection = startServerAndCreateImapConnection(
		server,
		connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
		authType = AuthType.PLAIN
		)

		try {
		imapConnection.open()
		@@ -766,7 +771,6 @@ class RealImapConnectionTest {

		@Test
		fun `open() with COMPRESS=DEFLATE capability should enable compression`() {
		settings.setUseCompression(true)
		val server = MockImapServer().apply {
		simplePreAuthAndLoginDialog(postAuthCapabilities = "COMPRESS=DEFLATE")
		expect("3 COMPRESS DEFLATE")
		@@ -774,7 +778,7 @@ class RealImapConnectionTest {
		enableCompression()
		simplePostAuthenticationDialog(tag = 4)
		}
		val imapConnection = startServerAndCreateImapConnection(server)
		val imapConnection = startServerAndCreateImapConnection(server, useCompression = true)

		imapConnection.open()

		@@ -784,14 +788,13 @@ class RealImapConnectionTest {

		@Test
		fun `open() with negative response to COMPRESS command should continue`() {
		settings.setUseCompression(true)
		val server = MockImapServer().apply {
		simplePreAuthAndLoginDialog(postAuthCapabilities = "COMPRESS=DEFLATE")
		expect("3 COMPRESS DEFLATE")
		output("3 NO")
		simplePostAuthenticationDialog(tag = 4)
		}
		val imapConnection = startServerAndCreateImapConnection(server)
		val imapConnection = startServerAndCreateImapConnection(server, useCompression = true)

		imapConnection.open()

		@@ -801,13 +804,12 @@ class RealImapConnectionTest {

		@Test
		fun `open() with IOException during COMPRESS command should throw`() {
		settings.setUseCompression(true)
		val server = MockImapServer().apply {
		simplePreAuthAndLoginDialog(postAuthCapabilities = "COMPRESS=DEFLATE")
		expect("3 COMPRESS DEFLATE")
		closeConnection()
		}
		val imapConnection = startServerAndCreateImapConnection(server)
		val imapConnection = startServerAndCreateImapConnection(server, useCompression = true)

		try {
		imapConnection.open()
		@@ -855,6 +857,7 @@ class RealImapConnectionTest {

		@Test
		fun `isConnected without previous open() should return false`() {
		val settings = createImapSettings()
		val imapConnection = createImapConnection(settings, socketFactory, oAuth2TokenProvider)

		val result = imapConnection.isConnected
		@@ -889,6 +892,7 @@ class RealImapConnectionTest {

		@Test
		fun `close() without open() should not throw`() {
		val settings = createImapSettings()
		val imapConnection = createImapConnection(settings, socketFactory, oAuth2TokenProvider)

		imapConnection.close()
		@@ -1015,12 +1019,21 @@ class RealImapConnectionTest {

		private fun startServerAndCreateImapConnection(
		server: MockImapServer,
		authType: AuthType = AuthType.PLAIN
		connectionSecurity: ConnectionSecurity = ConnectionSecurity.NONE,
		authType: AuthType = AuthType.PLAIN,
		useCompression: Boolean = false
		): ImapConnection {
		server.start()
		settings.host = server.host
		settings.port = server.port
		settings.authType = authType

		val settings = SimpleImapSettings(
		host = server.host,
		port = server.port,
		connectionSecurity = connectionSecurity,
		authType = authType,
		username = USERNAME,
		password = PASSWORD,
		useCompression = useCompression
		)

		return createImapConnection(settings, socketFactory, oAuth2TokenProvider)
		}
		@@ -1068,11 +1081,19 @@ class RealImapConnectionTest {
		}

		private fun MockImapServer.simplePreAuthAndLoginDialog(postAuthCapabilities: String = "") {
		settings.authType = AuthType.PLAIN
		preAuthenticationDialog()
		expect("2 LOGIN \"$USERNAME\" \"$PASSWORD\"")
		output("2 OK [CAPABILITY $postAuthCapabilities] LOGIN completed")
		}

		private fun createImapSettings(host: String = "irrelevant"): ImapSettings {
		return SimpleImapSettings(
		host = host,
		port = 143,
		authType = AuthType.PLAIN,
		username = "irrelevant"
		)
		}
		}

		class TestTokenProvider : OAuth2TokenProvider {

mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/SimpleImapSettings.kt

+31 −94

Original line number	Diff line number	Diff line
		package com.fsck.k9.mail.store.imap;
		package com.fsck.k9.mail.store.imap

		import com.fsck.k9.mail.AuthType
		import com.fsck.k9.mail.ConnectionSecurity

		import com.fsck.k9.mail.AuthType;
		import com.fsck.k9.mail.ConnectionSecurity;
		internal class SimpleImapSettings(
		private val host: String,
		private val port: Int = 0,
		private val connectionSecurity: ConnectionSecurity = ConnectionSecurity.NONE,
		private val authType: AuthType,
		private val username: String,
		private val password: String? = null,
		private val useCompression: Boolean = false
		) : ImapSettings {
		private var pathPrefix: String? = null
		private var pathDelimiter: String? = null
		private var combinedPrefix: String? = null

		override fun getHost(): String = host

		class SimpleImapSettings implements ImapSettings {
		private String host;
		private int port;
		private ConnectionSecurity connectionSecurity = ConnectionSecurity.NONE;
		private AuthType authType;
		private String username;
		private String password;
		private String pathPrefix;
		private String pathDelimiter;
		private String combinedPrefix;
		private boolean useCompression = false;
		override fun getPort(): Int = port

		override fun getConnectionSecurity(): ConnectionSecurity = connectionSecurity

		@Override
		public String getHost() {
		return host;
		}

		@Override
		public int getPort() {
		return port;
		}

		@Override
		public ConnectionSecurity getConnectionSecurity() {
		return connectionSecurity;
		}

		@Override
		public AuthType getAuthType() {
		return authType;
		}
		override fun getAuthType(): AuthType = authType

		@Override
		public String getUsername() {
		return username;
		}
		override fun getUsername(): String = username

		@Override
		public String getPassword() {
		return password;
		}
		override fun getPassword(): String? = password

		@Override
		public String getClientCertificateAlias() {
		return null;
		}
		override fun getClientCertificateAlias(): String? = null

		@Override
		public boolean useCompression() {
		return useCompression;
		}
		override fun useCompression(): Boolean = useCompression

		@Override
		public String getPathPrefix() {
		return pathPrefix;
		}

		@Override
		public void setPathPrefix(String prefix) {
		pathPrefix = prefix;
		}
		override fun getPathPrefix(): String? = pathPrefix

		@Override
		public String getPathDelimiter() {
		return pathDelimiter;
		override fun setPathPrefix(prefix: String?) {
		pathPrefix = prefix
		}

		@Override
		public void setPathDelimiter(String delimiter) {
		pathDelimiter = delimiter;
		}

		@Override
		public void setCombinedPrefix(String prefix) {
		combinedPrefix = prefix;
		}

		void setHost(String host) {
		this.host = host;
		}

		void setPort(int port) {
		this.port = port;
		}

		void setConnectionSecurity(ConnectionSecurity connectionSecurity) {
		this.connectionSecurity = connectionSecurity;
		}

		void setAuthType(AuthType authType) {
		this.authType = authType;
		}

		void setUsername(String username) {
		this.username = username;
		}
		override fun getPathDelimiter(): String? = pathDelimiter

		void setPassword(String password) {
		this.password = password;
		override fun setPathDelimiter(delimiter: String?) {
		pathDelimiter = delimiter
		}

		void setUseCompression(boolean useCompression) {
		this.useCompression = useCompression;
		override fun setCombinedPrefix(prefix: String?) {
		combinedPrefix = prefix
		}
		}