From 40d7396d905e18b4c058d6eb7602bda2a38cf06d Mon Sep 17 00:00:00 2001 From: qdequele Date: Mon, 10 Feb 2020 16:51:17 +0100 Subject: [PATCH] update tests for settings --- .DS_Store | Bin 8196 -> 0 bytes meilisearch-http/src/routes/setting.rs | 4 +- ...s_ranking.rs => settings_ranking_rules.rs} | 109 ++++++++---------- 3 files changed, 49 insertions(+), 64 deletions(-) delete mode 100644 .DS_Store rename meilisearch-http/tests/{settings_ranking.rs => settings_ranking_rules.rs} (77%) diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index b04a9fbd6ad2026da3fde82e51250554ddc861f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHM!EVz)5S?v9>jV&K1++(BkT|qa8xU26kV2XsDgmkpf&-w|Nlb0(+97tDwjn4N z{sH&{K7}vf7r65Q@MhPIY_};rAw+kh-C5i7W_I7st~)LfiE6jCOf*kK1}e+qWi+Q0 ze$MqonTYSqK?>lB-cm>b`5Ru)JfW>`Xa+O`ngPv#WedtW`(t!6+o za3LAs^T9-AS&8LPNqKajktqOV4!31NA9;Ypn6a$Ha;T()!lud|L<|*iiXjvn&rMc` zti*Dtq=J)Ba1ya+5oahudI!#w>Le;k>Q*zL892!R=k5ks)W)xr%-v z9g+=HR{v*4{|fYN{MxjLo=f}av!7PlkDUFd)a+|&#?bH38z4QhGZ>zI5;F@A0rkk2 zY+1NkM33iY$lM=Y3~^WhzgH==ghKeHr^1WV)n$M{AsY{&8PtK&C(t>&S&b`4PZ_M3Vez38@)Y-8M6=JCzEZrVi8L|;xDY9>jwZR*0 z7dCu^!VzRAZHa>{WohONONZDh2-l1S1YXKQ4i-4%ni)L=SW2$|y#SleWt(c_Q6r6! zL3NM_DuXr=x_sP>-F70WKSS@R%d@6K1imB3#fpHM=M`<`Di(2Cv8h|^CQ8{ zCjH$$Os3h*7{QVCB`u#77*Ug1y;5V-X%0&PG diff --git a/meilisearch-http/src/routes/setting.rs b/meilisearch-http/src/routes/setting.rs index 57fcfed3d..b8365fccc 100644 --- a/meilisearch-http/src/routes/setting.rs +++ b/meilisearch-http/src/routes/setting.rs @@ -18,7 +18,7 @@ pub async fn get_all(ctx: Request) -> SResult { let stop_words_fst = index.main.stop_words_fst(&reader)?; let stop_words = stop_words_fst.unwrap_or_default().stream().into_strs()?; let stop_words: BTreeSet = stop_words.into_iter().collect(); - let stop_words = if stop_words.is_empty() { + let stop_words = if !stop_words.is_empty() { Some(stop_words) } else { None @@ -40,7 +40,7 @@ pub async fn get_all(ctx: Request) -> SResult { } } - let synonyms = if synonyms.is_empty() { + let synonyms = if !synonyms.is_empty() { Some(synonyms) } else { None diff --git a/meilisearch-http/tests/settings_ranking.rs b/meilisearch-http/tests/settings_ranking_rules.rs similarity index 77% rename from meilisearch-http/tests/settings_ranking.rs rename to meilisearch-http/tests/settings_ranking_rules.rs index 81601e256..496cd7274 100644 --- a/meilisearch-http/tests/settings_ranking.rs +++ b/meilisearch-http/tests/settings_ranking_rules.rs @@ -38,23 +38,20 @@ fn write_all_and_delete() { // 2 - Send the settings - let json = json!({ - "rankingRules": [ - "_typo", - "_words", - "_proximity", - "_attribute", - "_words_position", - "_exact", - "dsc(release_date)", - "dsc(rank)", - ], - "rankingDistinct": "movie_id", - }); + let json = json!([ + "_typo", + "_words", + "_proximity", + "_attribute", + "_words_position", + "_exact", + "dsc(release_date)", + "dsc(rank)", + ]); let body = json.to_string().into_bytes(); - let req = http::Request::post("/indexes/movies/settings/ranking") + let req = http::Request::post("/indexes/movies/settings/ranking-rules") .body(Body::from(body)) .unwrap(); let res = server.simulate(req).unwrap(); @@ -64,7 +61,7 @@ fn write_all_and_delete() { // 3 - Get all settings and compare to the previous one - let req = http::Request::get("/indexes/movies/settings/ranking") + let req = http::Request::get("/indexes/movies/settings/ranking-rules") .body(Body::empty()) .unwrap(); let res = server.simulate(req).unwrap(); @@ -78,7 +75,7 @@ fn write_all_and_delete() { // 4 - Delete all settings - let req = http::Request::delete("/indexes/movies/settings/ranking") + let req = http::Request::delete("/indexes/movies/settings/ranking-rules") .body(Body::empty()) .unwrap(); let res = server.simulate(req).unwrap(); @@ -88,7 +85,7 @@ fn write_all_and_delete() { // 5 - Get all settings and check if they are empty - let req = http::Request::get("/indexes/movies/settings/ranking") + let req = http::Request::get("/indexes/movies/settings/ranking-rules") .body(Body::empty()) .unwrap(); let res = server.simulate(req).unwrap(); @@ -98,10 +95,7 @@ fn write_all_and_delete() { block_on(res.into_body().read_to_end(&mut buf)).unwrap(); let res_value: Value = serde_json::from_slice(&buf).unwrap(); - let json = json!({ - "rankingRules": null, - "rankingDistinct": null, - }); + let json = json!(null); assert_json_eq!(json, res_value, ordered: false); } @@ -135,23 +129,20 @@ fn write_all_and_update() { // 2 - Send the settings - let json = json!({ - "rankingRules": [ - "_typo", - "_words", - "_proximity", - "_attribute", - "_words_position", - "_exact", - "dsc(release_date)", - "dsc(rank)", - ], - "rankingDistinct": "movie_id", - }); + let json = json!([ + "_typo", + "_words", + "_proximity", + "_attribute", + "_words_position", + "_exact", + "dsc(release_date)", + "dsc(rank)", + ]); let body = json.to_string().into_bytes(); - let req = http::Request::post("/indexes/movies/settings/ranking") + let req = http::Request::post("/indexes/movies/settings/ranking-rules") .body(Body::from(body)) .unwrap(); let res = server.simulate(req).unwrap(); @@ -161,7 +152,7 @@ fn write_all_and_update() { // 3 - Get all settings and compare to the previous one - let req = http::Request::get("/indexes/movies/settings/ranking") + let req = http::Request::get("/indexes/movies/settings/ranking-rules") .body(Body::empty()) .unwrap(); let res = server.simulate(req).unwrap(); @@ -175,22 +166,19 @@ fn write_all_and_update() { // 4 - Update all settings - let json_update = json!({ - "rankingRules": [ - "_typo", - "_words", - "_proximity", - "_attribute", - "_words_position", - "_exact", - "dsc(release_date)", - ], - "rankingDistinct": null, - }); + let json_update = json!([ + "_typo", + "_words", + "_proximity", + "_attribute", + "_words_position", + "_exact", + "dsc(release_date)", + ]); let body_update = json_update.to_string().into_bytes(); - let req = http::Request::post("/indexes/movies/settings/ranking") + let req = http::Request::post("/indexes/movies/settings/ranking-rules") .body(Body::from(body_update)) .unwrap(); let res = server.simulate(req).unwrap(); @@ -200,7 +188,7 @@ fn write_all_and_update() { // 5 - Get all settings and check if the content is the same of (4) - let req = http::Request::get("/indexes/movies/settings/ranking") + let req = http::Request::get("/indexes/movies/settings/ranking-rules") .body(Body::empty()) .unwrap(); let res = server.simulate(req).unwrap(); @@ -210,18 +198,15 @@ fn write_all_and_update() { block_on(res.into_body().read_to_end(&mut buf)).unwrap(); let res_value: Value = serde_json::from_slice(&buf).unwrap(); - let res_expected = json!({ - "rankingRules": [ - "_typo", - "_words", - "_proximity", - "_attribute", - "_words_position", - "_exact", - "dsc(release_date)", - ], - "rankingDistinct": null, - }); + let res_expected = json!([ + "_typo", + "_words", + "_proximity", + "_attribute", + "_words_position", + "_exact", + "dsc(release_date)", + ]); assert_json_eq!(res_expected, res_value, ordered: false); }