fixing e2e tests

Author: daniel-sanche

packages/google-cloud-firestore/tests/system/pipeline_e2e/search.yaml

@@ -103,14 +103,9 @@ tests:
               query: "science"
               sort:
                 Ordering:
-                  - Field: rating
+                  - Score: []
                   - DESCENDING
               add_fields:
-                - AliasedExpression:
-                  - FunctionExpression.string_concat:
-                    - Field: title
-                    - Constant: " - Selected"
-                  - "title_selected"
                 - AliasedExpression:
                   - Score: []
                   - "search_score"
@@ -164,16 +159,11 @@ tests:
                       direction:
                         stringValue: descending
                       expression:
-                        fieldReferenceValue: rating
+                        functionValue:
+                          name: score
             add_fields:
               mapValue:
                 fields:
-                  title_selected:
-                    functionValue:
-                      args:
-                      - fieldReferenceValue: title
-                      - stringValue: " - Selected"
-                      name: string_concat
                   search_score:
                     functionValue:
                       name: score
@@ -237,7 +227,7 @@ tests:
       - Search:
           - SearchOptions:
               query:
-                FunctionExpression.less_than:
+                FunctionExpression.less_than_or_equal:
                   - FunctionExpression.geo_distance:
                      - Field: location
                      - GeoPoint: [37.0, -122.0]
@@ -269,7 +259,7 @@ tests:
                         longitude: -122.0
                     name: geo_distance
                 - doubleValue: 150000.0
-                name: less_than
+                name: less_than_or_equal
         - args:
           - mapValue:
               fields:
@@ -284,56 +274,19 @@ tests:
                 expression:
                   fieldReferenceValue: name
           name: sort
-  - description: search_stage_with_select
-    pipeline:
-      - Collection: books
-      - Search:
-          - SearchOptions:
-              query: "science"
-              select:
-                - title
-                - author
-    assert_results:
-      - title: "Dune"
-        author: "Frank Herbert"
-      - title: "The Hitchhiker's Guide to the Galaxy"
-        author: "Douglas Adams"
-    assert_proto:
-      pipeline:
-        stages:
-        - args:
-          - referenceValue: /books
-          name: collection
-        - name: search
-          options:
-            query:
-              functionValue:
-                args:
-                - stringValue: "science"
-                name: document_matches
-            select:
-              mapValue:
-                fields:
-                  author:
-                    fieldReferenceValue: author
-                  title:
-                    fieldReferenceValue: title
-  - description: search_stage_with_select_and_alias
+  - description: search_stage_with_select_score
     pipeline:
       - Collection: books
       - Search:
           - SearchOptions:
               query: "science"
               select:
                 - AliasedExpression:
-                  - Field: title
-                  - "book_title"
-                - author
+                  - Score: []
+                  - "search_score"
     assert_results:
-      - book_title: "Dune"
-        author: "Frank Herbert"
-      - book_title: "The Hitchhiker's Guide to the Galaxy"
-        author: "Douglas Adams"
+      - search_score: 1.0
+      - search_score: 0.5
     assert_proto:
       pipeline:
         stages:
@@ -350,73 +303,6 @@ tests:
             select:
               mapValue:
                 fields:
-                  author:
-                    fieldReferenceValue: author
-                  book_title:
-                    fieldReferenceValue: title
-  - description: search_stage_with_multiple_sorts
-    pipeline:
-      - Collection: books
-      - Search:
-          - SearchOptions:
-              query: "science"
-              sort:
-                - Ordering:
-                  - Field: rating
-                  - DESCENDING
-                - Ordering:
-                  - Field: published
-                  - ASCENDING
-    assert_results:
-      - title: "Dune"
-        author: "Frank Herbert"
-        genre: "Science Fiction"
-        published: 1965
-        rating: 4.6
-        tags:
-          - politics
-          - desert
-          - adventure
-        awards:
-          hugo: true
-          nebula: true
-      - title: "The Hitchhiker's Guide to the Galaxy"
-        author: "Douglas Adams"
-        genre: "Science Fiction"
-        published: 1979
-        rating: 4.2
-        tags:
-          - comedy
-          - space
-          - adventure
-        awards:
-          hugo: true
-          nebula: false
-    assert_proto:
-      pipeline:
-        stages:
-        - args:
-          - referenceValue: /books
-          name: collection
-        - name: search
-          options:
-            query:
-              functionValue:
-                args:
-                - stringValue: "science"
-                name: document_matches
-            sort:
-              arrayValue:
-                values:
-                - mapValue:
-                    fields:
-                      direction:
-                        stringValue: descending
-                      expression:
-                        fieldReferenceValue: rating
-                - mapValue:
-                    fields:
-                      direction:
-                        stringValue: ascending
-                      expression:
-                        fieldReferenceValue: published
+                  search_score:
+                    functionValue:
+                      name: score