Merge branch 'upstream-google' into sync_upstream

Test: CI
Bug: 304328861

Change-Id: Icc02efa6120d797dbaef8becdb42616d6aefd0a2

3 files changed, 5 insertions, 4 deletions

diff --git a/utils/build.gradle b/utils/build.gradle
index 54a2531e2..342d22990 100644
--- a/utils/build.gradle
+++ b/utils/build.gradle
@@ -6,6 +6,7 @@ apply plugin: RoboJavaModulePlugin
 apply plugin: 'kotlin'
 apply plugin: DeployedRoboJavaModulePlugin
 apply plugin: "com.diffplug.spotless"
+apply plugin: "io.gitlab.arturbosch.detekt"
 
 spotless {
     kotlin {
diff --git a/utils/src/test/java/org/robolectric/util/PerfStatsCollectorTest.kt b/utils/src/test/java/org/robolectric/util/PerfStatsCollectorTest.kt
index ec0a22168..1c7e7ab49 100644
--- a/utils/src/test/java/org/robolectric/util/PerfStatsCollectorTest.kt
+++ b/utils/src/test/java/org/robolectric/util/PerfStatsCollectorTest.kt
@@ -71,10 +71,10 @@ class PerfStatsCollectorTest {
     try {
       collector.measure<Any, RuntimeException>("event") {
         fakeClock.delay(5)
-        throw RuntimeException("fake")
+        throw IllegalThreadStateException("fake")
       }
       Assert.fail("should have thrown")
-    } catch (e: RuntimeException) {
+    } catch (e: IllegalThreadStateException) {
       assertThat(e.message).isEqualTo("fake")
     }
     val metrics = collector.metrics
diff --git a/utils/src/test/java/org/robolectric/util/SchedulerTest.kt b/utils/src/test/java/org/robolectric/util/SchedulerTest.kt
index 00e161a08..309d99dad 100644
--- a/utils/src/test/java/org/robolectric/util/SchedulerTest.kt
+++ b/utils/src/test/java/org/robolectric/util/SchedulerTest.kt
@@ -384,11 +384,11 @@ class SchedulerTest {
     val runnablesThatWereRun: MutableList<Int> = ArrayList()
     scheduler.post {
       runnablesThatWereRun.add(1)
-      throw RuntimeException("foo")
+      throw IllegalThreadStateException("foo")
     }
     try {
       scheduler.unPause()
-    } catch (ignored: RuntimeException) {}
+    } catch (ignored: IllegalThreadStateException) {}
     scheduler.post { runnablesThatWereRun.add(2) }
     assertThat(runnablesThatWereRun).containsExactly(1, 2)
   }