Split TestApexAvailable into separate tests
Having multiple tests within one method makes debugging specific
failures more difficult so this change split the TestApexAvailable
test into multiple separate tests.
Test: m nothing
Bug: 152762638
Change-Id: I2b2408ef515fd79c078686ef29a6ee8fb0407e7e
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 0bae124..2bdecb7 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -3501,7 +3501,7 @@
}`)
}
-func TestApexAvailable(t *testing.T) {
+func TestApexAvailable_DirectDep(t *testing.T) {
// libfoo is not available to myapex, but only to otherapex
testApexError(t, "requires \"libfoo\" that is not available for the APEX", `
apex {
@@ -3534,7 +3534,9 @@
system_shared_libs: [],
apex_available: ["otherapex"],
}`)
+}
+func TestApexAvailable_IndirectDep(t *testing.T) {
// libbbaz is an indirect dep
testApexError(t, "requires \"libbaz\" that is not available for the APEX", `
apex {
@@ -3570,7 +3572,9 @@
stl: "none",
system_shared_libs: [],
}`)
+}
+func TestApexAvailable_InvalidApexName(t *testing.T) {
testApexError(t, "\"otherapex\" is not a valid module name", `
apex {
name: "myapex",
@@ -3591,7 +3595,7 @@
apex_available: ["otherapex"],
}`)
- ctx, _ := testApex(t, `
+ testApex(t, `
apex {
name: "myapex",
key: "myapex.key",
@@ -3627,7 +3631,9 @@
versions: ["10", "20", "30"],
},
}`)
+}
+func TestApexAvailable_CreatedForPlatform(t *testing.T) {
// check that libfoo and libbar are created only for myapex, but not for the platform
// TODO(jiyong) the checks for the platform variant are removed because we now create
// the platform variant regardless of the apex_availability. Instead, we will make sure that
@@ -3639,7 +3645,7 @@
// ensureListContains(t, ctx.ModuleVariantsForTests("libbar"), "android_arm64_armv8-a_shared_myapex")
// ensureListNotContains(t, ctx.ModuleVariantsForTests("libbar"), "android_arm64_armv8-a_shared")
- ctx, _ = testApex(t, `
+ ctx, _ := testApex(t, `
apex {
name: "myapex",
key: "myapex.key",
@@ -3661,8 +3667,10 @@
// check that libfoo is created only for the platform
ensureListNotContains(t, ctx.ModuleVariantsForTests("libfoo"), "android_arm64_armv8-a_shared_myapex")
ensureListContains(t, ctx.ModuleVariantsForTests("libfoo"), "android_arm64_armv8-a_shared")
+}
- ctx, _ = testApex(t, `
+func TestApexAvailable_CreatedForApex(t *testing.T) {
+ testApex(t, `
apex {
name: "myapex",
key: "myapex.key",