Firestore: Improve Android tests to use the new env() helper function rather than creating an Env on the stack #1357
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Many of the Firestore integration tests for Android need an instance of
jni::Env. The usual solution is create an instance as a local variable by simply declaringjni::Env env. This is a bit annoying because it adds clutter to the source code. Additionally,jni::Envinstances are not allowed to be shared between threads, and having a local variable makes it easy to accidentally share instances with other threads.To fix this,
FirestoreAndroidIntegrationTestgains a new static member function namedenv()that returns a reference to an instance ofjni::Env. By using athread_localvariable, it ensures that each thread gets its own instance. Then, (almost) all occurrences ofjni::Env envhave been removed from the tests, and where an instance was needed it just calls theenv()function.