-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #285 from rubensousa/listener-removal
Fix concurrent modification exceptions when listeners remove themselves
- Loading branch information
Showing
10 changed files
with
353 additions
and
14 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
...iew/src/androidTest/kotlin/com/rubensousa/dpadrecyclerview/test/helpers/TestExtensions.kt
This file contains 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,25 @@ | ||
| /* | ||
| * Copyright 2024 Rúben Sousa | ||
| * | ||
| * 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 com.rubensousa.dpadrecyclerview.test.helpers | ||
|
|
||
| import androidx.test.platform.app.InstrumentationRegistry | ||
|
|
||
| fun runOnMainThread(action: () -> Unit) { | ||
| InstrumentationRegistry.getInstrumentation().runOnMainSync { | ||
| action() | ||
| } | ||
| } |
This file contains 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
129 changes: 129 additions & 0 deletions
129
...roidTest/kotlin/com/rubensousa/dpadrecyclerview/test/tests/layout/LayoutCompletionTest.kt
This file contains 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,129 @@ | ||
| /* | ||
| * Copyright 2024 Rúben Sousa | ||
| * | ||
| * 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 com.rubensousa.dpadrecyclerview.test.tests.layout | ||
|
|
||
| import androidx.recyclerview.widget.RecyclerView | ||
| import com.google.common.truth.Truth.assertThat | ||
| import com.rubensousa.dpadrecyclerview.ChildAlignment | ||
| import com.rubensousa.dpadrecyclerview.DpadRecyclerView | ||
| import com.rubensousa.dpadrecyclerview.OnChildLaidOutListener | ||
| import com.rubensousa.dpadrecyclerview.ParentAlignment | ||
| import com.rubensousa.dpadrecyclerview.test.TestLayoutConfiguration | ||
| import com.rubensousa.dpadrecyclerview.test.helpers.onRecyclerView | ||
| import com.rubensousa.dpadrecyclerview.test.helpers.runOnMainThread | ||
| import com.rubensousa.dpadrecyclerview.test.helpers.selectPosition | ||
| import com.rubensousa.dpadrecyclerview.test.helpers.waitForLayout | ||
| import com.rubensousa.dpadrecyclerview.test.tests.DpadRecyclerViewTest | ||
| import com.rubensousa.dpadrecyclerview.testing.rules.DisableIdleTimeoutRule | ||
| import org.junit.Before | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
|
|
||
| class LayoutCompletionTest : DpadRecyclerViewTest() { | ||
|
|
||
| @get:Rule | ||
| val idleTimeoutRule = DisableIdleTimeoutRule() | ||
|
|
||
| override fun getDefaultLayoutConfiguration(): TestLayoutConfiguration { | ||
| return TestLayoutConfiguration( | ||
| spans = 1, | ||
| orientation = RecyclerView.VERTICAL, | ||
| parentAlignment = ParentAlignment( | ||
| edge = ParentAlignment.Edge.NONE, | ||
| fraction = 0.0f | ||
| ), | ||
| childAlignment = ChildAlignment( | ||
| fraction = 0.0f | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| @Before | ||
| fun setup() { | ||
| launchFragment() | ||
| } | ||
|
|
||
| @Test | ||
| fun testLayoutCompleteListenerThatRemovesItself() = report { | ||
| var currentRecyclerView: DpadRecyclerView? = null | ||
| var events = 0 | ||
| val listeners = 3 | ||
| Given("Attach listener that removes itself") { | ||
| onRecyclerView("Get recyclerview") { recyclerView -> | ||
| currentRecyclerView = recyclerView | ||
| } | ||
| runOnMainThread { | ||
| // Add listeners that remove themselves | ||
| repeat(listeners) { | ||
| currentRecyclerView!!.addOnLayoutCompletedListener( | ||
| object : DpadRecyclerView.OnLayoutCompletedListener { | ||
| override fun onLayoutCompleted(state: RecyclerView.State) { | ||
| currentRecyclerView.removeOnLayoutCompletedListener(this) | ||
| events++ | ||
| } | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| When("Request layout") { | ||
| selectPosition(10) | ||
| waitForLayout() | ||
| } | ||
|
|
||
| Then("Listener got removed") { | ||
| assertThat(events).isEqualTo(listeners) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun testChildLayoutListenerThatRemovesItself() = report { | ||
| var currentRecyclerView: DpadRecyclerView? = null | ||
| var events = 0 | ||
| val listeners = 3 | ||
| Given("Attach listener that removes itself") { | ||
| onRecyclerView("Get recyclerview") { recyclerView -> | ||
| currentRecyclerView = recyclerView | ||
| } | ||
| runOnMainThread { | ||
| // Add listeners that remove themselves | ||
| repeat(listeners) { | ||
| currentRecyclerView!!.addOnChildLaidOutListener(object : OnChildLaidOutListener { | ||
| override fun onChildLaidOut( | ||
| parent: RecyclerView, | ||
| child: RecyclerView.ViewHolder | ||
| ) { | ||
| currentRecyclerView.removeOnChildLaidOutListener(this) | ||
| events++ | ||
| } | ||
| }) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| When("Request layout") { | ||
| selectPosition(10) | ||
| waitForLayout() | ||
| } | ||
|
|
||
| Then("Listener got removed") { | ||
| assertThat(events).isEqualTo(listeners) | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains 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 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 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
23 changes: 23 additions & 0 deletions
23
...recyclerview/src/main/java/com/rubensousa/dpadrecyclerview/layoutmanager/ListExtension.kt
This file contains 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,23 @@ | ||
| /* | ||
| * Copyright 2024 Rúben Sousa | ||
| * | ||
| * 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 com.rubensousa.dpadrecyclerview.layoutmanager | ||
|
|
||
| internal inline fun <T> List<T>.forEachReversed(action: (T) -> Unit) { | ||
| for (i in size - 1 downTo 0) { | ||
| action(get(i)) | ||
| } | ||
| } |
This file contains 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.