X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftest%2FMatchers.kt;h=85ed9e7ee4004557c8f2bd4828dcd40411dbda89;hp=21d225c6fcb1eea5fceca9a3e9b5854d6b0ad8a4;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=d8b8330c6f0a28a59586970648dd166ca48fe2ee

diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt b/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
index 21d225c..85ed9e7 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
@@ -1,11 +1,31 @@
 package net.pterodactylus.sone.test
 
+import freenet.support.*
 import net.pterodactylus.sone.freenet.wot.*
 import net.pterodactylus.sone.utils.*
 import net.pterodactylus.util.web.*
 import org.hamcrest.*
+import org.hamcrest.Matchers
 import org.hamcrest.Matchers.*
 
+/**
+ * Returns a [hamcrest matcher][Matcher] constructed from the given predicate.
+ */
+fun <T> matches(description: String? = null, predicate: (T) -> Boolean) = object : TypeSafeDiagnosingMatcher<T>() {
+
+	override fun matchesSafely(item: T, mismatchDescription: Description) =
+			predicate(item).onFalse {
+				mismatchDescription.appendValue(item).appendText(" did not match predicate")
+			}
+
+	override fun describeTo(description: Description) {
+		description.appendText("matches predicate ").appendValue(predicate)
+	}
+
+}.let { matcher ->
+	description?.let { describedAs(description, matcher) } ?: matcher
+}
+
 fun hasHeader(name: String, value: String) = object : TypeSafeDiagnosingMatcher<Header>() {
 	override fun matchesSafely(item: Header, mismatchDescription: Description) =
 			compare(item.name, { it.equals(name, ignoreCase = true) }) { mismatchDescription.appendText("name is ").appendValue(it) }
@@ -57,7 +77,7 @@ fun isTrusted(ownIdentity: OwnIdentity, trust: Matcher<Trust>) = object : TypeSa
 	}
 }
 
-fun isIdentity(id: String, nickname: String, requestUri: String, contexts: Matcher<out Iterable<String>>, properties: Matcher<out Map<out String, String>>) =
+fun isIdentity(id: String, nickname: String?, requestUri: String, contexts: Matcher<out Iterable<String>>, properties: Matcher<out Map<out String, String>>) =
 		AttributeMatcher<Identity>("identity")
 				.addAttribute("id", id, Identity::getId)
 				.addAttribute("nickname", nickname, Identity::getNickname)
@@ -74,6 +94,19 @@ fun isOwnIdentity(id: String, nickname: String, requestUri: String, insertUri: S
 				.addAttribute("contexts", OwnIdentity::getContexts, contexts)
 				.addAttribute("properties", OwnIdentity::getProperties, properties)
 
+fun hasField(name: String, valueMatcher: Matcher<String>) = object : TypeSafeDiagnosingMatcher<SimpleFieldSet>() {
+	override fun matchesSafely(item: SimpleFieldSet, mismatchDescription: Description) =
+			valueMatcher.matches(item.get(name)).onFalse {
+				valueMatcher.describeMismatch(item, mismatchDescription)
+			}
+
+	override fun describeTo(description: Description) {
+		description
+				.appendText("simple field set with key ").appendValue(name)
+				.appendText(", value ").appendValue(valueMatcher)
+	}
+}
+
 /**
  * [TypeSafeDiagnosingMatcher] implementation that aims to cut down boilerplate on verifying the attributes
  * of typical container objects.