Make TypeInfo data class, add tests

- #459 #471

Make TypeInfo data class, add tests
- #459 #471
f1612a49 · Leonid Stashevsky · e07ca10d · f1612a49 · f1612a49 · f1612a49
--- a/gradle.properties
+++ b/gradle.properties
 version=0.9.4-SNAPSHOT

-kotlin_version=1.2.50
+kotlin_version=1.2.51
 coroutines_version=0.23.3-dev-1
 dokka_version=0.9.16


--- a/ktor-client/ktor-client-core/src/io/ktor/client/call/TypeInfo.kt
+++ b/ktor-client/ktor-client-core/src/io/ktor/client/call/TypeInfo.kt
@@ -3,11 +3,19 @@ package io.ktor.client.call
 import java.lang.reflect.*
 import kotlin.reflect.*

-class TypeInfo(val type: KClass<*>, val reifiedType: Type)
+/**
+ * Ktor type information.
+ * [type]: source KClass<*>
+ * [reifiedType]: type with substituted generics
+ */
+data class TypeInfo(val type: KClass<*>, val reifiedType: Type)

 @PublishedApi()
 internal open class TypeBase<T>

+/**
+ * Create typeInfo from <T>
+ */
 inline fun <reified T> typeInfo(): TypeInfo {
    val base = object : TypeBase<T>() {}
    val superType = base::class.java.genericSuperclass!!

--- a/ktor-client/ktor-client-core/test/io/ktor/client/tests/features/cookies/TypeInfoTest.kt
+++ b/ktor-client/ktor-client-core/test/io/ktor/client/tests/features/cookies/TypeInfoTest.kt
+package io.ktor.client.tests.features.cookies
+
+import io.ktor.client.call.*
+import kotlin.test.*
+
+
+class TypeInfoTest {
+
+    @Test
+    fun classInMethodTest() {
+        class Foo
+        typeInfo<Foo>()
+    }
+
+    @Test
+    @Ignore
+    fun `type info with class defined in method scope with complex name`() {
+        class SomeClass
+        typeInfo<SomeClass>()
+    }
+
+    @Test
+    fun equalsTest() {
+        class Foo<Bar>
+
+        assertEquals(typeInfo<Foo<Int>>(), typeInfo<Foo<Int>>())
+        assertNotEquals(typeInfo<Foo<String>>(), typeInfo<Foo<Int>>())
+        assertNotEquals(typeInfo<Foo<Int>>(), typeInfo<Foo<Char>>())
+    }
+}
\ Нет новой строки в конце файла
--- a/ktor-client/ktor-client-jetty/src/io/ktor/client/engine/jetty/JettyResponseListener.kt
+++ b/ktor-client/ktor-client-jetty/src/io/ktor/client/engine/jetty/JettyResponseListener.kt
@@ -70,7 +70,7 @@ internal class JettyResponseListener(

        onHeadersReceived.complete((frame.metaData as? MetaData.Response)?.let {
            val (status, reason) = it.status to it.reason
-            reason?.let { HttpStatusCode(status, reason) } ?: HttpStatusCode.fromValue(status)
+            reason?.let { HttpStatusCode(status, it) } ?: HttpStatusCode.fromValue(status)
        })
    }