X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FDefaultElementLoaderTest.kt;h=776d0c994fc4d5b59946eb01234b7fd77f4aeff4;hb=225725bbe986a38d085d2f7fd4563a7e3ee79dee;hp=40d005413787e6a1f6f54b60af02c615a72529f2;hpb=be19285f3675a43301737169f5f3c19cde489da7;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/core/DefaultElementLoaderTest.kt b/src/test/kotlin/net/pterodactylus/sone/core/DefaultElementLoaderTest.kt
index 40d0054..776d0c9 100644
--- a/src/test/kotlin/net/pterodactylus/sone/core/DefaultElementLoaderTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/core/DefaultElementLoaderTest.kt
@@ -92,12 +92,21 @@ class DefaultElementLoaderTest {
 	}
 
 	@Test
+	fun `element loader does not cancel on text html mime type`() {
+		elementLoader.loadElement(IMAGE_ID)
+		verify(freenetInterface).startFetch(eq(freenetURI), callback.capture())
+		assertThat(callback.value.shouldCancel(freenetURI, "text/html", sizeOkay), `is`(false))
+	}
+
+	@Test
 	fun `image loader can load image`() {
 		elementLoader.loadElement(decomposedKey)
 		verify(freenetInterface).startFetch(eq(FreenetURI(decomposedKey)), callback.capture())
 		callback.value.loaded(FreenetURI(normalizedKey), "image/png", read("/static/images/unknown-image-0.png"))
 		val linkedElement = elementLoader.loadElement(decomposedKey)
-		assertThat(linkedElement, `is`(LinkedElement(normalizedKey, properties = mapOf("size" to 2451, "sizeHuman" to "2 KiB"))))
+		assertThat(linkedElement, `is`(LinkedElement(normalizedKey, properties = mapOf(
+				"type" to "image", "size" to 2451, "sizeHuman" to "2 KiB"
+		))))
 	}
 
 	@Test
@@ -107,6 +116,7 @@ class DefaultElementLoaderTest {
 		callback.value.loaded(FreenetURI(textKey), "text/html; charset=UTF-8", read("element-loader.html"))
 		val linkedElement = elementLoader.loadElement(textKey)
 		assertThat(linkedElement, equalTo(LinkedElement(textKey, properties = mapOf(
+				"type" to "html",
 				"size" to 266,
 				"sizeHuman" to "266 B",
 				"title" to "Some Nice Page Title",
@@ -121,6 +131,7 @@ class DefaultElementLoaderTest {
 		callback.value.loaded(FreenetURI(textKey), "text/html; charset=UTF-8", read("element-loader2.html"))
 		val linkedElement = elementLoader.loadElement(textKey)
 		assertThat(linkedElement, equalTo(LinkedElement(textKey, properties = mapOf(
+				"type" to "html",
 				"size" to 185,
 				"sizeHuman" to "185 B",
 				"title" to "Some Nice Page Title",
@@ -135,6 +146,7 @@ class DefaultElementLoaderTest {
 		callback.value.loaded(FreenetURI(textKey), "text/html; charset=UTF-8", read("element-loader3.html"))
 		val linkedElement = elementLoader.loadElement(textKey)
 		assertThat(linkedElement, equalTo(LinkedElement(textKey, properties = mapOf(
+				"type" to "html",
 				"size" to 204,
 				"sizeHuman" to "204 B",
 				"title" to "Some Nice Page Title",
@@ -149,6 +161,7 @@ class DefaultElementLoaderTest {
 		callback.value.loaded(FreenetURI(textKey), "text/html; charset=UTF-8", read("element-loader4.html"))
 		val linkedElement = elementLoader.loadElement(textKey)
 		assertThat(linkedElement, equalTo(LinkedElement(textKey, properties = mapOf(
+				"type" to "html",
 				"size" to 229,
 				"sizeHuman" to "229 B",
 				"title" to null,