Remove TestHelper am: d7aea1dbe5 (67cec05b) · Commits · e / os / android_build_soong

android/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ bootstrap_go_package {
		"singleton_module.go",
		"soong_config_modules.go",
		"test_asserts.go",
		"test_helpers.go",
		"test_suites.go",
		"testing.go",
		"util.go",

android/fixture.go

+0 −2

Original line number	Diff line number	Diff line
		@@ -553,7 +553,6 @@ type testContext struct {

		// The result of running a test.
		type TestResult struct {
		TestHelper
		testContext

		fixture *fixture
		@@ -698,7 +697,6 @@ func (f fixture) RunTest() TestResult {
		}

		result := &TestResult{
		TestHelper: TestHelper{T: f.t},
		testContext: testContext{ctx},
		fixture: f,
		Config: f.config,

android/test_helpers.go

deleted100644 → 0

+0 −111

Original line number	Diff line number	Diff line
		// Copyright 2021 Google Inc. All rights reserved.
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package android

		import (
		"testing"
		)

		// Provides general test support.
		type TestHelper struct {
		*testing.T
		}

		// AssertBoolEquals checks if the expected and actual values are equal and if they are not then it
		// reports an error prefixed with the supplied message and including a reason for why it failed.
		func (h *TestHelper) AssertBoolEquals(message string, expected bool, actual bool) {
		AssertBoolEquals(h.T, message, expected, actual)
		}

		// AssertStringEquals checks if the expected and actual values are equal and if they are not then
		// it reports an error prefixed with the supplied message and including a reason for why it failed.
		func (h *TestHelper) AssertStringEquals(message string, expected string, actual string) {
		AssertStringEquals(h.T, message, expected, actual)
		}

		// AssertErrorMessageEquals checks if the error is not nil and has the expected message. If it does
		// not then this reports an error prefixed with the supplied message and including a reason for why
		// it failed.
		func (h *TestHelper) AssertErrorMessageEquals(message string, expected string, actual error) {
		AssertErrorMessageEquals(h.T, message, expected, actual)
		}

		// AssertTrimmedStringEquals checks if the expected and actual values are the same after trimming
		// leading and trailing spaces from them both. If they are not then it reports an error prefixed
		// with the supplied message and including a reason for why it failed.
		func (h *TestHelper) AssertTrimmedStringEquals(message string, expected string, actual string) {
		AssertTrimmedStringEquals(h.T, message, expected, actual)
		}

		// AssertStringDoesContain checks if the string contains the expected substring. If it does not
		// then it reports an error prefixed with the supplied message and including a reason for why it
		// failed.
		func (h *TestHelper) AssertStringDoesContain(message string, s string, expectedSubstring string) {
		AssertStringDoesContain(h.T, message, s, expectedSubstring)
		}

		// AssertStringDoesNotContain checks if the string contains the expected substring. If it does then
		// it reports an error prefixed with the supplied message and including a reason for why it failed.
		func (h *TestHelper) AssertStringDoesNotContain(message string, s string, unexpectedSubstring string) {
		AssertStringDoesNotContain(h.T, message, s, unexpectedSubstring)
		}

		// AssertStringListContains checks if the list of strings contains the expected string. If it does
		// not then it reports an error prefixed with the supplied message and including a reason for why it
		// failed.
		func (h *TestHelper) AssertStringListContains(message string, list []string, expected string) {
		AssertStringListContains(h.T, message, list, expected)
		}

		// AssertArrayString checks if the expected and actual values are equal and if they are not then it
		// reports an error prefixed with the supplied message and including a reason for why it failed.
		func (h *TestHelper) AssertArrayString(message string, expected, actual []string) {
		h.Helper()
		if len(actual) != len(expected) {
		h.Errorf("%s: expected %d (%q), actual (%d) %q", message, len(expected), expected, len(actual), actual)
		return
		}
		for i := range actual {
		if actual[i] != expected[i] {
		h.Errorf("%s: expected %d-th, %q (%q), actual %q (%q)",
		message, i, expected[i], expected, actual[i], actual)
		return
		}
		}
		}

		// AssertDeepEquals checks if the expected and actual values are equal using reflect.DeepEqual and
		// if they are not then it reports an error prefixed with the supplied message and including a
		// reason for why it failed.
		func (h *TestHelper) AssertDeepEquals(message string, expected interface{}, actual interface{}) {
		AssertDeepEquals(h.T, message, expected, actual)
		}

		// AssertPanic checks that the supplied function panics as expected.
		func (h *TestHelper) AssertPanic(message string, funcThatShouldPanic func()) {
		h.Helper()
		panicked := false
		func() {
		defer func() {
		if x := recover(); x != nil {
		panicked = true
		}
		}()
		funcThatShouldPanic()
		}()
		if !panicked {
		h.Error(message)
		}
		}