Fix: Device expects ValidationException Bug: b/452834689 Change-Id: Ib662beb3dc48b93ef8398f06b8a17c77477803e9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/267994 Commit-Queue: Tarun Saini <sainitarun@google.com> Reviewed-by: Jim Blackler <jimblackler@google.com>
diff --git a/tools/android/webgpu/src/androidTest/java/androidx/webgpu/DeviceTest.kt b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/DeviceTest.kt index 9444ea1..ff47e68 100644 --- a/tools/android/webgpu/src/androidTest/java/androidx/webgpu/DeviceTest.kt +++ b/tools/android/webgpu/src/androidTest/java/androidx/webgpu/DeviceTest.kt
@@ -2,7 +2,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import androidx.webgpu.helper.UncapturedErrorException +import androidx.webgpu.helper.ValidationException import androidx.webgpu.helper.WebGpu import androidx.webgpu.helper.createWebGpu import junit.framework.TestCase.assertEquals @@ -95,7 +95,7 @@ ) ) - assertThrows(UncapturedErrorException::class.java) { + assertThrows(ValidationException::class.java) { device.createComputePipeline( ComputePipelineDescriptor( compute = ComputeState( @@ -113,7 +113,7 @@ val badShaderCode = "@compute @workgroup_size(1) fu main() {}" // Creating the shader module itself should fail - assertThrows(UncapturedErrorException::class.java) { + assertThrows(ValidationException::class.java) { device.createShaderModule( ShaderModuleDescriptor(shaderSourceWGSL = ShaderSourceWGSL(code = badShaderCode)) ) @@ -223,12 +223,12 @@ } @Test - fun validationError_withoutActiveErrorScope_throwsUncapturedErrorException() { + fun validationError_withoutActiveErrorScope_throwsValidationException() { val invalidDescriptor = QuerySetDescriptor( type = QueryType.Occlusion, count = -1 // Invalid parameter ) - assertThrows(UncapturedErrorException::class.java) { + assertThrows(ValidationException::class.java) { device.createQuerySet(invalidDescriptor) } }