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

Merge "Rename SetErrorHandler to ExtendWithErrorHandler" am: 282671d696

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I620584e54bc752f50524889d0bdd269cbe1b0601
This commit is contained in:
Paul Duffin
2021-03-10 12:30:23 +00:00
committed by Automerger Merge Worker
parent 0029271ec2 282671d696
commit ef8f637b5a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/fixture.go
View File

@@ -183,12 +183,12 @@ type FixtureFactory interface {
// Create a Fixture. // Create a Fixture.
Fixture(t *testing.T, preparers ...FixturePreparer) Fixture Fixture(t *testing.T, preparers ...FixturePreparer) Fixture
// SetErrorHandler creates a new FixtureFactory that will use the supplied error handler to check // ExtendWithErrorHandler creates a new FixtureFactory that will use the supplied error handler
// the errors (may be 0) reported by the test. // to check the errors (may be 0) reported by the test.
// //
// The default handlers is FixtureExpectsNoErrors which will fail the go test immediately if any // The default handlers is FixtureExpectsNoErrors which will fail the go test immediately if any
// errors are reported. // errors are reported.
SetErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory ExtendWithErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory
// Run the test, checking any errors reported and returning a TestResult instance. // Run the test, checking any errors reported and returning a TestResult instance.
// //
@@ -640,7 +640,7 @@ func (f *fixtureFactory) Fixture(t *testing.T, preparers ...FixturePreparer) Fix
return fixture return fixture
} }
func (f *fixtureFactory) SetErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory { func (f *fixtureFactory) ExtendWithErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory {
newFactory := &fixtureFactory{} newFactory := &fixtureFactory{}
*newFactory = *f *newFactory = *f
newFactory.errorHandler = errorHandler newFactory.errorHandler = errorHandler

2
android/visibility_test.go
View File

@@ -1162,7 +1162,7 @@ func TestVisibility(t *testing.T) {
// Add additional files to the mock filesystem // Add additional files to the mock filesystem
test.fs.AddToFixture(), test.fs.AddToFixture(),
). ).
SetErrorHandler(FixtureExpectsAllErrorsToMatchAPattern(test.expectedErrors)). ExtendWithErrorHandler(FixtureExpectsAllErrorsToMatchAPattern(test.expectedErrors)).
RunTest(t) RunTest(t)
if test.effectiveVisibility != nil { if test.effectiveVisibility != nil {