Fix some copy paste errors in Url and add tests

eygraber · Jan 16, 2024 · 3eddc8b · 3eddc8b
1 parent b14fab0
commit 3eddc8b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/uri/src/commonMain/kotlin/com/eygraber/uri/Url.kt b/uri/src/commonMain/kotlin/com/eygraber/uri/Url.kt
@@ -42,7 +42,7 @@ public class Url internal constructor(
  * @return the encoded scheme-specific-part
  */
  override val encodedSchemeSpecificPart: String by lazy {
- requireNotNull(uri.scheme) {
+ requireNotNull(uri.encodedSchemeSpecificPart) {
  "Url requires a non-null schemeSpecificPart"
  }
  }
@@ -57,7 +57,7 @@ public class Url internal constructor(
  * @return the authority for this URI
  */
  override val authority: String by lazy {
- requireNotNull(uri.scheme) {
+ requireNotNull(uri.authority) {
  "Url requires a non-null authority"
  }
  }
@@ -72,7 +72,7 @@ public class Url internal constructor(
  * @return the authority for this URL
  */
  override val encodedAuthority: String by lazy {
- requireNotNull(uri.scheme) {
+ requireNotNull(uri.encodedAuthority) {
  "Url requires a non-null authority"
  }
  }

diff --git a/uri/src/commonTest/kotlin/com/eygraber/uri/UrlTests.kt b/uri/src/commonTest/kotlin/com/eygraber/uri/UrlTests.kt
@@ -24,4 +24,16 @@ class UrlTests {
  "Url host must not be null"
  )
  }
+
+ @Test
+ fun test_urlProperties() {
+ val url = Url.parse("https://[email protected]/?q=bar baz#")
+ assertEquals("https", url.scheme)
+ assertEquals("//[email protected]/?q=bar baz", url.schemeSpecificPart)
+ assertEquals("[email protected]", url.authority)
+ assertEquals("foo", url.userInfo)
+ assertEquals("google.com", url.host)
+ assertEquals("/", url.path)
+ assertEquals("q=bar baz", url.query)
+ }
 }