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

Remove varargs from Fixture(t *testing.T)

Browse Source 
Bug: 182885307
Test: m nothing
Change-Id: I71c3cf47ba1dc8d29d1533789c4c991cb825bd88
This commit is contained in:
Paul Duffin
2021-03-30 22:11:24 +01:00
parent 55e740e9a6
commit 34a7fff9e0
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/fixture_test.go
View File

@@ -43,43 +43,40 @@ func TestFixtureDedup(t *testing.T) {
extension := group.Extend(preparer4, preparer2)
extension.Fixture(t, preparer1, preparer2, preparer2Then1, preparer3)
GroupFixturePreparers(extension, preparer1, preparer2, preparer2Then1, preparer3).Fixture(t)
AssertDeepEquals(t, "preparers called in wrong order",
[]string{"preparer1", "preparer2", "preparer4", "preparer3"}, list)
}
func TestFixtureValidateMockFS(t *testing.T) {
buildDir := "<unused>"
factory := NewFixtureFactory(&buildDir)
t.Run("absolute path", func(t *testing.T) {
AssertPanicMessageContains(t, "source path validation failed", "Path is outside directory: /abs/path/Android.bp", func() {
factory.Fixture(t, FixtureAddFile("/abs/path/Android.bp", nil))
FixtureAddFile("/abs/path/Android.bp", nil).Fixture(t)
})
})
t.Run("not canonical", func(t *testing.T) {
AssertPanicMessageContains(t, "source path validation failed", `path "path/with/../in/it/Android.bp" is not a canonical path, use "path/in/it/Android.bp" instead`, func() {
factory.Fixture(t, FixtureAddFile("path/with/../in/it/Android.bp", nil))
FixtureAddFile("path/with/../in/it/Android.bp", nil).Fixture(t)
})
})
t.Run("FixtureAddFile", func(t *testing.T) {
AssertPanicMessageContains(t, "source path validation failed", `cannot add output path "out/Android.bp" to the mock file system`, func() {
factory.Fixture(t, FixtureAddFile("out/Android.bp", nil))
FixtureAddFile("out/Android.bp", nil).Fixture(t)
})
})
t.Run("FixtureMergeMockFs", func(t *testing.T) {
AssertPanicMessageContains(t, "source path validation failed", `cannot add output path "out/Android.bp" to the mock file system`, func() {
factory.Fixture(t, FixtureMergeMockFs(MockFS{
FixtureMergeMockFs(MockFS{
"out/Android.bp": nil,
}))
}).Fixture(t)
})
})
t.Run("FixtureModifyMockFS", func(t *testing.T) {
AssertPanicMessageContains(t, "source path validation failed", `cannot add output path "out/Android.bp" to the mock file system`, func() {
factory.Fixture(t, FixtureModifyMockFS(func(fs MockFS) {
FixtureModifyMockFS(func(fs MockFS) {
fs["out/Android.bp"] = nil
}))
}).Fixture(t)
})
})
}