Add trie insertion options for including non-prefixed, case insensitive, and diacritic insensitive matches
This commit is contained in:
@@ -13,13 +13,13 @@ final class TrieTests: XCTestCase {
|
||||
func testFindPrefixedMatches() throws {
|
||||
let trie = Trie<String>()
|
||||
|
||||
let keys = ["foobar", "food", "foo", "somethingelse", "duplicate", "duplicate"]
|
||||
let keys = ["foobar", "food", "foo", "somethingelse", "duplicate", "duplicate", "first: second", "août"]
|
||||
keys.forEach {
|
||||
trie.insert(key: $0, value: $0)
|
||||
XCTAssertEqual(trie.insert(key: $0, value: $0), [$0])
|
||||
}
|
||||
|
||||
let allResults = trie.find(key: "")
|
||||
XCTAssertEqual(Set(allResults), Set(["foobar", "food", "foo", "somethingelse", "duplicate"]))
|
||||
XCTAssertEqual(Set(allResults), Set(keys))
|
||||
|
||||
let fooResults = trie.find(key: "foo")
|
||||
XCTAssertEqual(fooResults.first, "foo")
|
||||
@@ -29,11 +29,20 @@ final class TrieTests: XCTestCase {
|
||||
XCTAssertEqual(foodResults, ["food"])
|
||||
|
||||
let ooResults = trie.find(key: "oo")
|
||||
XCTAssertEqual(Set(ooResults), Set([]))
|
||||
XCTAssertEqual(ooResults, [])
|
||||
|
||||
let multipleWordsResults = trie.find(key: "second")
|
||||
XCTAssertEqual(multipleWordsResults, [])
|
||||
|
||||
let notFoundResults = trie.find(key: "notfound")
|
||||
XCTAssertEqual(notFoundResults, [])
|
||||
|
||||
let caseSensitiveResults = trie.find(key: "FOO")
|
||||
XCTAssertEqual(caseSensitiveResults, [])
|
||||
|
||||
let diacriticResults = trie.find(key: "aout")
|
||||
XCTAssertEqual(diacriticResults, [])
|
||||
|
||||
// Sanity check that the root node has children.
|
||||
XCTAssertTrue(trie.hasChildren)
|
||||
|
||||
@@ -44,13 +53,13 @@ final class TrieTests: XCTestCase {
|
||||
func testFindNonPrefixedMatches() throws {
|
||||
let trie = Trie<String>()
|
||||
|
||||
let keys = ["foobar", "food", "foo", "somethingelse", "duplicate", "duplicate"]
|
||||
let keys = ["foobar", "food", "foo", "somethingelse", "duplicate", "duplicate", "first: second", "août"]
|
||||
keys.forEach {
|
||||
trie.insert(key: $0, value: $0, includeNonPrefixedMatches: true)
|
||||
XCTAssertEqual(trie.insert(key: $0, value: $0, options: [.includeNonPrefixedMatches]), [$0])
|
||||
}
|
||||
|
||||
let allResults = trie.find(key: "")
|
||||
XCTAssertEqual(Set(allResults), Set(["foobar", "food", "foo", "somethingelse", "duplicate"]))
|
||||
XCTAssertEqual(Set(allResults), Set(keys))
|
||||
|
||||
let fooResults = trie.find(key: "foo")
|
||||
XCTAssertEqual(fooResults.first, "foo")
|
||||
@@ -62,12 +71,87 @@ final class TrieTests: XCTestCase {
|
||||
let ooResults = trie.find(key: "oo")
|
||||
XCTAssertEqual(Set(ooResults), Set(["foobar", "food", "foo"]))
|
||||
|
||||
let multipleWordsResults = trie.find(key: "second")
|
||||
XCTAssertEqual(multipleWordsResults, ["first: second"])
|
||||
|
||||
let aResults = trie.find(key: "a")
|
||||
XCTAssertEqual(Set(aResults), Set(["foobar", "duplicate"]))
|
||||
XCTAssertEqual(Set(aResults), Set(["foobar", "duplicate", "août"]))
|
||||
|
||||
let notFoundResults = trie.find(key: "notfound")
|
||||
XCTAssertEqual(notFoundResults, [])
|
||||
|
||||
let caseSensitiveResults = trie.find(key: "FOO")
|
||||
XCTAssertEqual(caseSensitiveResults, [])
|
||||
|
||||
let diacriticResults = trie.find(key: "aout")
|
||||
XCTAssertEqual(diacriticResults, [])
|
||||
|
||||
// Sanity check that the root node has children.
|
||||
XCTAssertTrue(trie.hasChildren)
|
||||
|
||||
// Sanity check that the root node has no values.
|
||||
XCTAssertFalse(trie.hasValues)
|
||||
}
|
||||
|
||||
func testFindCaseInsensitive() throws {
|
||||
let trie = Trie<String>()
|
||||
|
||||
let key = "FoObAr"
|
||||
XCTAssertEqual(trie.insert(key: key, value: key, options: [.includeCaseInsensitiveMatches]), [key, "foobar"])
|
||||
|
||||
let allResults = trie.find(key: "")
|
||||
XCTAssertEqual(Set(allResults), Set([key]))
|
||||
|
||||
let fooResults = trie.find(key: "foo")
|
||||
XCTAssertEqual(fooResults, [key])
|
||||
|
||||
// Sanity check that the root node has children.
|
||||
XCTAssertTrue(trie.hasChildren)
|
||||
|
||||
// Sanity check that the root node has no values.
|
||||
XCTAssertFalse(trie.hasValues)
|
||||
}
|
||||
|
||||
func testFindDiacriticInsensitive() throws {
|
||||
let trie = Trie<String>()
|
||||
|
||||
let key = "Laïcité"
|
||||
XCTAssertEqual(
|
||||
trie.insert(key: key, value: key, options: [.includeDiacriticsInsensitiveMatches]),
|
||||
[key, "Laicite"]
|
||||
)
|
||||
|
||||
let allResults = trie.find(key: "")
|
||||
XCTAssertEqual(Set(allResults), Set([key]))
|
||||
|
||||
let laiciteResults = trie.find(key: "Laicite")
|
||||
XCTAssertEqual(laiciteResults, [key])
|
||||
|
||||
// Sanity check that the root node has children.
|
||||
XCTAssertTrue(trie.hasChildren)
|
||||
|
||||
// Sanity check that the root node has no values.
|
||||
XCTAssertFalse(trie.hasValues)
|
||||
}
|
||||
|
||||
func testFindCaseAndDiacriticInsensitive() throws {
|
||||
let trie = Trie<String>()
|
||||
|
||||
let key = "Laïcité"
|
||||
XCTAssertEqual(
|
||||
trie.insert(
|
||||
key: key,
|
||||
value: key,
|
||||
options: [.includeCaseInsensitiveMatches, .includeDiacriticsInsensitiveMatches]
|
||||
),
|
||||
[key, "laïcité", "Laicite", "laicite"])
|
||||
|
||||
let allResults = trie.find(key: "")
|
||||
XCTAssertEqual(Set(allResults), Set([key]))
|
||||
|
||||
let laiciteResults = trie.find(key: "laicite")
|
||||
XCTAssertEqual(laiciteResults, [key])
|
||||
|
||||
// Sanity check that the root node has children.
|
||||
XCTAssertTrue(trie.hasChildren)
|
||||
|
||||
@@ -78,13 +162,26 @@ final class TrieTests: XCTestCase {
|
||||
func testRemove() {
|
||||
let trie = Trie<String>()
|
||||
|
||||
let keys = ["foobar", "food", "foo", "somethingelse", "duplicate", "duplicate"]
|
||||
let keys = ["FoObAr", "FOOD", "foo", "Sométhingëlse", "duplicate", "duplicate"]
|
||||
var insertedKeysMap = [String: [String]]()
|
||||
keys.forEach {
|
||||
trie.insert(key: $0, value: $0)
|
||||
insertedKeysMap[$0] = trie.insert(key: $0, value: $0,
|
||||
options: [
|
||||
.includeNonPrefixedMatches,
|
||||
.includeCaseInsensitiveMatches,
|
||||
.includeDiacriticsInsensitiveMatches
|
||||
])
|
||||
}
|
||||
|
||||
keys.forEach {
|
||||
trie.remove(key: $0, value: $0)
|
||||
XCTAssertEqual(
|
||||
Set(insertedKeysMap.values.reduce([], +)),
|
||||
Set(keys + ["foobar", "food", "Somethingelse", "somethingelse", "sométhingëlse"])
|
||||
)
|
||||
|
||||
insertedKeysMap.forEach { originalKey, insertedKeys in
|
||||
insertedKeys.forEach { insertedKey in
|
||||
trie.remove(key: insertedKey, value: originalKey)
|
||||
}
|
||||
}
|
||||
|
||||
let allResults = trie.find(key: "")
|
||||
|
||||
Reference in New Issue
Block a user