From 276c87af6875f4b85ae584cc0a3a36c9df09dce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= <clement@meilisearch.com>
Date: Mon, 23 Nov 2020 16:37:55 +0100
Subject: [PATCH] Introduce more test to the FacetCondition struct

---
 src/search/facet/mod.rs | 73 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 4 deletions(-)

diff --git a/src/search/facet/mod.rs b/src/search/facet/mod.rs
index f1286b964..06f543dcc 100644
--- a/src/search/facet/mod.rs
+++ b/src/search/facet/mod.rs
@@ -547,7 +547,7 @@ mod tests {
     use maplit::hashmap;
 
     #[test]
-    fn simple_string_equal() {
+    fn string() {
         let path = tempfile::tempdir().unwrap();
         let mut options = EnvOpenOptions::new();
         options.map_size(10 * 1024 * 1024); // 10 MB
@@ -563,12 +563,20 @@ mod tests {
         // Test that the facet condition is correctly generated.
         let rtxn = index.read_txn().unwrap();
         let condition = FacetCondition::from_str(&rtxn, &index, "channel = ponce").unwrap();
-        let expected = FacetCondition::OperatorString(1, FacetStringOperator::Equal("ponce".into()));
+        let expected = OperatorString(1, FacetStringOperator::Equal("ponce".into()));
+        assert_eq!(condition, expected);
+
+        let condition = FacetCondition::from_str(&rtxn, &index, "channel != ponce").unwrap();
+        let expected = OperatorString(1, FacetStringOperator::NotEqual("ponce".into()));
+        assert_eq!(condition, expected);
+
+        let condition = FacetCondition::from_str(&rtxn, &index, "NOT channel = ponce").unwrap();
+        let expected = OperatorString(1, FacetStringOperator::NotEqual("ponce".into()));
         assert_eq!(condition, expected);
     }
 
     #[test]
-    fn simple_between_i64() {
+    fn i64() {
         let path = tempfile::tempdir().unwrap();
         let mut options = EnvOpenOptions::new();
         options.map_size(10 * 1024 * 1024); // 10 MB
@@ -584,7 +592,64 @@ mod tests {
         // Test that the facet condition is correctly generated.
         let rtxn = index.read_txn().unwrap();
         let condition = FacetCondition::from_str(&rtxn, &index, "timestamp 22 TO 44").unwrap();
-        let expected = FacetCondition::OperatorI64(1, FacetNumberOperator::Between(22, 44));
+        let expected = OperatorI64(1, Between(22, 44));
+        assert_eq!(condition, expected);
+
+        let condition = FacetCondition::from_str(&rtxn, &index, "NOT timestamp 22 TO 44").unwrap();
+        let expected = Or(
+            Box::new(OperatorI64(1, LowerThan(22))),
+            Box::new(OperatorI64(1, GreaterThan(44))),
+        );
+        assert_eq!(condition, expected);
+    }
+
+    #[test]
+    fn parentheses() {
+        let path = tempfile::tempdir().unwrap();
+        let mut options = EnvOpenOptions::new();
+        options.map_size(10 * 1024 * 1024); // 10 MB
+        let index = Index::new(options, &path).unwrap();
+
+        // Set the faceted fields to be the channel.
+        let mut wtxn = index.write_txn().unwrap();
+        let mut builder = Settings::new(&mut wtxn, &index);
+        builder.set_searchable_fields(vec!["channel".into(), "timestamp".into()]); // to keep the fields order
+        builder.set_faceted_fields(hashmap!{
+            "channel".into() => "string".into(),
+            "timestamp".into() => "integer".into(),
+        });
+        builder.execute(|_| ()).unwrap();
+        wtxn.commit().unwrap();
+
+        // Test that the facet condition is correctly generated.
+        let rtxn = index.read_txn().unwrap();
+        let condition = FacetCondition::from_str(
+            &rtxn, &index,
+            "channel = gotaga OR (timestamp 22 TO 44 AND channel != ponce)",
+        ).unwrap();
+        let expected = Or(
+            Box::new(OperatorString(0, FacetStringOperator::Equal("gotaga".into()))),
+            Box::new(And(
+                Box::new(OperatorI64(1, Between(22, 44))),
+                Box::new(OperatorString(0, FacetStringOperator::NotEqual("ponce".into()))),
+            ))
+        );
+        assert_eq!(condition, expected);
+
+        let condition = FacetCondition::from_str(
+            &rtxn, &index,
+            "channel = gotaga OR NOT (timestamp 22 TO 44 AND channel != ponce)",
+        ).unwrap();
+        let expected = Or(
+            Box::new(OperatorString(0, FacetStringOperator::Equal("gotaga".into()))),
+            Box::new(Or(
+                Box::new(Or(
+                    Box::new(OperatorI64(1, LowerThan(22))),
+                    Box::new(OperatorI64(1, GreaterThan(44))),
+                )),
+                Box::new(OperatorString(0, FacetStringOperator::Equal("ponce".into()))),
+            )),
+        );
         assert_eq!(condition, expected);
     }
 }