From a3cb2b396f9bc30355c6125eeeb67ee7256cf9f7 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 10 Mar 2021 09:15:22 +0000 Subject: Remove duplicate sdk.TestHelper As part of the work on the new fixture mechanism some of the TestHelper functionality was moved into the android/fixture.go package. This moves the rest and removes the now duplicated TestHelper from the sdk package. Also removed some unnecessary & operators. Bug: 181070625 Test: m nothing Change-Id: Ia09a5d05e4fab3a4e28cf44b2d947a33541e3925 --- sdk/sdk_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sdk/sdk_test.go') diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go index c4dc41beb..8f885a10b 100644 --- a/sdk/sdk_test.go +++ b/sdk/sdk_test.go @@ -390,7 +390,7 @@ func TestCommonValueOptimization(t *testing.T) { extractor := newCommonValueExtractor(common) - h := TestHelper{t} + h := android.TestHelper{t} err := extractor.extractCommonProperties(common, structs) h.AssertDeepEquals("unexpected error", nil, err) @@ -465,7 +465,7 @@ func TestCommonValueOptimization_InvalidArchSpecificVariants(t *testing.T) { extractor := newCommonValueExtractor(common) - h := TestHelper{t} + h := android.TestHelper{t} err := extractor.extractCommonProperties(common, structs) h.AssertErrorMessageEquals("unexpected error", `field "S_Common" is not tagged as "arch_variant" but has arch specific properties: -- cgit v1.2.3-59-g8ed1b