Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46e37741 authored by Paul Duffin's avatar Paul Duffin
Browse files

Rename SetErrorHandler to ExtendWithErrorHandler 

Bug: 181070625
Test: m nothing
Change-Id: Iacab525cb47fbd7ff54e5a95ec230ac6c71f20eb
parent 2e0323dd

android/fixture.go

+4 −4
Original line number Diff line number Diff line
@@ -183,12 +183,12 @@ type FixtureFactory interface { 
	// Create a Fixture.

	Fixture(t *testing.T, preparers ...FixturePreparer) Fixture



	// SetErrorHandler creates a new FixtureFactory that will use the supplied error handler to check

	// the errors (may be 0) reported by the test.

	// ExtendWithErrorHandler creates a new FixtureFactory that will use the supplied error handler

	// 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

	// errors are reported.

	SetErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory

	ExtendWithErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory



	// 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

}



func (f *fixtureFactory) SetErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory {

func (f *fixtureFactory) ExtendWithErrorHandler(errorHandler FixtureErrorHandler) FixtureFactory {

	newFactory := &fixtureFactory{}

	*newFactory = *f

	newFactory.errorHandler = errorHandler

android/visibility_test.go

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ func TestVisibility(t *testing.T) { 
				// Add additional files to the mock filesystem

				test.fs.AddToFixture(),

			).

				SetErrorHandler(FixtureExpectsAllErrorsToMatchAPattern(test.expectedErrors)).

				ExtendWithErrorHandler(FixtureExpectsAllErrorsToMatchAPattern(test.expectedErrors)).

				RunTest(t)



			if test.effectiveVisibility != nil {