StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve TestGetDistForGoals debuggability

Browse Source 
Previously, TestGetDistForGoals tested multiple test cases within a
single test so when it failed it was difficult to determine which test
case was the cause. This change runs each test case as its own
nested test.

It also corrects the order of expectedLine and line format parameters
to match the order in the message.

Test: m nothing
Bug: 174226317
Change-Id: I1408ec4125afc5c0b392cd7643dd3f630fe468e5
This commit is contained in:
Paul Duffin
2020-11-25 16:39:30 +00:00
parent 65d5b7f0e9
commit 0cc047ad5d
1 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
android/androidmk_test.go
View File

@@ -104,10 +104,12 @@ func TestAndroidMkSingleton_PassesUpdatedAndroidMkDataToCustomCallback(t *testin
func TestGetDistForGoals(t *testing.T) { func TestGetDistForGoals(t *testing.T) {
testCases := []struct { testCases := []struct {
name string
bp string bp string
expectedAndroidMkLines []string expectedAndroidMkLines []string
}{ }{
{ {
name: "dist-without-tag",
bp: ` bp: `
custom { custom {
name: "foo", name: "foo",
@@ -122,6 +124,7 @@ func TestGetDistForGoals(t *testing.T) {
}, },
}, },
{ {
name: "dist-with-tag",
bp: ` bp: `
custom { custom {
name: "foo", name: "foo",
@@ -137,6 +140,7 @@ func TestGetDistForGoals(t *testing.T) {
}, },
}, },
{ {
name: "dists-with-tag",
bp: ` bp: `
custom { custom {
name: "foo", name: "foo",
@@ -154,6 +158,7 @@ func TestGetDistForGoals(t *testing.T) {
}, },
}, },
{ {
name: "multiple-dists-with-and-without-tag",
bp: ` bp: `
custom { custom {
name: "foo", name: "foo",
@@ -175,6 +180,7 @@ func TestGetDistForGoals(t *testing.T) {
}, },
}, },
{ {
name: "dist-plus-dists-without-tags",
bp: ` bp: `
custom { custom {
name: "foo", name: "foo",
@@ -196,6 +202,7 @@ func TestGetDistForGoals(t *testing.T) {
}, },
}, },
{ {
name: "dist-plus-dists-with-tags",
bp: ` bp: `
custom { custom {
name: "foo", name: "foo",
@@ -249,43 +256,45 @@ func TestGetDistForGoals(t *testing.T) {
} }
for _, testCase := range testCases { for _, testCase := range testCases {
config := TestConfig(buildDir, nil, testCase.bp, nil) t.Run(testCase.name, func(t *testing.T) {
config.katiEnabled = true // Enable androidmk Singleton config := TestConfig(buildDir, nil, testCase.bp, nil)
config.katiEnabled = true // Enable androidmk Singleton
ctx := NewTestContext(config) ctx := NewTestContext(config)
ctx.RegisterSingletonType("androidmk", AndroidMkSingleton) ctx.RegisterSingletonType("androidmk", AndroidMkSingleton)
ctx.RegisterModuleType("custom", customModuleFactory) ctx.RegisterModuleType("custom", customModuleFactory)
ctx.Register() ctx.Register()
_, errs := ctx.ParseFileList(".", []string{"Android.bp"}) _, errs := ctx.ParseFileList(".", []string{"Android.bp"})
FailIfErrored(t, errs) FailIfErrored(t, errs)
_, errs = ctx.PrepareBuildActions(config) _, errs = ctx.PrepareBuildActions(config)
FailIfErrored(t, errs) FailIfErrored(t, errs)
module := ctx.ModuleForTests("foo", "").Module().(*customModule) module := ctx.ModuleForTests("foo", "").Module().(*customModule)
entries := AndroidMkEntriesForTest(t, config, "", module) entries := AndroidMkEntriesForTest(t, config, "", module)
if len(entries) != 1 { if len(entries) != 1 {
t.Errorf("Expected a single AndroidMk entry, got %d", len(entries)) t.Errorf("Expected a single AndroidMk entry, got %d", len(entries))
} }
androidMkLines := entries[0].GetDistForGoals(module) androidMkLines := entries[0].GetDistForGoals(module)
if len(androidMkLines) != len(testCase.expectedAndroidMkLines) { if len(androidMkLines) != len(testCase.expectedAndroidMkLines) {
t.Errorf(
"Expected %d AndroidMk lines, got %d:\n%v",
len(testCase.expectedAndroidMkLines),
len(androidMkLines),
androidMkLines,
)
}
for idx, line := range androidMkLines {
expectedLine := testCase.expectedAndroidMkLines[idx]
if line != expectedLine {
t.Errorf( t.Errorf(
"Expected AndroidMk line to be '%s', got '%s'", "Expected %d AndroidMk lines, got %d:\n%v",
line, len(testCase.expectedAndroidMkLines),
expectedLine, len(androidMkLines),
androidMkLines,
) )
} }
} for idx, line := range androidMkLines {
expectedLine := testCase.expectedAndroidMkLines[idx]
if line != expectedLine {
t.Errorf(
"Expected AndroidMk line to be '%s', got '%s'",
expectedLine,
line,
)
}
}
})
} }
} }