Merge changes If1894fd9,Id7925999,I4fe11c3f,Iea2b0781,Id2c0a503 am: 1b5599e462

am: b3407069ee

Change-Id: Ib0f7f8e93842cea36b915c1e10929f96249c20e3

1 files changed, 19 insertions, 6 deletions

diff --git a/android/paths_test.go b/android/paths_test.go
index 61a172fa..00757985 100644
--- a/android/paths_test.go
+++ b/android/paths_test.go
@@ -110,17 +110,27 @@ var validatePathTestCases = append(commonValidatePathTestCases, []strsTestCase{
 
 func TestValidateSafePath(t *testing.T) {
 	for _, testCase := range validateSafePathTestCases {
-		ctx := &configErrorWrapper{}
-		out := validateSafePath(ctx, testCase.in...)
-		check(t, "validateSafePath", p(testCase.in), out, ctx.errors, testCase.out, testCase.err)
+		t.Run(strings.Join(testCase.in, ","), func(t *testing.T) {
+			ctx := &configErrorWrapper{}
+			out, err := validateSafePath(testCase.in...)
+			if err != nil {
+				reportPathError(ctx, err)
+			}
+			check(t, "validateSafePath", p(testCase.in), out, ctx.errors, testCase.out, testCase.err)
+		})
 	}
 }
 
 func TestValidatePath(t *testing.T) {
 	for _, testCase := range validatePathTestCases {
-		ctx := &configErrorWrapper{}
-		out := validatePath(ctx, testCase.in...)
-		check(t, "validatePath", p(testCase.in), out, ctx.errors, testCase.out, testCase.err)
+		t.Run(strings.Join(testCase.in, ","), func(t *testing.T) {
+			ctx := &configErrorWrapper{}
+			out, err := validatePath(testCase.in...)
+			if err != nil {
+				reportPathError(ctx, err)
+			}
+			check(t, "validatePath", p(testCase.in), out, ctx.errors, testCase.out, testCase.err)
+		})
 	}
 }
 
@@ -133,6 +143,7 @@ func TestOptionalPath(t *testing.T) {
 }
 
 func checkInvalidOptionalPath(t *testing.T, path OptionalPath) {
+	t.Helper()
 	if path.Valid() {
 		t.Errorf("Uninitialized OptionalPath should not be valid")
 	}
@@ -150,9 +161,11 @@ func checkInvalidOptionalPath(t *testing.T, path OptionalPath) {
 func check(t *testing.T, testType, testString string,
 	got interface{}, err []error,
 	expected interface{}, expectedErr []error) {
+	t.Helper()
 
 	printedTestCase := false
 	e := func(s string, expected, got interface{}) {
+		t.Helper()
 		if !printedTestCase {
 			t.Errorf("test case %s: %s", testType, testString)
 			printedTestCase = true