Merge pull request #1409 from square/sedwards/move-exception-guard

steve-the-edwards · web-flow · commit bf6909fb6c2c · 2025-08-14T14:09:30.000-04:00
Move UncaughtExceptionGuard into workflow-testing
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -49,8 +49,8 @@ dependencies {
 
 dokka {
   // This is the displayed name for the module, like in the Html sidebar.
-  //   artifact id: workflow-internal-testing-utils
-  //          path: internal-testing-utils
+  //   artifact id: workflow-config-android
+  //          path: workflow-config/config-android
   moduleName.set(
     provider {
       findProperty("POM_ARTIFACT_ID") as? String
diff --git a/internal-testing-utils/api/internal-testing-utils.api b/internal-testing-utils/api/internal-testing-utils.api
diff --git a/internal-testing-utils/build.gradle.kts b/internal-testing-utils/build.gradle.kts
diff --git a/internal-testing-utils/dependencies/runtimeClasspath.txt b/internal-testing-utils/dependencies/runtimeClasspath.txt
diff --git a/internal-testing-utils/gradle.properties b/internal-testing-utils/gradle.properties
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -37,7 +37,6 @@ include(
   ":benchmarks:dungeon-benchmark",
   ":benchmarks:performance-poetry:complex-benchmark",
   ":benchmarks:performance-poetry:complex-poetry",
-  ":internal-testing-utils",
   ":samples:compose-samples",
   ":samples:containers:app-poetry",
   ":samples:containers:app-raven",
diff --git a/workflow-testing/api/workflow-testing.api b/workflow-testing/api/workflow-testing.api
@@ -102,6 +102,16 @@ public final class com/squareup/workflow1/testing/RenderTesterWorkersKt {
 	public static final fun keyDescription (Ljava/lang/String;)Ljava/lang/String;
 }
 
+public final class com/squareup/workflow1/testing/UncaughtExceptionGuard {
+	public fun <init> ()V
+	public final fun reportUncaught (Ljava/lang/Throwable;)V
+	public final fun runRethrowingUncaught (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+}
+
+public final class com/squareup/workflow1/testing/UncaughtExceptionGuardKt {
+	public static final fun rethrowingUncaughtExceptions (Lkotlin/jvm/functions/Function0;)V
+}
+
 public final class com/squareup/workflow1/testing/WorkerSink : com/squareup/workflow1/Worker {
 	public fun <init> (Ljava/lang/String;Lkotlin/reflect/KClass;)V
 	public fun doesSameWorkAs (Lcom/squareup/workflow1/Worker;)Z
diff --git a/workflow-testing/build.gradle.kts b/workflow-testing/build.gradle.kts
@@ -33,10 +33,10 @@ dependencies {
   implementation(libs.kotlin.reflect)
   implementation(libs.turbine)
 
-  implementation(project(":internal-testing-utils"))
   implementation(project(":workflow-config:config-jvm"))
 
   testImplementation(libs.kotlin.test.jdk)
   testImplementation(libs.mockito.kotlin)
   testImplementation(libs.mockk)
+  testImplementation(libs.truth)
 }
diff --git a/workflow-testing/src/main/java/com/squareup/workflow1/testing/UncaughtExceptionGuard.kt b/workflow-testing/src/main/java/com/squareup/workflow1/testing/UncaughtExceptionGuard.kt
@@ -1,4 +1,4 @@
-package com.squareup.workflow1.internal.util
+package com.squareup.workflow1.testing
 
 import java.util.concurrent.atomic.AtomicReference
 
diff --git a/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkflowTestRuntime.kt b/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkflowTestRuntime.kt
@@ -11,7 +11,6 @@ import com.squareup.workflow1.Workflow
 import com.squareup.workflow1.WorkflowInterceptor
 import com.squareup.workflow1.WorkflowInterceptor.WorkflowSession
 import com.squareup.workflow1.config.JvmTestRuntimeConfigTools
-import com.squareup.workflow1.internal.util.UncaughtExceptionGuard
 import com.squareup.workflow1.renderWorkflowIn
 import com.squareup.workflow1.testing.WorkflowTestParams.StartMode.StartFresh
 import com.squareup.workflow1.testing.WorkflowTestParams.StartMode.StartFromCompleteSnapshot
diff --git a/workflow-testing/src/test/java/com/squareup/workflow1/testing/UncaughtExceptionGuardTest.kt b/workflow-testing/src/test/java/com/squareup/workflow1/testing/UncaughtExceptionGuardTest.kt
@@ -1,7 +1,7 @@
-package com.squareup.workflow1.internal.util
+package com.squareup.workflow1.testing
 
 import com.google.common.truth.Truth.assertThat
-import junit.framework.TestCase.fail
+import junit.framework.TestCase
 import org.junit.Test
 import java.util.concurrent.CountDownLatch
 import kotlin.test.assertFailsWith
@@ -49,7 +49,7 @@ class UncaughtExceptionGuardTest {
         Thread.getDefaultUncaughtExceptionHandler()
           .uncaughtException(Thread.currentThread(), RuntimeException("fail"))
       }
-      fail("Expected exception.")
+      TestCase.fail("Expected exception.")
     } catch (e: RuntimeException) {
       assertThat(e.message).isEqualTo("fail")
     }
diff --git a/workflow-testing/src/test/java/com/squareup/workflow1/testing/WorkflowTestRuntimeTest.kt b/workflow-testing/src/test/java/com/squareup/workflow1/testing/WorkflowTestRuntimeTest.kt
@@ -5,7 +5,6 @@ package com.squareup.workflow1.testing
 import com.squareup.workflow1.Snapshot
 import com.squareup.workflow1.Worker
 import com.squareup.workflow1.Workflow
-import com.squareup.workflow1.internal.util.rethrowingUncaughtExceptions
 import com.squareup.workflow1.runningWorker
 import com.squareup.workflow1.stateful
 import com.squareup.workflow1.stateless

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.squareup.workflow1.internal.util`
	`1`	`+package com.squareup.workflow1.testing`
`2`	`2`
`3`	`3`	`import java.util.concurrent.atomic.AtomicReference`
`4`	`4`