Skip to content

Commit 62d5c3f

Browse files
cynthiajoancynthiajoan
authored
Merge branch 'main' into cj_rest
2 parents 14ebb5d + b9a53cf commit 62d5c3f

33 files changed

+2249
-56
lines changed

‎.github/workflows/build-report.yml‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,16 @@ env:
1313

1414
jobs:
1515
generate-report:
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
test_set: [ general, firestore ]
1620
runs-on: ubuntu-20.04
21+
name: generate-report-${{ matrix.test_set }}
1722
steps:
23+
- name: Pause 5 minutes to offset Firestore fetches.
24+
if: ${{ matrix.test_set == 'firestore' }}
25+
run: sleep 300
1826
- name: Setup python
1927
uses: actions/setup-python@v4
2028
with:
@@ -36,14 +44,24 @@ jobs:
3644
timeout_minutes: 20
3745
max_attempts: 3
3846
shell: bash
39-
command: python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDays }} --write_cache build_status_short.cache
47+
command: |
48+
extra_flags=
49+
if [[ "${{ matrix.test_set }}" == "firestore" ]]; then
50+
extra_flags=--firestore
51+
fi
52+
python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDays }} --write_cache build_status_short.cache ${extra_flags}
4053
- name: Fetch extended GitHub jobs (with retry)
4154
uses: nick-invision/retry@v2
4255
with:
4356
timeout_minutes: 80
4457
max_attempts: 3
4558
shell: bash
46-
command: python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDaysExtended }} --write_cache build_status.cache
59+
command: |
60+
extra_flags=
61+
if [[ "${{ matrix.test_set }}" == "firestore" ]]; then
62+
extra_flags=--firestore
63+
fi
64+
python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDaysExtended }} --write_cache build_status.cache ${extra_flags}
4765
- name: Generate report files
4866
run: |
4967
python3 scripts/gha/report_build_status.py --token ${{ github.token }} --days ${{ env.numDays }} --output_markdown --read_cache build_status_short.cache > report_short.md
@@ -88,4 +106,9 @@ jobs:
88106
timeout_minutes: 5
89107
max_attempts: 3
90108
shell: bash
91-
command: python3 scripts/gha/update_issue_comment.py --token ${{ github.token }} --issue_title '[C++] Nightly Integration Testing Report' --start_tag build-dashboard-comment-start --end_tag build-dashboard-comment-end < comment.md
109+
command: |
110+
issue_title='[C++] Nightly Integration Testing Report'
111+
if [[ "${{ matrix.test_set }}" == "firestore" ]]; then
112+
issue_title='[C++] Nightly Integration Testing Report for Firestore'
113+
fi
114+
python3 scripts/gha/update_issue_comment.py --token ${{ github.token }} --issue_title "${issue_title}" --start_tag build-dashboard-comment-start --end_tag build-dashboard-comment-end < comment.md

