From 28f1bec6d38f36623d57682904bc09503b78cb10 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 25 Feb 2019 15:48:05 -0500 Subject: [PATCH 1/2] Prep firestore unit tests for generation from 'v1' protos. --- firestore/tests/unit/v1beta1/__init__.py | 13 +++++++++++++ .../tests/unit/{ => v1beta1}/test__helpers.py | 0 firestore/tests/unit/{ => v1beta1}/test_batch.py | 0 firestore/tests/unit/{ => v1beta1}/test_client.py | 4 ++-- .../tests/unit/{ => v1beta1}/test_collection.py | 0 .../unit/{ => v1beta1}/test_cross_language.py | 0 .../tests/unit/{ => v1beta1}/test_document.py | 0 .../tests/unit/{ => v1beta1}/test_field_path.py | 0 firestore/tests/unit/{ => v1beta1}/test_order.py | 0 firestore/tests/unit/{ => v1beta1}/test_query.py | 0 .../tests/unit/{ => v1beta1}/test_transaction.py | 0 .../tests/unit/{ => v1beta1}/test_transforms.py | 0 firestore/tests/unit/{ => v1beta1}/test_watch.py | 0 .../testdata/create-all-transforms.textproto | 0 .../testdata/create-arrayremove-multi.textproto | 0 .../testdata/create-arrayremove-nested.textproto | 0 .../create-arrayremove-noarray-nested.textproto | 0 .../testdata/create-arrayremove-noarray.textproto | 0 .../testdata/create-arrayremove-with-st.textproto | 0 .../testdata/create-arrayremove.textproto | 0 .../testdata/create-arrayunion-multi.textproto | 0 .../testdata/create-arrayunion-nested.textproto | 0 .../create-arrayunion-noarray-nested.textproto | 0 .../testdata/create-arrayunion-noarray.textproto | 0 .../testdata/create-arrayunion-with-st.textproto | 0 .../testdata/create-arrayunion.textproto | 0 .../{ => v1beta1}/testdata/create-basic.textproto | 0 .../testdata/create-complex.textproto | 0 .../testdata/create-del-noarray-nested.textproto | 0 .../testdata/create-del-noarray.textproto | 0 .../{ => v1beta1}/testdata/create-empty.textproto | 0 .../{ => v1beta1}/testdata/create-nodel.textproto | 0 .../testdata/create-nosplit.textproto | 0 .../testdata/create-special-chars.textproto | 0 .../testdata/create-st-alone.textproto | 0 .../testdata/create-st-multi.textproto | 0 .../testdata/create-st-nested.textproto | 0 .../testdata/create-st-noarray-nested.textproto | 0 .../testdata/create-st-noarray.textproto | 0 .../testdata/create-st-with-empty-map.textproto | 0 .../{ => v1beta1}/testdata/create-st.textproto | 0 .../testdata/delete-exists-precond.textproto | 0 .../testdata/delete-no-precond.textproto | 0 .../testdata/delete-time-precond.textproto | 0 .../{ => v1beta1}/testdata/get-basic.textproto | 0 .../testdata/listen-add-mod-del-add.textproto | 0 .../testdata/listen-add-one.textproto | 0 .../testdata/listen-add-three.textproto | 0 .../testdata/listen-doc-remove.textproto | 0 .../{ => v1beta1}/testdata/listen-empty.textproto | 0 .../testdata/listen-filter-nop.textproto | 0 .../testdata/listen-multi-docs.textproto | 0 .../testdata/listen-nocurrent.textproto | 0 .../{ => v1beta1}/testdata/listen-nomod.textproto | 0 .../testdata/listen-removed-target-ids.textproto | 0 .../{ => v1beta1}/testdata/listen-reset.textproto | 0 .../testdata/listen-target-add-nop.textproto | 0 .../testdata/listen-target-add-wrong-id.textproto | 0 .../testdata/listen-target-remove.textproto | 0 .../testdata/query-arrayremove-cursor.textproto | 0 .../testdata/query-arrayremove-where.textproto | 0 .../testdata/query-arrayunion-cursor.textproto | 0 .../testdata/query-arrayunion-where.textproto | 0 .../{ => v1beta1}/testdata/query-bad-NaN.textproto | 0 .../testdata/query-bad-null.textproto | 0 .../testdata/query-cursor-docsnap-order.textproto | 0 .../query-cursor-docsnap-orderby-name.textproto | 0 .../query-cursor-docsnap-where-eq.textproto | 0 ...uery-cursor-docsnap-where-neq-orderby.textproto | 0 .../query-cursor-docsnap-where-neq.textproto | 0 .../testdata/query-cursor-docsnap.textproto | 0 .../query-cursor-endbefore-empty-map.textproto | 0 .../query-cursor-endbefore-empty.textproto | 0 .../testdata/query-cursor-no-order.textproto | 0 .../query-cursor-startat-empty-map.textproto | 0 .../testdata/query-cursor-startat-empty.textproto | 0 .../testdata/query-cursor-vals-1a.textproto | 0 .../testdata/query-cursor-vals-1b.textproto | 0 .../testdata/query-cursor-vals-2.textproto | 0 .../testdata/query-cursor-vals-docid.textproto | 0 .../testdata/query-cursor-vals-last-wins.textproto | 0 .../testdata/query-del-cursor.textproto | 0 .../testdata/query-del-where.textproto | 0 .../testdata/query-invalid-operator.textproto | 0 .../testdata/query-invalid-path-order.textproto | 0 .../testdata/query-invalid-path-select.textproto | 0 .../testdata/query-invalid-path-where.textproto | 0 .../query-offset-limit-last-wins.textproto | 0 .../testdata/query-offset-limit.textproto | 0 .../{ => v1beta1}/testdata/query-order.textproto | 0 .../testdata/query-select-empty.textproto | 0 .../testdata/query-select-last-wins.textproto | 0 .../{ => v1beta1}/testdata/query-select.textproto | 0 .../testdata/query-st-cursor.textproto | 0 .../testdata/query-st-where.textproto | 0 .../{ => v1beta1}/testdata/query-where-2.textproto | 0 .../testdata/query-where-NaN.textproto | 0 .../testdata/query-where-null.textproto | 0 .../{ => v1beta1}/testdata/query-where.textproto | 0 .../testdata/query-wrong-collection.textproto | 0 .../testdata/set-all-transforms.textproto | 0 .../testdata/set-arrayremove-multi.textproto | 0 .../testdata/set-arrayremove-nested.textproto | 0 .../set-arrayremove-noarray-nested.textproto | 0 .../testdata/set-arrayremove-noarray.textproto | 0 .../testdata/set-arrayremove-with-st.textproto | 0 .../testdata/set-arrayremove.textproto | 0 .../testdata/set-arrayunion-multi.textproto | 0 .../testdata/set-arrayunion-nested.textproto | 0 .../set-arrayunion-noarray-nested.textproto | 0 .../testdata/set-arrayunion-noarray.textproto | 0 .../testdata/set-arrayunion-with-st.textproto | 0 .../testdata/set-arrayunion.textproto | 0 .../{ => v1beta1}/testdata/set-basic.textproto | 0 .../{ => v1beta1}/testdata/set-complex.textproto | 0 .../testdata/set-del-merge-alone.textproto | 0 .../{ => v1beta1}/testdata/set-del-merge.textproto | 0 .../testdata/set-del-mergeall.textproto | 0 .../testdata/set-del-noarray-nested.textproto | 0 .../testdata/set-del-noarray.textproto | 0 .../testdata/set-del-nomerge.textproto | 0 .../testdata/set-del-nonleaf.textproto | 0 .../testdata/set-del-wo-merge.textproto | 0 .../{ => v1beta1}/testdata/set-empty.textproto | 0 .../{ => v1beta1}/testdata/set-merge-fp.textproto | 0 .../testdata/set-merge-nested.textproto | 0 .../testdata/set-merge-nonleaf.textproto | 0 .../testdata/set-merge-prefix.textproto | 0 .../testdata/set-merge-present.textproto | 0 .../{ => v1beta1}/testdata/set-merge.textproto | 0 .../testdata/set-mergeall-empty.textproto | 0 .../testdata/set-mergeall-nested.textproto | 0 .../{ => v1beta1}/testdata/set-mergeall.textproto | 0 .../{ => v1beta1}/testdata/set-nodel.textproto | 0 .../{ => v1beta1}/testdata/set-nosplit.textproto | 0 .../testdata/set-special-chars.textproto | 0 .../testdata/set-st-alone-mergeall.textproto | 0 .../{ => v1beta1}/testdata/set-st-alone.textproto | 0 .../testdata/set-st-merge-both.textproto | 0 .../testdata/set-st-merge-nonleaf-alone.textproto | 0 .../testdata/set-st-merge-nonleaf.textproto | 0 .../testdata/set-st-merge-nowrite.textproto | 0 .../testdata/set-st-mergeall.textproto | 0 .../{ => v1beta1}/testdata/set-st-multi.textproto | 0 .../{ => v1beta1}/testdata/set-st-nested.textproto | 0 .../testdata/set-st-noarray-nested.textproto | 0 .../testdata/set-st-noarray.textproto | 0 .../testdata/set-st-nomerge.textproto | 0 .../testdata/set-st-with-empty-map.textproto | 0 .../unit/{ => v1beta1}/testdata/set-st.textproto | 0 .../{ => v1beta1}/testdata/test-suite.binproto | Bin .../testdata/update-all-transforms.textproto | 0 .../testdata/update-arrayremove-alone.textproto | 0 .../testdata/update-arrayremove-multi.textproto | 0 .../testdata/update-arrayremove-nested.textproto | 0 .../update-arrayremove-noarray-nested.textproto | 0 .../testdata/update-arrayremove-noarray.textproto | 0 .../testdata/update-arrayremove-with-st.textproto | 0 .../testdata/update-arrayremove.textproto | 0 .../testdata/update-arrayunion-alone.textproto | 0 .../testdata/update-arrayunion-multi.textproto | 0 .../testdata/update-arrayunion-nested.textproto | 0 .../update-arrayunion-noarray-nested.textproto | 0 .../testdata/update-arrayunion-noarray.textproto | 0 .../testdata/update-arrayunion-with-st.textproto | 0 .../testdata/update-arrayunion.textproto | 0 .../testdata/update-badchar.textproto | 0 .../{ => v1beta1}/testdata/update-basic.textproto | 0 .../testdata/update-complex.textproto | 0 .../testdata/update-del-alone.textproto | 0 .../testdata/update-del-dot.textproto | 0 .../testdata/update-del-nested.textproto | 0 .../testdata/update-del-noarray-nested.textproto | 0 .../testdata/update-del-noarray.textproto | 0 .../{ => v1beta1}/testdata/update-del.textproto | 0 .../testdata/update-exists-precond.textproto | 0 .../testdata/update-fp-empty-component.textproto | 0 .../testdata/update-no-paths.textproto | 0 .../testdata/update-paths-all-transforms.textproto | 0 .../update-paths-arrayremove-alone.textproto | 0 .../update-paths-arrayremove-multi.textproto | 0 .../update-paths-arrayremove-nested.textproto | 0 ...date-paths-arrayremove-noarray-nested.textproto | 0 .../update-paths-arrayremove-noarray.textproto | 0 .../update-paths-arrayremove-with-st.textproto | 0 .../testdata/update-paths-arrayremove.textproto | 0 .../update-paths-arrayunion-alone.textproto | 0 .../update-paths-arrayunion-multi.textproto | 0 .../update-paths-arrayunion-nested.textproto | 0 ...pdate-paths-arrayunion-noarray-nested.textproto | 0 .../update-paths-arrayunion-noarray.textproto | 0 .../update-paths-arrayunion-with-st.textproto | 0 .../testdata/update-paths-arrayunion.textproto | 0 .../testdata/update-paths-basic.textproto | 0 .../testdata/update-paths-complex.textproto | 0 .../testdata/update-paths-del-alone.textproto | 0 .../testdata/update-paths-del-nested.textproto | 0 .../update-paths-del-noarray-nested.textproto | 0 .../testdata/update-paths-del-noarray.textproto | 0 .../testdata/update-paths-del.textproto | 0 .../testdata/update-paths-exists-precond.textproto | 0 .../testdata/update-paths-fp-del.textproto | 0 .../update-paths-fp-dup-transforms.textproto | 0 .../testdata/update-paths-fp-dup.textproto | 0 .../update-paths-fp-empty-component.textproto | 0 .../testdata/update-paths-fp-empty.textproto | 0 .../testdata/update-paths-fp-multi.textproto | 0 .../testdata/update-paths-fp-nosplit.textproto | 0 .../testdata/update-paths-no-paths.textproto | 0 .../testdata/update-paths-prefix-1.textproto | 0 .../testdata/update-paths-prefix-2.textproto | 0 .../testdata/update-paths-prefix-3.textproto | 0 .../testdata/update-paths-special-chars.textproto | 0 .../testdata/update-paths-st-alone.textproto | 0 .../testdata/update-paths-st-multi.textproto | 0 .../testdata/update-paths-st-nested.textproto | 0 .../update-paths-st-noarray-nested.textproto | 0 .../testdata/update-paths-st-noarray.textproto | 0 .../update-paths-st-with-empty-map.textproto | 0 .../testdata/update-paths-st.textproto | 0 .../testdata/update-paths-uptime.textproto | 0 .../testdata/update-prefix-1.textproto | 0 .../testdata/update-prefix-2.textproto | 0 .../testdata/update-prefix-3.textproto | 0 .../testdata/update-quoting.textproto | 0 .../testdata/update-split-top-level.textproto | 0 .../{ => v1beta1}/testdata/update-split.textproto | 0 .../testdata/update-st-alone.textproto | 0 .../{ => v1beta1}/testdata/update-st-dot.textproto | 0 .../testdata/update-st-multi.textproto | 0 .../testdata/update-st-nested.textproto | 0 .../testdata/update-st-noarray-nested.textproto | 0 .../testdata/update-st-noarray.textproto | 0 .../testdata/update-st-with-empty-map.textproto | 0 .../{ => v1beta1}/testdata/update-st.textproto | 0 .../{ => v1beta1}/testdata/update-uptime.textproto | 0 236 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 firestore/tests/unit/v1beta1/__init__.py rename firestore/tests/unit/{ => v1beta1}/test__helpers.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_batch.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_client.py (99%) rename firestore/tests/unit/{ => v1beta1}/test_collection.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_cross_language.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_document.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_field_path.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_order.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_query.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_transaction.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_transforms.py (100%) rename firestore/tests/unit/{ => v1beta1}/test_watch.py (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-all-transforms.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayremove-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayremove-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayremove-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayremove-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayremove-with-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayremove.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayunion-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayunion-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayunion-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayunion-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayunion-with-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-arrayunion.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-basic.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-complex.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-del-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-del-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-empty.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-nodel.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-nosplit.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-special-chars.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-st-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-st-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-st-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-st-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-st-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-st-with-empty-map.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/create-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/delete-exists-precond.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/delete-no-precond.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/delete-time-precond.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/get-basic.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-add-mod-del-add.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-add-one.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-add-three.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-doc-remove.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-empty.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-filter-nop.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-multi-docs.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-nocurrent.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-nomod.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-removed-target-ids.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-reset.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-target-add-nop.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-target-add-wrong-id.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/listen-target-remove.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-arrayremove-cursor.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-arrayremove-where.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-arrayunion-cursor.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-arrayunion-where.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-bad-NaN.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-bad-null.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-docsnap-order.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-docsnap-orderby-name.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-docsnap-where-eq.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-docsnap-where-neq-orderby.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-docsnap-where-neq.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-docsnap.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-endbefore-empty-map.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-endbefore-empty.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-no-order.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-startat-empty-map.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-startat-empty.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-vals-1a.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-vals-1b.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-vals-2.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-vals-docid.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-cursor-vals-last-wins.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-del-cursor.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-del-where.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-invalid-operator.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-invalid-path-order.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-invalid-path-select.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-invalid-path-where.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-offset-limit-last-wins.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-offset-limit.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-order.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-select-empty.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-select-last-wins.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-select.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-st-cursor.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-st-where.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-where-2.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-where-NaN.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-where-null.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-where.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/query-wrong-collection.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-all-transforms.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayremove-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayremove-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayremove-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayremove-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayremove-with-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayremove.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayunion-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayunion-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayunion-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayunion-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayunion-with-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-arrayunion.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-basic.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-complex.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-del-merge-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-del-merge.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-del-mergeall.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-del-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-del-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-del-nomerge.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-del-nonleaf.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-del-wo-merge.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-empty.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-merge-fp.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-merge-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-merge-nonleaf.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-merge-prefix.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-merge-present.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-merge.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-mergeall-empty.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-mergeall-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-mergeall.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-nodel.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-nosplit.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-special-chars.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-alone-mergeall.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-merge-both.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-merge-nonleaf-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-merge-nonleaf.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-merge-nowrite.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-mergeall.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-nomerge.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st-with-empty-map.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/set-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/test-suite.binproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-all-transforms.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayremove-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayremove-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayremove-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayremove-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayremove-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayremove-with-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayremove.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayunion-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayunion-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayunion-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayunion-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayunion-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayunion-with-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-arrayunion.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-badchar.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-basic.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-complex.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-del-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-del-dot.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-del-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-del-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-del-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-del.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-exists-precond.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-fp-empty-component.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-no-paths.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-all-transforms.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayremove-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayremove-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayremove-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayremove-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayremove-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayremove-with-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayremove.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayunion-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayunion-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayunion-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayunion-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayunion-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayunion-with-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-arrayunion.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-basic.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-complex.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-del-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-del-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-del-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-del-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-del.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-exists-precond.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-fp-del.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-fp-dup-transforms.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-fp-dup.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-fp-empty-component.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-fp-empty.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-fp-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-fp-nosplit.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-no-paths.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-prefix-1.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-prefix-2.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-prefix-3.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-special-chars.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-st-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-st-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-st-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-st-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-st-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-st-with-empty-map.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-paths-uptime.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-prefix-1.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-prefix-2.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-prefix-3.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-quoting.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-split-top-level.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-split.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-st-alone.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-st-dot.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-st-multi.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-st-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-st-noarray-nested.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-st-noarray.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-st-with-empty-map.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-st.textproto (100%) rename firestore/tests/unit/{ => v1beta1}/testdata/update-uptime.textproto (100%) diff --git a/firestore/tests/unit/v1beta1/__init__.py b/firestore/tests/unit/v1beta1/__init__.py new file mode 100644 index 000000000000..ab6729095248 --- /dev/null +++ b/firestore/tests/unit/v1beta1/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2017 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/firestore/tests/unit/test__helpers.py b/firestore/tests/unit/v1beta1/test__helpers.py similarity index 100% rename from firestore/tests/unit/test__helpers.py rename to firestore/tests/unit/v1beta1/test__helpers.py diff --git a/firestore/tests/unit/test_batch.py b/firestore/tests/unit/v1beta1/test_batch.py similarity index 100% rename from firestore/tests/unit/test_batch.py rename to firestore/tests/unit/v1beta1/test_batch.py diff --git a/firestore/tests/unit/test_client.py b/firestore/tests/unit/v1beta1/test_client.py similarity index 99% rename from firestore/tests/unit/test_client.py rename to firestore/tests/unit/v1beta1/test_client.py index e3368d2108ad..343f93fc5c16 100644 --- a/firestore/tests/unit/test_client.py +++ b/firestore/tests/unit/v1beta1/test_client.py @@ -25,9 +25,9 @@ class TestClient(unittest.TestCase): @staticmethod def _get_target_class(): - from google.cloud import firestore + from google.cloud.firestore_v1beta1.client import Client - return firestore.Client + return Client def _make_one(self, *args, **kwargs): klass = self._get_target_class() diff --git a/firestore/tests/unit/test_collection.py b/firestore/tests/unit/v1beta1/test_collection.py similarity index 100% rename from firestore/tests/unit/test_collection.py rename to firestore/tests/unit/v1beta1/test_collection.py diff --git a/firestore/tests/unit/test_cross_language.py b/firestore/tests/unit/v1beta1/test_cross_language.py similarity index 100% rename from firestore/tests/unit/test_cross_language.py rename to firestore/tests/unit/v1beta1/test_cross_language.py diff --git a/firestore/tests/unit/test_document.py b/firestore/tests/unit/v1beta1/test_document.py similarity index 100% rename from firestore/tests/unit/test_document.py rename to firestore/tests/unit/v1beta1/test_document.py diff --git a/firestore/tests/unit/test_field_path.py b/firestore/tests/unit/v1beta1/test_field_path.py similarity index 100% rename from firestore/tests/unit/test_field_path.py rename to firestore/tests/unit/v1beta1/test_field_path.py diff --git a/firestore/tests/unit/test_order.py b/firestore/tests/unit/v1beta1/test_order.py similarity index 100% rename from firestore/tests/unit/test_order.py rename to firestore/tests/unit/v1beta1/test_order.py diff --git a/firestore/tests/unit/test_query.py b/firestore/tests/unit/v1beta1/test_query.py similarity index 100% rename from firestore/tests/unit/test_query.py rename to firestore/tests/unit/v1beta1/test_query.py diff --git a/firestore/tests/unit/test_transaction.py b/firestore/tests/unit/v1beta1/test_transaction.py similarity index 100% rename from firestore/tests/unit/test_transaction.py rename to firestore/tests/unit/v1beta1/test_transaction.py diff --git a/firestore/tests/unit/test_transforms.py b/firestore/tests/unit/v1beta1/test_transforms.py similarity index 100% rename from firestore/tests/unit/test_transforms.py rename to firestore/tests/unit/v1beta1/test_transforms.py diff --git a/firestore/tests/unit/test_watch.py b/firestore/tests/unit/v1beta1/test_watch.py similarity index 100% rename from firestore/tests/unit/test_watch.py rename to firestore/tests/unit/v1beta1/test_watch.py diff --git a/firestore/tests/unit/testdata/create-all-transforms.textproto b/firestore/tests/unit/v1beta1/testdata/create-all-transforms.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-all-transforms.textproto rename to firestore/tests/unit/v1beta1/testdata/create-all-transforms.textproto diff --git a/firestore/tests/unit/testdata/create-arrayremove-multi.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayremove-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayremove-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayremove-multi.textproto diff --git a/firestore/tests/unit/testdata/create-arrayremove-nested.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayremove-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayremove-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayremove-nested.textproto diff --git a/firestore/tests/unit/testdata/create-arrayremove-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayremove-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayremove-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayremove-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/create-arrayremove-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayremove-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayremove-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayremove-noarray.textproto diff --git a/firestore/tests/unit/testdata/create-arrayremove-with-st.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayremove-with-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayremove-with-st.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayremove-with-st.textproto diff --git a/firestore/tests/unit/testdata/create-arrayremove.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayremove.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayremove.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayremove.textproto diff --git a/firestore/tests/unit/testdata/create-arrayunion-multi.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayunion-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayunion-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayunion-multi.textproto diff --git a/firestore/tests/unit/testdata/create-arrayunion-nested.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayunion-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayunion-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayunion-nested.textproto diff --git a/firestore/tests/unit/testdata/create-arrayunion-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayunion-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayunion-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayunion-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/create-arrayunion-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayunion-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayunion-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayunion-noarray.textproto diff --git a/firestore/tests/unit/testdata/create-arrayunion-with-st.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayunion-with-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayunion-with-st.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayunion-with-st.textproto diff --git a/firestore/tests/unit/testdata/create-arrayunion.textproto b/firestore/tests/unit/v1beta1/testdata/create-arrayunion.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-arrayunion.textproto rename to firestore/tests/unit/v1beta1/testdata/create-arrayunion.textproto diff --git a/firestore/tests/unit/testdata/create-basic.textproto b/firestore/tests/unit/v1beta1/testdata/create-basic.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-basic.textproto rename to firestore/tests/unit/v1beta1/testdata/create-basic.textproto diff --git a/firestore/tests/unit/testdata/create-complex.textproto b/firestore/tests/unit/v1beta1/testdata/create-complex.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-complex.textproto rename to firestore/tests/unit/v1beta1/testdata/create-complex.textproto diff --git a/firestore/tests/unit/testdata/create-del-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/create-del-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-del-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/create-del-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/create-del-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/create-del-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-del-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/create-del-noarray.textproto diff --git a/firestore/tests/unit/testdata/create-empty.textproto b/firestore/tests/unit/v1beta1/testdata/create-empty.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-empty.textproto rename to firestore/tests/unit/v1beta1/testdata/create-empty.textproto diff --git a/firestore/tests/unit/testdata/create-nodel.textproto b/firestore/tests/unit/v1beta1/testdata/create-nodel.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-nodel.textproto rename to firestore/tests/unit/v1beta1/testdata/create-nodel.textproto diff --git a/firestore/tests/unit/testdata/create-nosplit.textproto b/firestore/tests/unit/v1beta1/testdata/create-nosplit.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-nosplit.textproto rename to firestore/tests/unit/v1beta1/testdata/create-nosplit.textproto diff --git a/firestore/tests/unit/testdata/create-special-chars.textproto b/firestore/tests/unit/v1beta1/testdata/create-special-chars.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-special-chars.textproto rename to firestore/tests/unit/v1beta1/testdata/create-special-chars.textproto diff --git a/firestore/tests/unit/testdata/create-st-alone.textproto b/firestore/tests/unit/v1beta1/testdata/create-st-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-st-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/create-st-alone.textproto diff --git a/firestore/tests/unit/testdata/create-st-multi.textproto b/firestore/tests/unit/v1beta1/testdata/create-st-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-st-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/create-st-multi.textproto diff --git a/firestore/tests/unit/testdata/create-st-nested.textproto b/firestore/tests/unit/v1beta1/testdata/create-st-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-st-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/create-st-nested.textproto diff --git a/firestore/tests/unit/testdata/create-st-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/create-st-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-st-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/create-st-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/create-st-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/create-st-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-st-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/create-st-noarray.textproto diff --git a/firestore/tests/unit/testdata/create-st-with-empty-map.textproto b/firestore/tests/unit/v1beta1/testdata/create-st-with-empty-map.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-st-with-empty-map.textproto rename to firestore/tests/unit/v1beta1/testdata/create-st-with-empty-map.textproto diff --git a/firestore/tests/unit/testdata/create-st.textproto b/firestore/tests/unit/v1beta1/testdata/create-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/create-st.textproto rename to firestore/tests/unit/v1beta1/testdata/create-st.textproto diff --git a/firestore/tests/unit/testdata/delete-exists-precond.textproto b/firestore/tests/unit/v1beta1/testdata/delete-exists-precond.textproto similarity index 100% rename from firestore/tests/unit/testdata/delete-exists-precond.textproto rename to firestore/tests/unit/v1beta1/testdata/delete-exists-precond.textproto diff --git a/firestore/tests/unit/testdata/delete-no-precond.textproto b/firestore/tests/unit/v1beta1/testdata/delete-no-precond.textproto similarity index 100% rename from firestore/tests/unit/testdata/delete-no-precond.textproto rename to firestore/tests/unit/v1beta1/testdata/delete-no-precond.textproto diff --git a/firestore/tests/unit/testdata/delete-time-precond.textproto b/firestore/tests/unit/v1beta1/testdata/delete-time-precond.textproto similarity index 100% rename from firestore/tests/unit/testdata/delete-time-precond.textproto rename to firestore/tests/unit/v1beta1/testdata/delete-time-precond.textproto diff --git a/firestore/tests/unit/testdata/get-basic.textproto b/firestore/tests/unit/v1beta1/testdata/get-basic.textproto similarity index 100% rename from firestore/tests/unit/testdata/get-basic.textproto rename to firestore/tests/unit/v1beta1/testdata/get-basic.textproto diff --git a/firestore/tests/unit/testdata/listen-add-mod-del-add.textproto b/firestore/tests/unit/v1beta1/testdata/listen-add-mod-del-add.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-add-mod-del-add.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-add-mod-del-add.textproto diff --git a/firestore/tests/unit/testdata/listen-add-one.textproto b/firestore/tests/unit/v1beta1/testdata/listen-add-one.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-add-one.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-add-one.textproto diff --git a/firestore/tests/unit/testdata/listen-add-three.textproto b/firestore/tests/unit/v1beta1/testdata/listen-add-three.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-add-three.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-add-three.textproto diff --git a/firestore/tests/unit/testdata/listen-doc-remove.textproto b/firestore/tests/unit/v1beta1/testdata/listen-doc-remove.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-doc-remove.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-doc-remove.textproto diff --git a/firestore/tests/unit/testdata/listen-empty.textproto b/firestore/tests/unit/v1beta1/testdata/listen-empty.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-empty.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-empty.textproto diff --git a/firestore/tests/unit/testdata/listen-filter-nop.textproto b/firestore/tests/unit/v1beta1/testdata/listen-filter-nop.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-filter-nop.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-filter-nop.textproto diff --git a/firestore/tests/unit/testdata/listen-multi-docs.textproto b/firestore/tests/unit/v1beta1/testdata/listen-multi-docs.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-multi-docs.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-multi-docs.textproto diff --git a/firestore/tests/unit/testdata/listen-nocurrent.textproto b/firestore/tests/unit/v1beta1/testdata/listen-nocurrent.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-nocurrent.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-nocurrent.textproto diff --git a/firestore/tests/unit/testdata/listen-nomod.textproto b/firestore/tests/unit/v1beta1/testdata/listen-nomod.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-nomod.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-nomod.textproto diff --git a/firestore/tests/unit/testdata/listen-removed-target-ids.textproto b/firestore/tests/unit/v1beta1/testdata/listen-removed-target-ids.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-removed-target-ids.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-removed-target-ids.textproto diff --git a/firestore/tests/unit/testdata/listen-reset.textproto b/firestore/tests/unit/v1beta1/testdata/listen-reset.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-reset.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-reset.textproto diff --git a/firestore/tests/unit/testdata/listen-target-add-nop.textproto b/firestore/tests/unit/v1beta1/testdata/listen-target-add-nop.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-target-add-nop.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-target-add-nop.textproto diff --git a/firestore/tests/unit/testdata/listen-target-add-wrong-id.textproto b/firestore/tests/unit/v1beta1/testdata/listen-target-add-wrong-id.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-target-add-wrong-id.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-target-add-wrong-id.textproto diff --git a/firestore/tests/unit/testdata/listen-target-remove.textproto b/firestore/tests/unit/v1beta1/testdata/listen-target-remove.textproto similarity index 100% rename from firestore/tests/unit/testdata/listen-target-remove.textproto rename to firestore/tests/unit/v1beta1/testdata/listen-target-remove.textproto diff --git a/firestore/tests/unit/testdata/query-arrayremove-cursor.textproto b/firestore/tests/unit/v1beta1/testdata/query-arrayremove-cursor.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-arrayremove-cursor.textproto rename to firestore/tests/unit/v1beta1/testdata/query-arrayremove-cursor.textproto diff --git a/firestore/tests/unit/testdata/query-arrayremove-where.textproto b/firestore/tests/unit/v1beta1/testdata/query-arrayremove-where.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-arrayremove-where.textproto rename to firestore/tests/unit/v1beta1/testdata/query-arrayremove-where.textproto diff --git a/firestore/tests/unit/testdata/query-arrayunion-cursor.textproto b/firestore/tests/unit/v1beta1/testdata/query-arrayunion-cursor.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-arrayunion-cursor.textproto rename to firestore/tests/unit/v1beta1/testdata/query-arrayunion-cursor.textproto diff --git a/firestore/tests/unit/testdata/query-arrayunion-where.textproto b/firestore/tests/unit/v1beta1/testdata/query-arrayunion-where.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-arrayunion-where.textproto rename to firestore/tests/unit/v1beta1/testdata/query-arrayunion-where.textproto diff --git a/firestore/tests/unit/testdata/query-bad-NaN.textproto b/firestore/tests/unit/v1beta1/testdata/query-bad-NaN.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-bad-NaN.textproto rename to firestore/tests/unit/v1beta1/testdata/query-bad-NaN.textproto diff --git a/firestore/tests/unit/testdata/query-bad-null.textproto b/firestore/tests/unit/v1beta1/testdata/query-bad-null.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-bad-null.textproto rename to firestore/tests/unit/v1beta1/testdata/query-bad-null.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-docsnap-order.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-order.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-docsnap-order.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-order.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-docsnap-orderby-name.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-orderby-name.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-docsnap-orderby-name.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-orderby-name.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-docsnap-where-eq.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-where-eq.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-docsnap-where-eq.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-where-eq.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-docsnap-where-neq-orderby.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-where-neq-orderby.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-docsnap-where-neq-orderby.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-where-neq-orderby.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-docsnap-where-neq.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-where-neq.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-docsnap-where-neq.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap-where-neq.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-docsnap.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-docsnap.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-docsnap.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-endbefore-empty-map.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-endbefore-empty-map.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-endbefore-empty-map.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-endbefore-empty-map.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-endbefore-empty.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-endbefore-empty.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-endbefore-empty.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-endbefore-empty.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-no-order.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-no-order.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-no-order.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-no-order.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-startat-empty-map.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-startat-empty-map.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-startat-empty-map.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-startat-empty-map.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-startat-empty.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-startat-empty.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-startat-empty.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-startat-empty.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-vals-1a.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-vals-1a.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-vals-1a.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-vals-1a.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-vals-1b.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-vals-1b.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-vals-1b.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-vals-1b.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-vals-2.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-vals-2.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-vals-2.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-vals-2.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-vals-docid.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-vals-docid.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-vals-docid.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-vals-docid.textproto diff --git a/firestore/tests/unit/testdata/query-cursor-vals-last-wins.textproto b/firestore/tests/unit/v1beta1/testdata/query-cursor-vals-last-wins.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-cursor-vals-last-wins.textproto rename to firestore/tests/unit/v1beta1/testdata/query-cursor-vals-last-wins.textproto diff --git a/firestore/tests/unit/testdata/query-del-cursor.textproto b/firestore/tests/unit/v1beta1/testdata/query-del-cursor.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-del-cursor.textproto rename to firestore/tests/unit/v1beta1/testdata/query-del-cursor.textproto diff --git a/firestore/tests/unit/testdata/query-del-where.textproto b/firestore/tests/unit/v1beta1/testdata/query-del-where.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-del-where.textproto rename to firestore/tests/unit/v1beta1/testdata/query-del-where.textproto diff --git a/firestore/tests/unit/testdata/query-invalid-operator.textproto b/firestore/tests/unit/v1beta1/testdata/query-invalid-operator.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-invalid-operator.textproto rename to firestore/tests/unit/v1beta1/testdata/query-invalid-operator.textproto diff --git a/firestore/tests/unit/testdata/query-invalid-path-order.textproto b/firestore/tests/unit/v1beta1/testdata/query-invalid-path-order.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-invalid-path-order.textproto rename to firestore/tests/unit/v1beta1/testdata/query-invalid-path-order.textproto diff --git a/firestore/tests/unit/testdata/query-invalid-path-select.textproto b/firestore/tests/unit/v1beta1/testdata/query-invalid-path-select.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-invalid-path-select.textproto rename to firestore/tests/unit/v1beta1/testdata/query-invalid-path-select.textproto diff --git a/firestore/tests/unit/testdata/query-invalid-path-where.textproto b/firestore/tests/unit/v1beta1/testdata/query-invalid-path-where.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-invalid-path-where.textproto rename to firestore/tests/unit/v1beta1/testdata/query-invalid-path-where.textproto diff --git a/firestore/tests/unit/testdata/query-offset-limit-last-wins.textproto b/firestore/tests/unit/v1beta1/testdata/query-offset-limit-last-wins.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-offset-limit-last-wins.textproto rename to firestore/tests/unit/v1beta1/testdata/query-offset-limit-last-wins.textproto diff --git a/firestore/tests/unit/testdata/query-offset-limit.textproto b/firestore/tests/unit/v1beta1/testdata/query-offset-limit.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-offset-limit.textproto rename to firestore/tests/unit/v1beta1/testdata/query-offset-limit.textproto diff --git a/firestore/tests/unit/testdata/query-order.textproto b/firestore/tests/unit/v1beta1/testdata/query-order.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-order.textproto rename to firestore/tests/unit/v1beta1/testdata/query-order.textproto diff --git a/firestore/tests/unit/testdata/query-select-empty.textproto b/firestore/tests/unit/v1beta1/testdata/query-select-empty.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-select-empty.textproto rename to firestore/tests/unit/v1beta1/testdata/query-select-empty.textproto diff --git a/firestore/tests/unit/testdata/query-select-last-wins.textproto b/firestore/tests/unit/v1beta1/testdata/query-select-last-wins.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-select-last-wins.textproto rename to firestore/tests/unit/v1beta1/testdata/query-select-last-wins.textproto diff --git a/firestore/tests/unit/testdata/query-select.textproto b/firestore/tests/unit/v1beta1/testdata/query-select.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-select.textproto rename to firestore/tests/unit/v1beta1/testdata/query-select.textproto diff --git a/firestore/tests/unit/testdata/query-st-cursor.textproto b/firestore/tests/unit/v1beta1/testdata/query-st-cursor.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-st-cursor.textproto rename to firestore/tests/unit/v1beta1/testdata/query-st-cursor.textproto diff --git a/firestore/tests/unit/testdata/query-st-where.textproto b/firestore/tests/unit/v1beta1/testdata/query-st-where.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-st-where.textproto rename to firestore/tests/unit/v1beta1/testdata/query-st-where.textproto diff --git a/firestore/tests/unit/testdata/query-where-2.textproto b/firestore/tests/unit/v1beta1/testdata/query-where-2.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-where-2.textproto rename to firestore/tests/unit/v1beta1/testdata/query-where-2.textproto diff --git a/firestore/tests/unit/testdata/query-where-NaN.textproto b/firestore/tests/unit/v1beta1/testdata/query-where-NaN.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-where-NaN.textproto rename to firestore/tests/unit/v1beta1/testdata/query-where-NaN.textproto diff --git a/firestore/tests/unit/testdata/query-where-null.textproto b/firestore/tests/unit/v1beta1/testdata/query-where-null.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-where-null.textproto rename to firestore/tests/unit/v1beta1/testdata/query-where-null.textproto diff --git a/firestore/tests/unit/testdata/query-where.textproto b/firestore/tests/unit/v1beta1/testdata/query-where.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-where.textproto rename to firestore/tests/unit/v1beta1/testdata/query-where.textproto diff --git a/firestore/tests/unit/testdata/query-wrong-collection.textproto b/firestore/tests/unit/v1beta1/testdata/query-wrong-collection.textproto similarity index 100% rename from firestore/tests/unit/testdata/query-wrong-collection.textproto rename to firestore/tests/unit/v1beta1/testdata/query-wrong-collection.textproto diff --git a/firestore/tests/unit/testdata/set-all-transforms.textproto b/firestore/tests/unit/v1beta1/testdata/set-all-transforms.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-all-transforms.textproto rename to firestore/tests/unit/v1beta1/testdata/set-all-transforms.textproto diff --git a/firestore/tests/unit/testdata/set-arrayremove-multi.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayremove-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayremove-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayremove-multi.textproto diff --git a/firestore/tests/unit/testdata/set-arrayremove-nested.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayremove-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayremove-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayremove-nested.textproto diff --git a/firestore/tests/unit/testdata/set-arrayremove-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayremove-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayremove-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayremove-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/set-arrayremove-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayremove-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayremove-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayremove-noarray.textproto diff --git a/firestore/tests/unit/testdata/set-arrayremove-with-st.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayremove-with-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayremove-with-st.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayremove-with-st.textproto diff --git a/firestore/tests/unit/testdata/set-arrayremove.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayremove.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayremove.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayremove.textproto diff --git a/firestore/tests/unit/testdata/set-arrayunion-multi.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayunion-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayunion-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayunion-multi.textproto diff --git a/firestore/tests/unit/testdata/set-arrayunion-nested.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayunion-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayunion-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayunion-nested.textproto diff --git a/firestore/tests/unit/testdata/set-arrayunion-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayunion-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayunion-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayunion-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/set-arrayunion-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayunion-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayunion-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayunion-noarray.textproto diff --git a/firestore/tests/unit/testdata/set-arrayunion-with-st.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayunion-with-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayunion-with-st.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayunion-with-st.textproto diff --git a/firestore/tests/unit/testdata/set-arrayunion.textproto b/firestore/tests/unit/v1beta1/testdata/set-arrayunion.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-arrayunion.textproto rename to firestore/tests/unit/v1beta1/testdata/set-arrayunion.textproto diff --git a/firestore/tests/unit/testdata/set-basic.textproto b/firestore/tests/unit/v1beta1/testdata/set-basic.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-basic.textproto rename to firestore/tests/unit/v1beta1/testdata/set-basic.textproto diff --git a/firestore/tests/unit/testdata/set-complex.textproto b/firestore/tests/unit/v1beta1/testdata/set-complex.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-complex.textproto rename to firestore/tests/unit/v1beta1/testdata/set-complex.textproto diff --git a/firestore/tests/unit/testdata/set-del-merge-alone.textproto b/firestore/tests/unit/v1beta1/testdata/set-del-merge-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-del-merge-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/set-del-merge-alone.textproto diff --git a/firestore/tests/unit/testdata/set-del-merge.textproto b/firestore/tests/unit/v1beta1/testdata/set-del-merge.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-del-merge.textproto rename to firestore/tests/unit/v1beta1/testdata/set-del-merge.textproto diff --git a/firestore/tests/unit/testdata/set-del-mergeall.textproto b/firestore/tests/unit/v1beta1/testdata/set-del-mergeall.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-del-mergeall.textproto rename to firestore/tests/unit/v1beta1/testdata/set-del-mergeall.textproto diff --git a/firestore/tests/unit/testdata/set-del-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/set-del-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-del-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/set-del-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/set-del-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/set-del-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-del-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/set-del-noarray.textproto diff --git a/firestore/tests/unit/testdata/set-del-nomerge.textproto b/firestore/tests/unit/v1beta1/testdata/set-del-nomerge.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-del-nomerge.textproto rename to firestore/tests/unit/v1beta1/testdata/set-del-nomerge.textproto diff --git a/firestore/tests/unit/testdata/set-del-nonleaf.textproto b/firestore/tests/unit/v1beta1/testdata/set-del-nonleaf.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-del-nonleaf.textproto rename to firestore/tests/unit/v1beta1/testdata/set-del-nonleaf.textproto diff --git a/firestore/tests/unit/testdata/set-del-wo-merge.textproto b/firestore/tests/unit/v1beta1/testdata/set-del-wo-merge.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-del-wo-merge.textproto rename to firestore/tests/unit/v1beta1/testdata/set-del-wo-merge.textproto diff --git a/firestore/tests/unit/testdata/set-empty.textproto b/firestore/tests/unit/v1beta1/testdata/set-empty.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-empty.textproto rename to firestore/tests/unit/v1beta1/testdata/set-empty.textproto diff --git a/firestore/tests/unit/testdata/set-merge-fp.textproto b/firestore/tests/unit/v1beta1/testdata/set-merge-fp.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-merge-fp.textproto rename to firestore/tests/unit/v1beta1/testdata/set-merge-fp.textproto diff --git a/firestore/tests/unit/testdata/set-merge-nested.textproto b/firestore/tests/unit/v1beta1/testdata/set-merge-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-merge-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/set-merge-nested.textproto diff --git a/firestore/tests/unit/testdata/set-merge-nonleaf.textproto b/firestore/tests/unit/v1beta1/testdata/set-merge-nonleaf.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-merge-nonleaf.textproto rename to firestore/tests/unit/v1beta1/testdata/set-merge-nonleaf.textproto diff --git a/firestore/tests/unit/testdata/set-merge-prefix.textproto b/firestore/tests/unit/v1beta1/testdata/set-merge-prefix.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-merge-prefix.textproto rename to firestore/tests/unit/v1beta1/testdata/set-merge-prefix.textproto diff --git a/firestore/tests/unit/testdata/set-merge-present.textproto b/firestore/tests/unit/v1beta1/testdata/set-merge-present.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-merge-present.textproto rename to firestore/tests/unit/v1beta1/testdata/set-merge-present.textproto diff --git a/firestore/tests/unit/testdata/set-merge.textproto b/firestore/tests/unit/v1beta1/testdata/set-merge.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-merge.textproto rename to firestore/tests/unit/v1beta1/testdata/set-merge.textproto diff --git a/firestore/tests/unit/testdata/set-mergeall-empty.textproto b/firestore/tests/unit/v1beta1/testdata/set-mergeall-empty.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-mergeall-empty.textproto rename to firestore/tests/unit/v1beta1/testdata/set-mergeall-empty.textproto diff --git a/firestore/tests/unit/testdata/set-mergeall-nested.textproto b/firestore/tests/unit/v1beta1/testdata/set-mergeall-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-mergeall-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/set-mergeall-nested.textproto diff --git a/firestore/tests/unit/testdata/set-mergeall.textproto b/firestore/tests/unit/v1beta1/testdata/set-mergeall.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-mergeall.textproto rename to firestore/tests/unit/v1beta1/testdata/set-mergeall.textproto diff --git a/firestore/tests/unit/testdata/set-nodel.textproto b/firestore/tests/unit/v1beta1/testdata/set-nodel.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-nodel.textproto rename to firestore/tests/unit/v1beta1/testdata/set-nodel.textproto diff --git a/firestore/tests/unit/testdata/set-nosplit.textproto b/firestore/tests/unit/v1beta1/testdata/set-nosplit.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-nosplit.textproto rename to firestore/tests/unit/v1beta1/testdata/set-nosplit.textproto diff --git a/firestore/tests/unit/testdata/set-special-chars.textproto b/firestore/tests/unit/v1beta1/testdata/set-special-chars.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-special-chars.textproto rename to firestore/tests/unit/v1beta1/testdata/set-special-chars.textproto diff --git a/firestore/tests/unit/testdata/set-st-alone-mergeall.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-alone-mergeall.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-alone-mergeall.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-alone-mergeall.textproto diff --git a/firestore/tests/unit/testdata/set-st-alone.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-alone.textproto diff --git a/firestore/tests/unit/testdata/set-st-merge-both.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-merge-both.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-merge-both.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-merge-both.textproto diff --git a/firestore/tests/unit/testdata/set-st-merge-nonleaf-alone.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-merge-nonleaf-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-merge-nonleaf-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-merge-nonleaf-alone.textproto diff --git a/firestore/tests/unit/testdata/set-st-merge-nonleaf.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-merge-nonleaf.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-merge-nonleaf.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-merge-nonleaf.textproto diff --git a/firestore/tests/unit/testdata/set-st-merge-nowrite.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-merge-nowrite.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-merge-nowrite.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-merge-nowrite.textproto diff --git a/firestore/tests/unit/testdata/set-st-mergeall.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-mergeall.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-mergeall.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-mergeall.textproto diff --git a/firestore/tests/unit/testdata/set-st-multi.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-multi.textproto diff --git a/firestore/tests/unit/testdata/set-st-nested.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-nested.textproto diff --git a/firestore/tests/unit/testdata/set-st-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/set-st-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-noarray.textproto diff --git a/firestore/tests/unit/testdata/set-st-nomerge.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-nomerge.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-nomerge.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-nomerge.textproto diff --git a/firestore/tests/unit/testdata/set-st-with-empty-map.textproto b/firestore/tests/unit/v1beta1/testdata/set-st-with-empty-map.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st-with-empty-map.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st-with-empty-map.textproto diff --git a/firestore/tests/unit/testdata/set-st.textproto b/firestore/tests/unit/v1beta1/testdata/set-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/set-st.textproto rename to firestore/tests/unit/v1beta1/testdata/set-st.textproto diff --git a/firestore/tests/unit/testdata/test-suite.binproto b/firestore/tests/unit/v1beta1/testdata/test-suite.binproto similarity index 100% rename from firestore/tests/unit/testdata/test-suite.binproto rename to firestore/tests/unit/v1beta1/testdata/test-suite.binproto diff --git a/firestore/tests/unit/testdata/update-all-transforms.textproto b/firestore/tests/unit/v1beta1/testdata/update-all-transforms.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-all-transforms.textproto rename to firestore/tests/unit/v1beta1/testdata/update-all-transforms.textproto diff --git a/firestore/tests/unit/testdata/update-arrayremove-alone.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayremove-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayremove-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayremove-alone.textproto diff --git a/firestore/tests/unit/testdata/update-arrayremove-multi.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayremove-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayremove-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayremove-multi.textproto diff --git a/firestore/tests/unit/testdata/update-arrayremove-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayremove-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayremove-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayremove-nested.textproto diff --git a/firestore/tests/unit/testdata/update-arrayremove-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayremove-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayremove-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayremove-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/update-arrayremove-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayremove-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayremove-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayremove-noarray.textproto diff --git a/firestore/tests/unit/testdata/update-arrayremove-with-st.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayremove-with-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayremove-with-st.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayremove-with-st.textproto diff --git a/firestore/tests/unit/testdata/update-arrayremove.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayremove.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayremove.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayremove.textproto diff --git a/firestore/tests/unit/testdata/update-arrayunion-alone.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayunion-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayunion-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayunion-alone.textproto diff --git a/firestore/tests/unit/testdata/update-arrayunion-multi.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayunion-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayunion-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayunion-multi.textproto diff --git a/firestore/tests/unit/testdata/update-arrayunion-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayunion-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayunion-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayunion-nested.textproto diff --git a/firestore/tests/unit/testdata/update-arrayunion-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayunion-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayunion-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayunion-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/update-arrayunion-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayunion-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayunion-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayunion-noarray.textproto diff --git a/firestore/tests/unit/testdata/update-arrayunion-with-st.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayunion-with-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayunion-with-st.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayunion-with-st.textproto diff --git a/firestore/tests/unit/testdata/update-arrayunion.textproto b/firestore/tests/unit/v1beta1/testdata/update-arrayunion.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-arrayunion.textproto rename to firestore/tests/unit/v1beta1/testdata/update-arrayunion.textproto diff --git a/firestore/tests/unit/testdata/update-badchar.textproto b/firestore/tests/unit/v1beta1/testdata/update-badchar.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-badchar.textproto rename to firestore/tests/unit/v1beta1/testdata/update-badchar.textproto diff --git a/firestore/tests/unit/testdata/update-basic.textproto b/firestore/tests/unit/v1beta1/testdata/update-basic.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-basic.textproto rename to firestore/tests/unit/v1beta1/testdata/update-basic.textproto diff --git a/firestore/tests/unit/testdata/update-complex.textproto b/firestore/tests/unit/v1beta1/testdata/update-complex.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-complex.textproto rename to firestore/tests/unit/v1beta1/testdata/update-complex.textproto diff --git a/firestore/tests/unit/testdata/update-del-alone.textproto b/firestore/tests/unit/v1beta1/testdata/update-del-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-del-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/update-del-alone.textproto diff --git a/firestore/tests/unit/testdata/update-del-dot.textproto b/firestore/tests/unit/v1beta1/testdata/update-del-dot.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-del-dot.textproto rename to firestore/tests/unit/v1beta1/testdata/update-del-dot.textproto diff --git a/firestore/tests/unit/testdata/update-del-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-del-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-del-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-del-nested.textproto diff --git a/firestore/tests/unit/testdata/update-del-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-del-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-del-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-del-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/update-del-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/update-del-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-del-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/update-del-noarray.textproto diff --git a/firestore/tests/unit/testdata/update-del.textproto b/firestore/tests/unit/v1beta1/testdata/update-del.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-del.textproto rename to firestore/tests/unit/v1beta1/testdata/update-del.textproto diff --git a/firestore/tests/unit/testdata/update-exists-precond.textproto b/firestore/tests/unit/v1beta1/testdata/update-exists-precond.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-exists-precond.textproto rename to firestore/tests/unit/v1beta1/testdata/update-exists-precond.textproto diff --git a/firestore/tests/unit/testdata/update-fp-empty-component.textproto b/firestore/tests/unit/v1beta1/testdata/update-fp-empty-component.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-fp-empty-component.textproto rename to firestore/tests/unit/v1beta1/testdata/update-fp-empty-component.textproto diff --git a/firestore/tests/unit/testdata/update-no-paths.textproto b/firestore/tests/unit/v1beta1/testdata/update-no-paths.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-no-paths.textproto rename to firestore/tests/unit/v1beta1/testdata/update-no-paths.textproto diff --git a/firestore/tests/unit/testdata/update-paths-all-transforms.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-all-transforms.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-all-transforms.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-all-transforms.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayremove-alone.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayremove-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-alone.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayremove-multi.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayremove-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-multi.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayremove-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayremove-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-nested.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayremove-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayremove-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayremove-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayremove-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-noarray.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayremove-with-st.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-with-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayremove-with-st.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove-with-st.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayremove.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayremove.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayremove.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayunion-alone.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayunion-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-alone.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayunion-multi.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayunion-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-multi.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayunion-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayunion-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-nested.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayunion-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayunion-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayunion-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayunion-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-noarray.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayunion-with-st.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-with-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayunion-with-st.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion-with-st.textproto diff --git a/firestore/tests/unit/testdata/update-paths-arrayunion.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-arrayunion.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-arrayunion.textproto diff --git a/firestore/tests/unit/testdata/update-paths-basic.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-basic.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-basic.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-basic.textproto diff --git a/firestore/tests/unit/testdata/update-paths-complex.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-complex.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-complex.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-complex.textproto diff --git a/firestore/tests/unit/testdata/update-paths-del-alone.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-del-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-del-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-del-alone.textproto diff --git a/firestore/tests/unit/testdata/update-paths-del-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-del-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-del-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-del-nested.textproto diff --git a/firestore/tests/unit/testdata/update-paths-del-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-del-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-del-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-del-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/update-paths-del-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-del-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-del-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-del-noarray.textproto diff --git a/firestore/tests/unit/testdata/update-paths-del.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-del.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-del.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-del.textproto diff --git a/firestore/tests/unit/testdata/update-paths-exists-precond.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-exists-precond.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-exists-precond.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-exists-precond.textproto diff --git a/firestore/tests/unit/testdata/update-paths-fp-del.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-fp-del.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-fp-del.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-fp-del.textproto diff --git a/firestore/tests/unit/testdata/update-paths-fp-dup-transforms.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-fp-dup-transforms.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-fp-dup-transforms.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-fp-dup-transforms.textproto diff --git a/firestore/tests/unit/testdata/update-paths-fp-dup.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-fp-dup.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-fp-dup.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-fp-dup.textproto diff --git a/firestore/tests/unit/testdata/update-paths-fp-empty-component.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-fp-empty-component.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-fp-empty-component.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-fp-empty-component.textproto diff --git a/firestore/tests/unit/testdata/update-paths-fp-empty.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-fp-empty.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-fp-empty.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-fp-empty.textproto diff --git a/firestore/tests/unit/testdata/update-paths-fp-multi.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-fp-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-fp-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-fp-multi.textproto diff --git a/firestore/tests/unit/testdata/update-paths-fp-nosplit.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-fp-nosplit.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-fp-nosplit.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-fp-nosplit.textproto diff --git a/firestore/tests/unit/testdata/update-paths-no-paths.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-no-paths.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-no-paths.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-no-paths.textproto diff --git a/firestore/tests/unit/testdata/update-paths-prefix-1.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-prefix-1.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-prefix-1.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-prefix-1.textproto diff --git a/firestore/tests/unit/testdata/update-paths-prefix-2.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-prefix-2.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-prefix-2.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-prefix-2.textproto diff --git a/firestore/tests/unit/testdata/update-paths-prefix-3.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-prefix-3.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-prefix-3.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-prefix-3.textproto diff --git a/firestore/tests/unit/testdata/update-paths-special-chars.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-special-chars.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-special-chars.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-special-chars.textproto diff --git a/firestore/tests/unit/testdata/update-paths-st-alone.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-st-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-st-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-st-alone.textproto diff --git a/firestore/tests/unit/testdata/update-paths-st-multi.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-st-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-st-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-st-multi.textproto diff --git a/firestore/tests/unit/testdata/update-paths-st-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-st-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-st-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-st-nested.textproto diff --git a/firestore/tests/unit/testdata/update-paths-st-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-st-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-st-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-st-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/update-paths-st-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-st-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-st-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-st-noarray.textproto diff --git a/firestore/tests/unit/testdata/update-paths-st-with-empty-map.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-st-with-empty-map.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-st-with-empty-map.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-st-with-empty-map.textproto diff --git a/firestore/tests/unit/testdata/update-paths-st.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-st.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-st.textproto diff --git a/firestore/tests/unit/testdata/update-paths-uptime.textproto b/firestore/tests/unit/v1beta1/testdata/update-paths-uptime.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-paths-uptime.textproto rename to firestore/tests/unit/v1beta1/testdata/update-paths-uptime.textproto diff --git a/firestore/tests/unit/testdata/update-prefix-1.textproto b/firestore/tests/unit/v1beta1/testdata/update-prefix-1.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-prefix-1.textproto rename to firestore/tests/unit/v1beta1/testdata/update-prefix-1.textproto diff --git a/firestore/tests/unit/testdata/update-prefix-2.textproto b/firestore/tests/unit/v1beta1/testdata/update-prefix-2.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-prefix-2.textproto rename to firestore/tests/unit/v1beta1/testdata/update-prefix-2.textproto diff --git a/firestore/tests/unit/testdata/update-prefix-3.textproto b/firestore/tests/unit/v1beta1/testdata/update-prefix-3.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-prefix-3.textproto rename to firestore/tests/unit/v1beta1/testdata/update-prefix-3.textproto diff --git a/firestore/tests/unit/testdata/update-quoting.textproto b/firestore/tests/unit/v1beta1/testdata/update-quoting.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-quoting.textproto rename to firestore/tests/unit/v1beta1/testdata/update-quoting.textproto diff --git a/firestore/tests/unit/testdata/update-split-top-level.textproto b/firestore/tests/unit/v1beta1/testdata/update-split-top-level.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-split-top-level.textproto rename to firestore/tests/unit/v1beta1/testdata/update-split-top-level.textproto diff --git a/firestore/tests/unit/testdata/update-split.textproto b/firestore/tests/unit/v1beta1/testdata/update-split.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-split.textproto rename to firestore/tests/unit/v1beta1/testdata/update-split.textproto diff --git a/firestore/tests/unit/testdata/update-st-alone.textproto b/firestore/tests/unit/v1beta1/testdata/update-st-alone.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-st-alone.textproto rename to firestore/tests/unit/v1beta1/testdata/update-st-alone.textproto diff --git a/firestore/tests/unit/testdata/update-st-dot.textproto b/firestore/tests/unit/v1beta1/testdata/update-st-dot.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-st-dot.textproto rename to firestore/tests/unit/v1beta1/testdata/update-st-dot.textproto diff --git a/firestore/tests/unit/testdata/update-st-multi.textproto b/firestore/tests/unit/v1beta1/testdata/update-st-multi.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-st-multi.textproto rename to firestore/tests/unit/v1beta1/testdata/update-st-multi.textproto diff --git a/firestore/tests/unit/testdata/update-st-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-st-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-st-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-st-nested.textproto diff --git a/firestore/tests/unit/testdata/update-st-noarray-nested.textproto b/firestore/tests/unit/v1beta1/testdata/update-st-noarray-nested.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-st-noarray-nested.textproto rename to firestore/tests/unit/v1beta1/testdata/update-st-noarray-nested.textproto diff --git a/firestore/tests/unit/testdata/update-st-noarray.textproto b/firestore/tests/unit/v1beta1/testdata/update-st-noarray.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-st-noarray.textproto rename to firestore/tests/unit/v1beta1/testdata/update-st-noarray.textproto diff --git a/firestore/tests/unit/testdata/update-st-with-empty-map.textproto b/firestore/tests/unit/v1beta1/testdata/update-st-with-empty-map.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-st-with-empty-map.textproto rename to firestore/tests/unit/v1beta1/testdata/update-st-with-empty-map.textproto diff --git a/firestore/tests/unit/testdata/update-st.textproto b/firestore/tests/unit/v1beta1/testdata/update-st.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-st.textproto rename to firestore/tests/unit/v1beta1/testdata/update-st.textproto diff --git a/firestore/tests/unit/testdata/update-uptime.textproto b/firestore/tests/unit/v1beta1/testdata/update-uptime.textproto similarity index 100% rename from firestore/tests/unit/testdata/update-uptime.textproto rename to firestore/tests/unit/v1beta1/testdata/update-uptime.textproto From 01d8de7f2002c3412e3f8b0f3d9a0e93054159a2 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 4 Mar 2019 14:55:58 -0500 Subject: [PATCH 2/2] Use dead-reckoning to find conformance test files. --- firestore/tests/unit/v1beta1/test_cross_language.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/firestore/tests/unit/v1beta1/test_cross_language.py b/firestore/tests/unit/v1beta1/test_cross_language.py index 448ab6ff8cdf..a5c5a8875009 100644 --- a/firestore/tests/unit/v1beta1/test_cross_language.py +++ b/firestore/tests/unit/v1beta1/test_cross_language.py @@ -37,10 +37,10 @@ def _load_testproto(filename): return test_proto -ALL_TESTPROTOS = [ - _load_testproto(filename) - for filename in sorted(glob.glob("tests/unit/testdata/*.textproto")) -] +_here = os.path.dirname(__file__) +_glob_expr = "{}/testdata/*.textproto".format(_here) +_globs = glob.glob(_glob_expr) +ALL_TESTPROTOS = [_load_testproto(filename) for filename in sorted(_globs)] _CREATE_TESTPROTOS = [ test_proto