#89

Author: mgramin

src/main/kotlin/com/github/mgramin/sqlboot/model/uri/impl/DbUri.kt

@@ -36,19 +36,10 @@ import java.util.LinkedHashMap
 class DbUri : Uri {
 
     private val type: String
-    private val action: String
     private val objects: List<String>
     private val recursive: Boolean?
     private val params = LinkedHashMap<String, String>()
-
-/*
-    constructor(type: String, vararg objects: String) {
-        this.type = type
-        this.objects = Arrays.asList(*objects)
-        this.action = ""
-        this.recursive = false
-    }
-*/
+    private val action: String
 
     constructor(type: String, objects: List<String>) {
         this.type = type

src/main/kotlin/com/github/mgramin/sqlboot/model/uri/wrappers/HttpParserWrapper.kt

@@ -22,14 +22,12 @@
  * SOFTWARE.
  */
 
-package com.github.mgramin.sqlboot.uri
+package com.github.mgramin.sqlboot.model.uri
 
-import com.github.mgramin.sqlboot.exceptions.BootException
 import com.github.mgramin.sqlboot.model.uri.impl.DbUri
 import com.github.mgramin.sqlboot.model.uri.wrappers.JsonWrapper
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import java.net.URISyntaxException
 
 /**
  * Created by maksim on 12.06.16.
@@ -48,68 +46,58 @@ class DbUriTest {
     }
 
     @Test
-    @Throws(BootException::class)
     fun createAllTableWithChildObjectsFromSchema() {
         test("table/hr.*/", "DbUri{type='table', path=[hr, *], recursive=true, params={}}")
     }
 
     @Test
-    @Throws(BootException::class)
     fun dropAllTableFromSchema() {
         test("table/hr.*/drop", "DbUri{type='table', path=[hr, *], recursive=false, params={}}")
     }
 
     @Test
-    @Throws(BootException::class)
     fun createColumnsForTable() {
         test("column/hr.persons.*name",
                 "DbUri{type='column', path=[hr, persons, *name], recursive=false, params={}}")
     }
 
     @Test
-    @Throws(BootException::class)
     fun dropColumnFromTable() {
         test("column/hr.persons.name/drop",
                 "DbUri{type='column', path=[hr, persons, name], recursive=false, params={}}")
     }
 
     @Test
-    @Throws(BootException::class)
     fun createAllFkForTable() {
         test("fk/hr.employees.*",
                 "DbUri{type='fk', path=[hr, employees, *], recursive=false, params={}}")
     }
 
     @Test
-    @Throws(BootException::class)
     fun dropAllFkFromTable() {
         test("fk/hr.employees.*/drop",
                 "DbUri{type='fk', path=[hr, employees, *], recursive=false, params={}}")
     }
 
     @Test
-    @Throws(BootException::class)
     fun disableAllFkFromTable() {
         test("fk/hr.employees.*/disable",
                 "DbUri{type='fk', path=[hr, employees, *], recursive=false, params={}}")
     }
 
     @Test
-    @Throws(BootException::class)
     fun disableAllFkFromSchema() {
         test("fk/hr.*.*/disable",
                 "DbUri{type='fk', path=[hr, *, *], recursive=false, params={}}")
     }
 
     @Test
-    @Throws(BootException::class)
     fun testDefaultActionIsCreate() {
         test("fk/hr.*.*",
                 "DbUri{type='fk', path=[hr, *, *], recursive=false, params={}}")
     }
 
     @Test
-    @Throws(BootException::class, URISyntaxException::class)
     fun testParams() {
         test("t/hr?@table_comment=big_table",
                 "DbUri{type='t', path=[hr], recursive=false, params={@table_comment=big_table}}")
@@ -123,7 +111,6 @@ class DbUriTest {
         assertEquals("count", dbUri.action())
     }
 
-    @Throws(BootException::class)
     private fun test(uriString: String, jsonExpected: String) {
         val uri = DbUri(uriString)
         assertEquals(uriString, uri.toString())

src/test/kotlin/com/github/mgramin/sqlboot/uri/DbUriTest.kt src/test/kotlin/com/github/mgramin/sqlboot/model/uri/DbUriTest.kt

@@ -26,42 +26,42 @@ package com.github.mgramin.sqlboot.model.uri.wrappers
 
 import com.github.mgramin.sqlboot.model.uri.Uri
 import com.github.mgramin.sqlboot.model.uri.impl.DbUri
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
 
 class JsonWrapperTest {
 
-    internal val uri: Uri = JsonWrapper(DbUri("table/hr.*persons*/"))
+    private val uri: Uri = JsonWrapper(DbUri("table/hr.*persons*/?select=name,age"))
 
     @Test
-    @Throws(Exception::class)
     fun type() {
         assertEquals("table", uri.type())
     }
 
     @Test
-    @Throws(Exception::class)
     fun path() {
-        assertEquals("%persons%", uri.path()[1])
+        assertEquals(arrayListOf("hr", "%persons%"), uri.path())
+    }
+
+    @Test
+    fun pathIndex() {
+        assertEquals("%persons%", uri.path(1))
     }
 
     @Test
-    @Throws(Exception::class)
     fun recursive() {
         assertTrue(uri.recursive()!!)
     }
 
     @Test
-    @Throws(Exception::class)
     fun params() {
-        assertEquals(0, uri.params().size.toLong())
+        assertEquals(1, uri.params().size)
     }
 
     @Test
-    @Throws(Exception::class)
     fun toStringTest() {
-        assertEquals("DbUri{type='table', path=[hr, *persons*], recursive=true, params={}}",
+        assertEquals("DbUri{type='table', path=[hr, *persons*], recursive=true, params={select=name,age}}",
                 uri.toString())
     }
 }

src/test/kotlin/com/github/mgramin/sqlboot/model/uri/wrappers/JsonWrapperTest.kt

@@ -26,36 +26,37 @@ package com.github.mgramin.sqlboot.model.uri.wrappers
 
 import com.github.mgramin.sqlboot.model.uri.Uri
 import com.github.mgramin.sqlboot.model.uri.impl.DbUri
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
+import org.junit.Assert
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
 
 class SqlPlaceholdersWrapperTest {
 
-    internal val uri: Uri = SqlPlaceholdersWrapper(DbUri("table/hr.*persons*/"))
+    private val uri: Uri = SqlPlaceholdersWrapper(DbUri("table/hr.*persons*/?select=name,age"))
 
     @Test
-    @Throws(Exception::class)
     fun type() {
         assertEquals("table", uri.type())
     }
 
     @Test
-    @Throws(Exception::class)
     fun path() {
-        assertEquals("hr", uri.path()[0])
-        assertEquals("%persons%", uri.path()[1])
+        assertEquals(arrayListOf("hr", "%persons%"), uri.path())
+    }
+
+    @Test
+    fun pathIndex() {
+        Assert.assertEquals("%persons%", uri.path(1))
     }
 
     @Test
-    @Throws(Exception::class)
     fun recursive() {
         assertTrue(uri.recursive()!!)
     }
 
     @Test
-    @Throws(Exception::class)
     fun params() {
-        assertEquals(0, uri.params().size.toLong())
+        assertEquals(1, uri.params().size)
     }
 }