‎.github/workflows/update-feature-branches.yml‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
name: Update Feature Branches
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
branch_patterns:
6+
description: 'Space-separated list of feature branch patterns'
7+
default: 'feature_branch/*'
8+
required: true
9+
main_branch:
10+
description: 'Main branch to merge'
11+
default: 'main'
12+
required: true
13+
schedule:
14+
- cron: "0 16 * * 1" # Mondays, 4pm UTC = 9am PST / 10am PDT
15+
16+
env:
17+
defaultBranchPattern: "feature_branch/*"
18+
defaultMainBranch: "main"
19+
triggerTestsLabel: "tests-requested: quick"
20+
21+
jobs:
22+
list_feature_branches:
23+
name: list-feature-branches
24+
runs-on: ubuntu-20.04
25+
outputs:
26+
branch_list: ${{ steps.get-branches.outputs.branch_list }}
27+
steps:
28+
- name: Check out repo (if needed)
29+
if: ${{ github.event.inputs.branch_list == '' }}
30+
uses: actions/checkout@v3
31+
32+
- name: Get list of feature branches
33+
id: get-branches
34+
run: |
35+
branch_pattern='origin/${{ env.defaultBranchPattern }}'
36+
if [[ -n '${{ github.event.inputs.branch_patterns }}' ]]; then
37+
branch_pattern=origin/$(echo '${{ github.event.inputs.branch_patterns }}' | sed 's| | origin/|g')
38+
fi
39+
git remote update
40+
echo "Branch pattern: ${branch_pattern}"
41+
branch_list=$(git branch --list --all "${branch_pattern}")
42+
if [[ -n ${branch_list} ]]; then
43+
# If there's at least one entry, process the list.
44+
echo "Remote branch list: ${branch_list}"
45+
# Remove remotes/origin/ from each branch.
46+
branch_list=$(echo ${branch_list} | sed 's| remotes/origin/| |g' | sed 's|^remotes/origin/||')
47+
# Change spaces to commas.
48+
branch_list=$(echo ${branch_list} | sed 's/ /,/g')
49+
# Add quotes around each branch name.
50+
branch_list='"'$(echo ${branch_list} | sed 's/,/","/g')'"'
51+
fi
52+
echo "::warning ::Branch list: [${branch_list}]"
53+
echo "branch_list=[${branch_list}]" >> $GITHUB_OUTPUT
54+
55+
create_merge_prs:
56+
name: create-merge-pr-${{ matrix.branch_name }}
57+
needs: [ list_feature_branches ]
58+
runs-on: ubuntu-20.04
59+
if: ${{ needs.list_feature_branches.outputs.branch_list != '[]' }}
60+
strategy:
61+
fail-fast: false
62+
matrix:
63+
branch_name: ${{ fromJson(needs.list_feature_branches.outputs.branch_list) }}
64+
steps:
65+
- name: Get token for firebase-workflow-trigger
66+
uses: tibdex/github-app-token@v1
67+
id: generate-token
68+
with:
69+
app_id: ${{ secrets.WORKFLOW_TRIGGER_APP_ID }}
70+
private_key: ${{ secrets.WORKFLOW_TRIGGER_APP_PRIVATE_KEY }}
71+
72+
- name: Setup python
73+
uses: actions/setup-python@v4
74+
with:
75+
python-version: 3.7
76+
77+
- uses: actions/checkout@v3
78+
with:
79+
ref: ${{ matrix.branch_name }}
80+
fetch-depth: 0
81+
submodules: false
82+
83+
- name: Install prerequisites
84+
run: |
85+
python scripts/gha/install_prereqs_desktop.py
86+
python -m pip install requests
87+
88+
- name: Create merge PR
89+
id: create-pr
90+
run: |
91+
git config user.email "firebase-workflow-trigger-bot@google.com"
92+
git config user.name "firebase-workflow-trigger-bot"
93+
git config core.commentChar "%" # so we can use # in git commit messages
94+
95+
main_branch='${{ env.defaultMainBranch }}'
96+
if [[ -n '${{ github.event.inputs.main_branch }}' ]]; then
97+
main_branch='${{ github.event.inputs.main_branch }}'
98+
fi
99+
# Attempt a merge, then check if any files changed.
100+
git merge --no-commit --no-ff "origin/${main_branch}" || true
101+
if git diff --quiet ${{ matrix.branch_name }}; then
102+
# No merge necessary.
103+
echo "::warning ::No merge needed for ${{ matrix.branch_name }}, won't create pull request."
104+
echo "created_pr_number=0" >> $GITHUB_OUTPUT
105+
exit 0
106+
fi
107+
108+
# Undo the actual merge. Let the PR creation handle it.
109+
git merge --abort
110+
111+
date_str=$(date "+%b %d, %Y")
112+
113+
pr_title="Automatic merge of ${main_branch} into ${{ matrix.branch_name }} - ${date_str}"
114+
pr_body="Automatic merge of ${main_branch} into ${{ matrix.branch_name }}.
115+
116+
> Created on ${date_str} by [${{github.workflow}} workflow]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID).
117+
"
118+
pr_number=$(python scripts/gha/create_pull_request.py --token ${{ steps.generate-token.outputs.token }} --base "${{ matrix.branch_name }}" --head "${main_branch}" --title "${pr_title}" --body "${pr_body}")
119+
echo "created_pr_number=${pr_number}" >> $GITHUB_OUTPUT
120+
121+
- name: Set test trigger label.
122+
uses: actions-ecosystem/action-add-labels@v1
123+
if: ${{ steps.create-pr.outputs.created_pr_number }}
124+
with:
125+
github_token: ${{ steps.generate-token.outputs.token }}
126+
number: ${{ steps.create-pr.outputs.created_pr_number }}
127+
labels: "${{ env.triggerTestsLabel }}"

