Merge "Convert java/boot_image_test.go to test fixtures" am: 60fbea0ec6 am: 9b66f48c17

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652450

Change-Id: I8d726e6dc502f7821834ac03facd7bcd7b70c381

java/boot_image_test.go

@@ -16,25 +16,39 @@ package java
 
 import (
 	"testing"
+
+	"android/soong/android"
+	"android/soong/dexpreopt"
 )
 
 // Contains some simple tests for boot_image logic, additional tests can be found in
 // apex/boot_image_test.go as the ART boot image requires modules from the ART apex.
 
+var prepareForTestWithBootImage = android.GroupFixturePreparers(
+	PrepareForTestWithJavaDefaultModules,
+	dexpreopt.PrepareForTestByEnablingDexpreopt,
+)
+
 func TestUnknownBootImage(t *testing.T) {
-	testJavaError(t, "image_name: Unknown image name \\\"unknown\\\", expected one of art, boot", `
+	prepareForTestWithBootImage.
-		boot_image {
+		ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(
-			name: "unknown-boot-image",
+			`\Qimage_name: Unknown image name "unknown", expected one of art, boot\E`)).
-			image_name: "unknown",
+		RunTestWithBp(t, `
-		}
+			boot_image {
-`)
+				name: "unknown-boot-image",
+				image_name: "unknown",
+			}
+		`)
 }
 
 func TestUnknownPrebuiltBootImage(t *testing.T) {
-	testJavaError(t, "image_name: Unknown image name \\\"unknown\\\", expected one of art, boot", `
+	prepareForTestWithBootImage.
-		prebuilt_boot_image {
+		ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(
-			name: "unknown-boot-image",
+			`\Qimage_name: Unknown image name "unknown", expected one of art, boot\E`)).
-			image_name: "unknown",
+		RunTestWithBp(t, `
-		}
+			prebuilt_boot_image {
-`)
+				name: "unknown-boot-image",
+				image_name: "unknown",
+			}
+		`)
 }