openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleaning up properly after RaceConditionReproducerTest 

Change-Id: I43362fbc63789d3ce3468266a5189a9f9d209d00
This commit is contained in:
Sunny Goyal 2019-10-15 14:32:04 -07:00
parent 377c5a3023
commit bffbd7521d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/src/com/android/launcher3/util/RaceConditionReproducerTest.java
View File

@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@ -45,6 +46,11 @@ public class RaceConditionReproducerTest {
eventProcessor = new RaceConditionReproducer();
}
@After
public void tearDown() {
TraceHelperForTest.cleanup();
}
private void run3_3_TestAction() throws InterruptedException {
Thread tb = new Thread(() -> {
eventProcessor.onEvent("B1");
@ -125,9 +131,7 @@ public class RaceConditionReproducerTest {
@Test
// 2 threads, 3 events each; reproducing a particular event sequence.
public void test3_3_ReproMode() throws Exception {
final RaceConditionReproducer eventProcessor = new RaceConditionReproducer(
SOME_VALID_SEQUENCE_3_3);
eventProcessor = new RaceConditionReproducer(SOME_VALID_SEQUENCE_3_3);
eventProcessor.startIteration();
run3_3_TestAction();
assertTrue(!eventProcessor.finishIteration());

5
tests/src/com/android/launcher3/util/TraceHelperForTest.java
View File

@ -33,6 +33,11 @@ public class TraceHelperForTest extends TraceHelper {
INSTANCE_FOR_TEST.mRaceConditionReproducer = reproducer;
}
public static void cleanup() {
INSTANCE_FOR_TEST.mRaceConditionReproducer = null;
INSTANCE_FOR_TEST.mFlagsChangeListener = null;
}
public static void setFlagsChangeListener(IntConsumer listener) {
TraceHelper.INSTANCE = INSTANCE_FOR_TEST;
INSTANCE_FOR_TEST.mFlagsChangeListener = listener;