‎app/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,7 @@ if (IOS)
518518
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/document_snapshot.h
519519
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/field_path.h
520520
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/field_value.h
521+
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/filter.h
521522
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/listener_registration.h
522523
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/load_bundle_task_progress.h
523524
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/map_field_value.h

‎firestore/CMakeLists.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ set(common_SRCS
3131
src/common/document_snapshot.cc
3232
src/common/exception_common.cc
3333
src/common/exception_common.h
34+
src/common/filter.cc
3435
src/common/field_path.cc
3536
src/common/field_value.cc
3637
src/common/firestore.cc
@@ -97,6 +98,8 @@ set(android_SRCS
9798
src/android/field_path_portable.h
9899
src/android/field_value_android.cc
99100
src/android/field_value_android.h
101+
src/android/filter_android.cc
102+
src/android/filter_android.h
100103
src/android/firestore_android.cc
101104
src/android/firestore_android.h
102105
src/android/firestore_exceptions_android.h
@@ -201,13 +204,17 @@ set(main_SRCS
201204
src/main/aggregate_query_snapshot_main.h
202205
src/main/collection_reference_main.cc
203206
src/main/collection_reference_main.h
207+
src/main/composite_filter_main.cc
208+
src/main/composite_filter_main.h
204209
src/main/converter_main.h
205210
src/main/document_change_main.cc
206211
src/main/document_change_main.h
207212
src/main/document_reference_main.cc
208213
src/main/document_reference_main.h
209214
src/main/document_snapshot_main.cc
210215
src/main/document_snapshot_main.h
216+
src/main/filter_main.cc
217+
src/main/filter_main.h
211218
src/main/field_value_main.cc
212219
src/main/field_value_main.h
213220
src/main/firestore_main.cc
@@ -227,6 +234,8 @@ set(main_SRCS
227234
src/main/transaction_main.h
228235
src/main/user_data_converter_main.cc
229236
src/main/user_data_converter_main.h
237+
src/main/unary_filter_main.cc
238+
src/main/unary_filter_main.h
230239
src/main/util_main.h
231240
src/main/write_batch_main.cc
232241
src/main/write_batch_main.h)

‎firestore/integration_test_internal/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ set(FIREBASE_INTEGRATION_TEST_PORTABLE_TEST_SRCS
9191
# public API are performed.
9292
src/integration_test.cc
9393
# Internal tests below.
94+
src/aggregate_count_test.cc
9495
src/aggregate_query_snapshot_test.cc
9596
src/aggregate_query_test.cc
9697
src/bundle_test.cc
@@ -99,6 +100,7 @@ set(FIREBASE_INTEGRATION_TEST_PORTABLE_TEST_SRCS
99100
src/document_change_test.cc
100101
src/document_reference_test.cc
101102
src/document_snapshot_test.cc
103+
src/filter_test.cc
102104
src/field_value_test.cc
103105
src/fields_test.cc
104106
src/firestore_test.cc

‎firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121
12CCF1E928FDBD9F00C24941 /* set_options_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 12CCF1DF28FDBD9F00C24941 /* set_options_test.cc */; };
2222
12D513142684C8C200A83FAA /* bundle_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 12D513132684C8C200A83FAA /* bundle_test.cc */; };
2323
12D5131A2684C8D100A83FAA /* bundle_builder.cc in Sources */ = {isa = PBXBuildFile; fileRef = 12D513182684C8D100A83FAA /* bundle_builder.cc */; };
24+
1BAFACA32A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */; };
25+
1BAFACA42A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */; };
26+
1BAFACA52A449C2B00834979 /* aggregate_count_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */; };
27+
1BAFACA62A449C2B00834979 /* aggregate_count_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */; };
28+
1BAFACA72A449C2B00834979 /* aggregate_query_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */; };
29+
1BAFACA82A449C2B00834979 /* aggregate_query_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */; };
30+
1BAFACAA2A449CBD00834979 /* filter_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA92A449CBD00834979 /* filter_test.cc */; };
31+
1BAFACAB2A449CBD00834979 /* filter_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA92A449CBD00834979 /* filter_test.cc */; };
2432
520BC0391C869159008CFBC3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 520BC0381C869159008CFBC3 /* GoogleService-Info.plist */; };
2533
5270BB448DF5ECE860FDD68B /* firebase_firestore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAFAF9474EC412ADCC65F2CC /* firebase_firestore.framework */; };
2634
529226D61C85F68000C89379 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D51C85F68000C89379 /* Foundation.framework */; };
@@ -123,6 +131,10 @@
123131
12D513182684C8D100A83FAA /* bundle_builder.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bundle_builder.cc; path = src/util/bundle_builder.cc; sourceTree = "<group>"; };
124132
12D513192684C8D100A83FAA /* bundle_builder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bundle_builder.h; path = src/util/bundle_builder.h; sourceTree = "<group>"; };
125133
1B3D64B35A22073C76B376D5 /* libPods-integration_test_tvos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-integration_test_tvos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
134+
1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggregate_query_snapshot_test.cc; path = src/aggregate_query_snapshot_test.cc; sourceTree = "<group>"; };
135+
1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggregate_count_test.cc; path = src/aggregate_count_test.cc; sourceTree = "<group>"; };
136+
1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggregate_query_test.cc; path = src/aggregate_query_test.cc; sourceTree = "<group>"; };
137+
1BAFACA92A449CBD00834979 /* filter_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = filter_test.cc; path = src/filter_test.cc; sourceTree = "<group>"; };
126138
3DE393E827F88B06CD3C39CD /* Pods-integration_test_tvos.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-integration_test_tvos.release.xcconfig"; path = "Target Support Files/Pods-integration_test_tvos/Pods-integration_test_tvos.release.xcconfig"; sourceTree = "<group>"; };
127139
4AAFA3E3DA9641C2E3C46C9D /* Pods_integration_test.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_integration_test.framework; sourceTree = BUILT_PRODUCTS_DIR; };
128140
520BC0381C869159008CFBC3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
@@ -281,6 +293,10 @@
281293
5292271D1C85FB5500C89379 /* src */ = {
282294
isa = PBXGroup;
283295
children = (
296+
1BAFACA92A449CBD00834979 /* filter_test.cc */,
297+
1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */,
298+
1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */,
299+
1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */,
284300
12CCF1DF28FDBD9F00C24941 /* set_options_test.cc */,
285301
12CCF1DB28FDBD9E00C24941 /* settings_test.cc */,
286302
12CCF1DC28FDBD9F00C24941 /* source_test.cc */,
@@ -576,12 +592,14 @@
576592
D62CCBC022F367140099BE9F /* gmock-all.cc in Sources */,
577593
D61CFBC126091C3B0035CB2A /* integration_test.cc in Sources */,
578594
D6AAAD532606C22D0025C53B /* includes_test.cc in Sources */,
595+
1BAFACA52A449C2B00834979 /* aggregate_count_test.cc in Sources */,
579596
D6AAAD502606C22D0025C53B /* numeric_transforms_test.cc in Sources */,
580597
D6ED33BE2606CD890058CBF9 /* integration_test_util.cc in Sources */,
581598
D6C179EA22CB322900C2651A /* ios_firebase_test_framework.mm in Sources */,
582599
12CCF1E228FDBD9F00C24941 /* source_test.cc in Sources */,
583600
D6AAAD4C2606C22D0025C53B /* server_timestamp_test.cc in Sources */,
584601
D6AAAD4E2606C22D0025C53B /* firestore_test.cc in Sources */,
602+
1BAFACAA2A449CBD00834979 /* filter_test.cc in Sources */,
585603
D6AAAD452606C22D0025C53B /* document_change_test.cc in Sources */,
586604
D6AAAD472606C22D0025C53B /* document_snapshot_test.cc in Sources */,
587605
D6C179E922CB322900C2651A /* ios_app_framework.mm in Sources */,
@@ -591,7 +609,9 @@
591609
EDEEC7632800CD0000EFBAAF /* leveldb_snappy_test.cc in Sources */,
592610
12CCF1E828FDBD9F00C24941 /* set_options_test.cc in Sources */,
593611
D6AAAD562606C22D0025C53B /* query_network_test.cc in Sources */,
612+
1BAFACA72A449C2B00834979 /* aggregate_query_test.cc in Sources */,
594613
D6AAAD552606C22D0025C53B /* listener_registration_test.cc in Sources */,
614+
1BAFACA32A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */,
595615
12D5131A2684C8D100A83FAA /* bundle_builder.cc in Sources */,
596616
D6AAAD4A2606C22D0025C53B /* fields_test.cc in Sources */,
597617
D6AAAD462606C22D0025C53B /* query_test.cc in Sources */,
@@ -610,6 +630,8 @@
610630
isa = PBXSourcesBuildPhase;
611631
buildActionMask = 2147483647;
612632
files = (
633+
1BAFACAB2A449CBD00834979 /* filter_test.cc in Sources */,
634+
1BAFACA62A449C2B00834979 /* aggregate_count_test.cc in Sources */,
613635
BC1D6850267B00EB005DC2DA /* app_framework.cc in Sources */,
614636
BC1D6853267B00EB005DC2DA /* transaction_extra_test.cc in Sources */,
615637
BC1D683E267B00EB005DC2DA /* integration_test_util.cc in Sources */,
@@ -623,6 +645,7 @@
623645
BC1D6848267B00EB005DC2DA /* sanity_test.cc in Sources */,
624646
12CCF1E728FDBD9F00C24941 /* write_batch_test.cc in Sources */,
625647
12CCF1E128FDBD9F00C24941 /* settings_test.cc in Sources */,
648+
1BAFACA82A449C2B00834979 /* aggregate_query_test.cc in Sources */,
626649
BC1D6856267B00EE005DC2DA /* ios_app_framework.mm in Sources */,
627650
BC1D6843267B00EB005DC2DA /* numeric_transforms_test.cc in Sources */,
628651
BC1D6844267B00EB005DC2DA /* array_transform_test.cc in Sources */,
@@ -632,6 +655,7 @@
632655
BC1D684E267B00EB005DC2DA /* includes_test.cc in Sources */,
633656
BC1D684C267B00EB005DC2DA /* document_change_test.cc in Sources */,
634657
BC1D6851267B00EB005DC2DA /* firestore_integration_test.cc in Sources */,
658+
1BAFACA42A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */,
635659
BC1D6838267B00EB005DC2DA /* future_test_util.cc in Sources */,
636660
12CCF1E528FDBD9F00C24941 /* validation_test.cc in Sources */,
637661
BC1D6839267B00EB005DC2DA /* type_test.cc in Sources */,

‎firestore/integration_test_internal/src/aggregate_count_test.cc‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,9 @@
2828
#include "firestore_integration_test.h"
2929
#include "util/event_accumulator.h"
3030

31-
#if defined(__ANDROID__)
32-
#include "firestore/src/android/query_android.h"
33-
#include "firestore/src/common/wrapper_assertions.h"
34-
#endif // defined(__ANDROID__)
35-
3631
#include "Firestore/core/src/util/firestore_exceptions.h"
3732
#include "firebase/firestore/firestore_errors.h"
3833
#include "firebase_test_framework.h"
39-
#include "gmock/gmock.h"
4034
#include "gtest/gtest.h"
4135

4236
namespace firebase {
@@ -757,15 +751,5 @@ TEST_F(AggregateCountTest,
757751
EXPECT_EQ(aggregate_query2, aggregate_snapshot2.query());
758752
}
759753

760-
#if defined(__ANDROID__)
761-
TEST(QueryTestAndroidStub, Construction) {
762-
testutil::AssertWrapperConstructionContract<Query>();
763-
}
764-
765-
TEST(QueryTestAndroidStub, Assignment) {
766-
testutil::AssertWrapperAssignmentContract<Query>();
767-
}
768-
#endif // defined(__ANDROID__)
769-
770754
} // namespace firestore
771755
} // namespace firebase

0 commit comments

Comments
 (0)