From ec61850780cac4e84826aca95a14d8010813b13a Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Wed, 9 Jan 2019 12:19:18 +0100 Subject: Dependencies upgrade. --- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 6 +- .../kotlin/pl/treksoft/kvision/remote/KVServer.kt | 5 -- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 6 +- .../kotlin/pl/treksoft/kvision/remote/KVServer.kt | 6 -- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 99 ---------------------- .../kvision/form/upload/UploadInputSpec.kt | 57 ------------- .../pl/treksoft/kvision/form/upload/UploadSpec.kt | 56 ------------ .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 6 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 6 +- .../kotlin/pl/treksoft/kvision/remote/KVServer.kt | 6 +- .../pl/treksoft/kvision/remote/KVServiceManager.kt | 1 + .../kotlin/pl/treksoft/kvision/remote/KVServer.kt | 6 -- .../pl/treksoft/kvision/remote/KVServiceManager.kt | 11 +-- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 6 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 6 +- 15 files changed, 26 insertions(+), 257 deletions(-) delete mode 100644 kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt delete mode 100644 kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt delete mode 100644 kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt (limited to 'kvision-modules') diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 6e30f12c..5f55a1f8 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -64,13 +64,13 @@ interface DomSpec : TestSpec { override fun afterTest() { val div = document.getElementById("pretest") div?.let { jQuery(it).remove() } - jQuery(`object` = ".modal-backdrop").remove() + jQuery(".modal-backdrop").remove() } fun assertEqualsHtml(expected: String?, actual: String?, message: String?) { if (expected != null && actual != null) { - val exp = jQuery(html = expected) - val act = jQuery(html = actual) + val exp = jQuery(expected) + val act = jQuery(actual) val result = exp[0]?.isEqualNode(act[0]) if (result == true) { assertTrue(result == true, message) diff --git a/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt index cf822e66..4933624e 100644 --- a/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt +++ b/kvision-modules/kvision-common-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt @@ -26,11 +26,6 @@ package pl.treksoft.kvision.remote */ expect open class KVServer -/** - * A server request. - */ -expect interface Request - /** * A user profile. */ diff --git a/kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 1da1fe1a..9d86766c 100644 --- a/kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -62,13 +62,13 @@ interface DomSpec : TestSpec { override fun afterTest() { val div = document.getElementById("pretest") div?.let { jQuery(it).remove() } - jQuery(`object` = ".modal-backdrop").remove() + jQuery(".modal-backdrop").remove() } fun assertEqualsHtml(expected: String?, actual: String?, message: String?) { if (expected != null && actual != null) { - val exp = jQuery(html = expected) - val act = jQuery(html = actual) + val exp = jQuery(expected) + val act = jQuery(actual) val result = exp[0]?.isEqualNode(act[0]) if (result == true) { assertTrue(result == true, message) diff --git a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt index a1cc40ca..7b74ab00 100644 --- a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt +++ b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt @@ -30,12 +30,6 @@ import kotlinx.serialization.Transient */ actual open class KVServer -/** - * A server request. - * Not used on the js platform. - */ -actual interface Request - /** * A user profile. */ diff --git a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt deleted file mode 100644 index 1da1fe1a..00000000 --- a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2017-present Robert Jaros - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package test.pl.treksoft.kvision - -import org.w3c.dom.Element -import pl.treksoft.jquery.jQuery -import pl.treksoft.kvision.core.Widget -import pl.treksoft.kvision.panel.Root -import kotlin.browser.document -import kotlin.test.assertEquals -import kotlin.test.assertTrue - -interface TestSpec { - fun beforeTest() - - fun afterTest() - - fun run(code: () -> Unit) { - beforeTest() - code() - afterTest() - } -} - -interface SimpleSpec : TestSpec { - - override fun beforeTest() { - } - - override fun afterTest() { - } - -} - -interface DomSpec : TestSpec { - - override fun beforeTest() { - val fixture = "
" + - "
" - document.body?.insertAdjacentHTML("afterbegin", fixture) - } - - override fun afterTest() { - val div = document.getElementById("pretest") - div?.let { jQuery(it).remove() } - jQuery(`object` = ".modal-backdrop").remove() - } - - fun assertEqualsHtml(expected: String?, actual: String?, message: String?) { - if (expected != null && actual != null) { - val exp = jQuery(html = expected) - val act = jQuery(html = actual) - val result = exp[0]?.isEqualNode(act[0]) - if (result == true) { - assertTrue(result == true, message) - } else { - assertEquals(expected, actual, message) - } - } else { - assertEquals(expected, actual, message) - } - } -} - -interface WSpec : DomSpec { - - fun runW(code: (widget: Widget, element: Element?) -> Unit) { - run { - val root = Root("test", true) - val widget = Widget() - widget.id = "test_id" - root.add(widget) - val element = document.getElementById("test_id") - code(widget, element) - } - } - -} - -external fun require(name: String): dynamic diff --git a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt b/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt deleted file mode 100644 index 626b70e4..00000000 --- a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2017-present Robert Jaros - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package test.pl.treksoft.kvision.form.upload - -import pl.treksoft.jquery.jQuery -import pl.treksoft.kvision.form.upload.UploadInput -import pl.treksoft.kvision.panel.Root -import test.pl.treksoft.kvision.DomSpec -import kotlin.browser.document -import kotlin.test.Test - -class UploadInputSpec : DomSpec { - - @Test - fun render() { - run { - val root = Root("test", true) - val upi = UploadInput(multiple = true).apply { - id = "idti" - } - root.add(upi) - val content = document.getElementById("test")?.let { jQuery(it).find("input.form-control")[0]?.outerHTML } - assertEqualsHtml( - "", - content, - "Should render correct file input control for multiple files" - ) - upi.multiple = false - val content2 = document.getElementById("test")?.let { jQuery(it).find("input.form-control")[0]?.outerHTML } - assertEqualsHtml( - "", - content2, - "Should render correct file input control for single file" - ) - } - } - -} diff --git a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt b/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt deleted file mode 100644 index bea4ddee..00000000 --- a/kvision-modules/kvision-remote/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2017-present Robert Jaros - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package test.pl.treksoft.kvision.form.upload - -import pl.treksoft.jquery.jQuery -import pl.treksoft.kvision.form.upload.Upload -import pl.treksoft.kvision.panel.Root -import test.pl.treksoft.kvision.DomSpec -import kotlin.browser.document -import kotlin.test.Test - -class UploadSpec : DomSpec { - - @Test - fun render() { - run { - val root = Root("test", true) - val upi = Upload(multiple = true) - val id = upi.input.id - root.add(upi) - val content = document.getElementById("test")?.let { jQuery(it).find("input.form-control")[0]?.outerHTML } - assertEqualsHtml( - "", - content, - "Should render correct file input control for multiple files" - ) - upi.multiple = false - val content2 = document.getElementById("test")?.let { jQuery(it).find("input.form-control")[0]?.outerHTML } - assertEqualsHtml( - "", - content2, - "Should render correct file input control for single file" - ) - } - } - -} diff --git a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 1da1fe1a..9d86766c 100644 --- a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -62,13 +62,13 @@ interface DomSpec : TestSpec { override fun afterTest() { val div = document.getElementById("pretest") div?.let { jQuery(it).remove() } - jQuery(`object` = ".modal-backdrop").remove() + jQuery(".modal-backdrop").remove() } fun assertEqualsHtml(expected: String?, actual: String?, message: String?) { if (expected != null && actual != null) { - val exp = jQuery(html = expected) - val act = jQuery(html = actual) + val exp = jQuery(expected) + val act = jQuery(actual) val result = exp[0]?.isEqualNode(act[0]) if (result == true) { assertTrue(result == true, message) diff --git a/kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 1da1fe1a..9d86766c 100644 --- a/kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -62,13 +62,13 @@ interface DomSpec : TestSpec { override fun afterTest() { val div = document.getElementById("pretest") div?.let { jQuery(it).remove() } - jQuery(`object` = ".modal-backdrop").remove() + jQuery(".modal-backdrop").remove() } fun assertEqualsHtml(expected: String?, actual: String?, message: String?) { if (expected != null && actual != null) { - val exp = jQuery(html = expected) - val act = jQuery(html = actual) + val exp = jQuery(expected) + val act = jQuery(actual) val result = exp[0]?.isEqualNode(act[0]) if (result == true) { assertTrue(result == true, message) diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt index 05681349..d447cf28 100644 --- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt +++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt @@ -23,6 +23,7 @@ package pl.treksoft.kvision.remote import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import org.jooby.Kooby +import org.jooby.Request import org.jooby.json.Jackson import org.pac4j.core.profile.CommonProfile import pl.treksoft.kvision.types.KV_DATE_FORMAT @@ -48,11 +49,6 @@ actual open class KVServer(init: KVServer.() -> Unit) : Kooby() { } } -/** - * A server request. - */ -actual typealias Request = org.jooby.Request - /** * A user profile. */ diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt index 958699f1..63d3b1f3 100644 --- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt +++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt @@ -26,6 +26,7 @@ import com.google.inject.Injector import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch +import org.jooby.Request import org.jooby.Response import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt index ba7264e8..b0052be0 100644 --- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt +++ b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt @@ -27,7 +27,6 @@ import org.pac4j.core.profile.CommonProfile import org.pac4j.core.profile.ProfileManager import org.springframework.web.context.request.RequestContextHolder import org.springframework.web.context.request.ServletRequestAttributes -import javax.servlet.http.HttpServletRequest import kotlinx.coroutines.async as coroutinesAsync /** @@ -35,11 +34,6 @@ import kotlinx.coroutines.async as coroutinesAsync */ actual open class KVServer(val services: List>) -/** - * A server request. - */ -actual typealias Request = HttpServletRequest - /** * A user profile. */ diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt index 24c6c9db..8513c128 100644 --- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt +++ b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt @@ -30,6 +30,7 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory import pl.treksoft.kvision.types.KV_DATE_FORMAT import java.text.SimpleDateFormat +import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse import kotlin.reflect.KClass @@ -43,10 +44,10 @@ actual open class KVServiceManager actual constructor(val serviceClass: val LOG: Logger = LoggerFactory.getLogger(KVServiceManager::class.java.name) } - val postRequests: MutableMap Unit> = mutableMapOf() - val putRequests: MutableMap Unit> = mutableMapOf() - val deleteRequests: MutableMap Unit> = mutableMapOf() - val optionsRequests: MutableMap Unit> = mutableMapOf() + val postRequests: MutableMap Unit> = mutableMapOf() + val putRequests: MutableMap Unit> = mutableMapOf() + val deleteRequests: MutableMap Unit> = mutableMapOf() + val optionsRequests: MutableMap Unit> = mutableMapOf() val mapper = jacksonObjectMapper().apply { dateFormat = SimpleDateFormat(KV_DATE_FORMAT) @@ -426,7 +427,7 @@ actual open class KVServiceManager actual constructor(val serviceClass: fun addRoute( method: RpcHttpMethod, path: String, - handler: (Request, HttpServletResponse) -> Unit + handler: (HttpServletRequest, HttpServletResponse) -> Unit ) { when (method) { RpcHttpMethod.POST -> postRequests[path] = handler diff --git a/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 1da1fe1a..9d86766c 100644 --- a/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -62,13 +62,13 @@ interface DomSpec : TestSpec { override fun afterTest() { val div = document.getElementById("pretest") div?.let { jQuery(it).remove() } - jQuery(`object` = ".modal-backdrop").remove() + jQuery(".modal-backdrop").remove() } fun assertEqualsHtml(expected: String?, actual: String?, message: String?) { if (expected != null && actual != null) { - val exp = jQuery(html = expected) - val act = jQuery(html = actual) + val exp = jQuery(expected) + val act = jQuery(actual) val result = exp[0]?.isEqualNode(act[0]) if (result == true) { assertTrue(result == true, message) diff --git a/kvision-modules/kvision-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 1da1fe1a..9d86766c 100644 --- a/kvision-modules/kvision-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -62,13 +62,13 @@ interface DomSpec : TestSpec { override fun afterTest() { val div = document.getElementById("pretest") div?.let { jQuery(it).remove() } - jQuery(`object` = ".modal-backdrop").remove() + jQuery(".modal-backdrop").remove() } fun assertEqualsHtml(expected: String?, actual: String?, message: String?) { if (expected != null && actual != null) { - val exp = jQuery(html = expected) - val act = jQuery(html = actual) + val exp = jQuery(expected) + val act = jQuery(actual) val result = exp[0]?.isEqualNode(act[0]) if (result == true) { assertTrue(result == true, message) -- cgit