clean RequesterTest.kt

This commit is contained in:
2022-10-14 22:18:39 +02:00
parent 114518dfa6
commit 0526dda8c4

View File

@@ -11,10 +11,10 @@ import fr.postgresjson.connexion.selectOne
import fr.postgresjson.connexion.update import fr.postgresjson.connexion.update
import fr.postgresjson.entity.UuidEntity import fr.postgresjson.entity.UuidEntity
import fr.postgresjson.serializer.deserialize import fr.postgresjson.serializer.deserialize
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertThrows import org.junit.jupiter.api.Assertions.assertThrows
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import java.util.UUID import java.util.UUID
import kotlin.test.assertEquals
import kotlin.test.assertNotNull import kotlin.test.assertNotNull
class RequesterTest : TestAbstract() { class RequesterTest : TestAbstract() {
@@ -83,13 +83,14 @@ class RequesterTest : TestAbstract() {
@Test @Test
fun `add query from string`() { fun `add query from string`() {
val result: Int = Requester(connection) val result: Int? = Requester(connection)
.apply { addQuery("simpleTest", "select 42;") } .apply { addQuery("simpleTest", "select 42;") }
.getQuery("simpleTest") .getQuery("simpleTest")
.exec() .exec()
.rows[0].getInt(0)!! .rows[0].getInt(0)
assertEquals(result, 42) assertNotNull(result)
assertEquals(42, result)
} }
@Test @Test
@@ -100,8 +101,9 @@ class RequesterTest : TestAbstract() {
.getQuery("selectOne") .getQuery("selectOne")
.selectOne() .selectOne()
assertEquals(objTest!!.id, UUID.fromString("829b1a29-5db8-47f9-9562-961c561ac528")) assertNotNull(objTest)
assertEquals(objTest.name, "test") assertEquals(objTest.id, UUID.fromString("829b1a29-5db8-47f9-9562-961c561ac528"))
assertEquals("test", objTest.name)
} }
@Test @Test
@@ -138,8 +140,9 @@ class RequesterTest : TestAbstract() {
.getFunction("test_function") .getFunction("test_function")
.selectOne(listOf("test", "plip")) .selectOne(listOf("test", "plip"))
assertEquals(objTest!!.id, UUID.fromString("457daad5-4f1b-4eb7-80ec-6882adb8cc7d")) assertNotNull(objTest)
assertEquals(objTest.name, "test") assertEquals(objTest.id, UUID.fromString("457daad5-4f1b-4eb7-80ec-6882adb8cc7d"))
assertEquals("test", objTest.name)
} }
@Test @Test
@@ -284,10 +287,11 @@ class RequesterTest : TestAbstract() {
@Test @Test
fun `call selectOne on function`() { fun `call selectOne on function`() {
val resources = this::class.java.getResource("/sql/function/Test")?.toURI() val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
val obj: ObjTest = Requester(connection, functionsDirectory = resources) val obj: ObjTest? = Requester(connection, functionsDirectory = resources)
.getFunction("test_function") .getFunction("test_function")
.selectOne(mapOf("name" to "myName"))!! .selectOne(mapOf("name" to "myName"))
assertNotNull(obj)
assertEquals("myName", obj.name) assertEquals("myName", obj.name)
} }
@@ -295,10 +299,11 @@ class RequesterTest : TestAbstract() {
fun `call selectOne on function with object and named argument`() { fun `call selectOne on function with object and named argument`() {
val resources = this::class.java.getResource("/sql/function/Test")?.toURI() val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
val obj2 = ObjTest("original") val obj2 = ObjTest("original")
val obj: ObjTest = Requester(connection, functionsDirectory = resources) val obj: ObjTest? = Requester(connection, functionsDirectory = resources)
.getFunction("test_function_object") .getFunction("test_function_object")
.selectOne("resource" to obj2)!! .selectOne("resource" to obj2)
assertNotNull(obj)
assertEquals("changedName", obj.name) assertEquals("changedName", obj.name)
assertEquals("original", obj2.name) assertEquals("original", obj2.name)
} }
@@ -307,10 +312,11 @@ class RequesterTest : TestAbstract() {
fun `call selectOne on function with object`() { fun `call selectOne on function with object`() {
val resources = this::class.java.getResource("/sql/function/Test")?.toURI() val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
val obj2 = ObjTest("original") val obj2 = ObjTest("original")
val obj: ObjTest = Requester(connection, functionsDirectory = resources) val obj: ObjTest? = Requester(connection, functionsDirectory = resources)
.getFunction("test_function_object") .getFunction("test_function_object")
.update(obj2)!! .update(obj2)
assertNotNull(obj)
assertEquals("changedName", obj.name) assertEquals("changedName", obj.name)
assertEquals("original", obj2.name) assertEquals("original", obj2.name)
} }
@@ -318,20 +324,22 @@ class RequesterTest : TestAbstract() {
@Test @Test
fun `call selectOne on function with object and no arguments`() { fun `call selectOne on function with object and no arguments`() {
val resources = this::class.java.getResource("/sql/function/Test")?.toURI() val resources = this::class.java.getResource("/sql/function/Test")?.toURI()
val obj: ObjTest = Requester(connection, functionsDirectory = resources) val obj: ObjTest? = Requester(connection, functionsDirectory = resources)
.getFunction("test_function") .getFunction("test_function")
.selectOne()!! .selectOne()
assertNotNull(obj)
assertEquals("plop", obj.name) assertEquals("plop", obj.name)
} }
@Test @Test
fun `call selectOne on query`() { fun `call selectOne on query`() {
val resources = this::class.java.getResource("/sql/query")?.toURI() val resources = this::class.java.getResource("/sql/query")?.toURI()
val obj: ObjTest = Requester(connection, queriesDirectory = resources) val obj: ObjTest? = Requester(connection, queriesDirectory = resources)
.getQuery("selectOneWithParameters") .getQuery("selectOneWithParameters")
.selectOne(mapOf("name" to "myName"))!! .selectOne(mapOf("name" to "myName"))
assertNotNull(obj)
assertEquals("myName", obj.name) assertEquals("myName", obj.name)
} }
@@ -342,6 +350,8 @@ class RequesterTest : TestAbstract() {
.getFunction("test_function_multiple") .getFunction("test_function_multiple")
.select(mapOf("name" to "myName")) .select(mapOf("name" to "myName"))
assertNotNull(obj[0])
assertEquals("myName", obj[0].name)
assertEquals("myName", obj[0].name) assertEquals("myName", obj[0].name)
} }
@@ -366,7 +376,7 @@ class RequesterTest : TestAbstract() {
assertEquals("ff-2", result[1].name) assertEquals("ff-2", result[1].name)
} }
}.apply { }.apply {
select<ObjTest>(object : TypeReference<List<ObjTest>>() {}, mapOf("name" to "ff")).let { result -> select(object : TypeReference<List<ObjTest>>() {}, mapOf("name" to "ff")).let { result ->
assertNotNull(result) assertNotNull(result)
assertEquals("ff", result[0].name) assertEquals("ff", result[0].name)
assertEquals("ff-2", result[1].name) assertEquals("ff-2", result[1].name)
@@ -385,7 +395,7 @@ class RequesterTest : TestAbstract() {
assertEquals("ff-2", result[1].name) assertEquals("ff-2", result[1].name)
} }
}.apply { }.apply {
select<ObjTest>(object : TypeReference<List<ObjTest>>() {}, "name" to "ff").let { result -> select(object : TypeReference<List<ObjTest>>() {}, "name" to "ff").let { result ->
assertNotNull(result) assertNotNull(result)
assertEquals("ff", result[0].name) assertEquals("ff", result[0].name)
assertEquals("ff-2", result[1].name) assertEquals("ff-2", result[1].name)
@@ -404,7 +414,7 @@ class RequesterTest : TestAbstract() {
assertEquals("aa-2", result[1].name) assertEquals("aa-2", result[1].name)
} }
}.apply { }.apply {
select<ObjTest>(object : TypeReference<List<ObjTest>>() {}, listOf("ff", "aa")).let { result -> select(object : TypeReference<List<ObjTest>>() {}, listOf("ff", "aa")).let { result ->
assertNotNull(result) assertNotNull(result)
assertEquals("ff", result[0].name) assertEquals("ff", result[0].name)
assertEquals("aa-2", result[1].name) assertEquals("aa-2", result[1].name)
@@ -438,7 +448,7 @@ class RequesterTest : TestAbstract() {
assertEquals(0, offset) assertEquals(0, offset)
} }
}.apply { }.apply {
select<ObjTest>(1, 2, object : TypeReference<List<ObjTest>>() {}, mapOf("name" to "ff")).run { select(1, 2, object : TypeReference<List<ObjTest>>() {}, mapOf("name" to "ff")).run {
assertNotNull(result) assertNotNull(result)
assertEquals("ff", result[0].name) assertEquals("ff", result[0].name)
assertEquals("ff-2", result[1].name) assertEquals("ff-2", result[1].name)
@@ -478,17 +488,19 @@ class RequesterTest : TestAbstract() {
Requester(connection, queriesDirectory = resources) Requester(connection, queriesDirectory = resources)
.getQuery("selectOneWithParameters").apply { .getQuery("selectOneWithParameters").apply {
selectOne<ObjTest>(mapOf("name" to "myName")) { selectOne<ObjTest>(mapOf("name" to "myName")) {
assertEquals("myName", it!!.name) assertNotNull(it)
assertEquals("myName", it.name)
assertEquals("plop", rows[0].getString("other")) assertEquals("plop", rows[0].getString("other"))
}!!.run { }.run {
assertEquals("myName", name) assertEquals("selectOneWithParameters", name)
} }
}.apply { }.apply {
selectOne<ObjTest>(typeReference = object : TypeReference<ObjTest>() {}, values = mapOf("name" to "myName")) { it -> selectOne(typeReference = object : TypeReference<ObjTest>() {}, values = mapOf("name" to "myName")) {
assertEquals("myName", it!!.name) assertNotNull(it)
assertEquals("myName", it.name)
assertEquals("plop", rows[0].getString("other")) assertEquals("plop", rows[0].getString("other"))
}!!.run { }.run {
assertEquals("myName", name) assertEquals("selectOneWithParameters", name)
} }
} }
} }