X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftest%2FMatchers.kt;h=1f479f6ecec350fa76b599bcf43b9767535aee26;hb=5c5bee980f9cab5792e34d1c9840f73b8b191830;hp=e7588dba2fef8a019ebeb021ccb8a487619616e6;hpb=f1bfb86be7bacf05949c722d80ec8c7a8a996ed9;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt b/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
index e7588db..1f479f6 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
@@ -7,6 +7,24 @@ import net.pterodactylus.util.web.*
 import org.hamcrest.*
 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) }
@@ -58,7 +76,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)