-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Add initial infrastructure for FragmentStrictMode #123
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
simonschiller
wants to merge
10
commits into
androidx:androidx-main
from
simonschiller:feature/fragment-strict-mode-infra
Closed
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
83ba730
Add FragmentStrictMode infrastructure
simonschiller 34daacc
Fix API issues
simonschiller 813359d
Regenerate API description
simonschiller 6b08f81
Fix errors in comments
simonschiller 717264a
Throw exception on violation, instead of killing process
simonschiller 0410dfc
Use StrictFragment in tests
simonschiller 959a20c
Log name of violating fragment
simonschiller ecf27e1
Regenerate API
simonschiller f9ae6e8
Clarify on which thread FragmentStrictMode listeners will be called
simonschiller e79ad8e
Fix Ktlint issues
simonschiller File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
.../fragment/src/androidTest/java/androidx/fragment/app/strictmode/FragmentStrictModeTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * Copyright 2021 The Android Open Source Project | ||
| * | ||
| * 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. | ||
| */ | ||
|
|
||
| package androidx.fragment.app.strictmode | ||
|
|
||
| import androidx.fragment.app.StrictFragment | ||
| import androidx.fragment.app.executePendingTransactions | ||
| import androidx.fragment.app.test.FragmentTestActivity | ||
| import androidx.test.core.app.ActivityScenario | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import androidx.test.filters.MediumTest | ||
| import androidx.testutils.withActivity | ||
| import com.google.common.truth.Truth.assertThat | ||
| import com.google.common.truth.Truth.assertWithMessage | ||
| import org.junit.After | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
|
|
||
| @MediumTest | ||
| @RunWith(AndroidJUnit4::class) | ||
| public class FragmentStrictModeTest { | ||
| private lateinit var originalPolicy: FragmentStrictMode.Policy | ||
|
|
||
| @Before | ||
| public fun setup() { | ||
| originalPolicy = FragmentStrictMode.getDefaultPolicy() | ||
| } | ||
|
|
||
| @After | ||
| public fun teardown() { | ||
| FragmentStrictMode.setDefaultPolicy(originalPolicy) | ||
| } | ||
|
|
||
| @Test | ||
| public fun penaltyDeath() { | ||
| val policy = FragmentStrictMode.Policy.Builder() | ||
| .penaltyDeath() | ||
| .build() | ||
| FragmentStrictMode.setDefaultPolicy(policy) | ||
|
|
||
| var violation: Violation? = null | ||
| try { | ||
| FragmentStrictMode.onPolicyViolation(StrictFragment(), object : Violation() {}) | ||
| } catch (thrown: Violation) { | ||
| violation = thrown | ||
| } | ||
| assertWithMessage("No exception thrown on policy violation").that(violation).isNotNull() | ||
| } | ||
|
|
||
| @Test | ||
| public fun policyHierarchy() { | ||
| var lastTriggeredPolicy = "" | ||
| val violation = object : Violation() {} | ||
|
|
||
| fun policy(name: String) = FragmentStrictMode.Policy.Builder() | ||
| .penaltyListener { lastTriggeredPolicy = name } | ||
| .build() | ||
|
|
||
| with(ActivityScenario.launch(FragmentTestActivity::class.java)) { | ||
| val fragmentManager = withActivity { supportFragmentManager } | ||
|
|
||
| val parentFragment = StrictFragment() | ||
| fragmentManager.beginTransaction() | ||
| .add(parentFragment, "parentFragment") | ||
| .commit() | ||
| executePendingTransactions() | ||
|
|
||
| val childFragment = StrictFragment() | ||
| parentFragment.childFragmentManager.beginTransaction() | ||
| .add(childFragment, "childFragment") | ||
| .commit() | ||
| executePendingTransactions() | ||
|
|
||
| FragmentStrictMode.setDefaultPolicy(policy("Default policy")) | ||
| FragmentStrictMode.onPolicyViolation(childFragment, violation) | ||
| assertThat(lastTriggeredPolicy).isEqualTo("Default policy") | ||
|
|
||
| fragmentManager.strictModePolicy = policy("Parent policy") | ||
| FragmentStrictMode.onPolicyViolation(childFragment, violation) | ||
| assertThat(lastTriggeredPolicy).isEqualTo("Parent policy") | ||
|
|
||
| parentFragment.childFragmentManager.strictModePolicy = policy("Child policy") | ||
| FragmentStrictMode.onPolicyViolation(childFragment, violation) | ||
| assertThat(lastTriggeredPolicy).isEqualTo("Child policy") | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What Lint actually wanted you to do was:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, I just thought this would be more readable. You want me to change it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We actually have a
codestyles.xmlthat enforces the style ian mentioned just to have some consistency, does that not automatically configure for you when starting studio via./gradlew studio?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I used
./gradlew studio, but could be that I just didn't auto-format before committing.