Add support for converting OptionalPath to Paths
Appending a Path or Paths to a slice of Paths is simple but appending
an OptionalPath requires conditional logic which makes OptionalPaths
harder to use. This change makes it easy to append the embedded Path,
if any, to a slice of Paths.
Bug: 179354495
Test: m nothing
Change-Id: Ibf80a23043c846162e17c3a98b2590bca653b170
diff --git a/android/paths_test.go b/android/paths_test.go
index f8ccc77..6f5d79e 100644
--- a/android/paths_test.go
+++ b/android/paths_test.go
@@ -141,6 +141,9 @@
path = OptionalPathForPath(nil)
checkInvalidOptionalPath(t, path)
+
+ path = OptionalPathForPath(PathForTesting("path"))
+ checkValidOptionalPath(t, path, "path")
}
func checkInvalidOptionalPath(t *testing.T, path OptionalPath) {
@@ -151,6 +154,10 @@
if path.String() != "" {
t.Errorf("Uninitialized OptionalPath String() should return \"\", not %q", path.String())
}
+ paths := path.AsPaths()
+ if len(paths) != 0 {
+ t.Errorf("Uninitialized OptionalPath AsPaths() should return empty Paths, not %q", paths)
+ }
defer func() {
if r := recover(); r == nil {
t.Errorf("Expected a panic when calling Path() on an uninitialized OptionalPath")
@@ -159,6 +166,21 @@
path.Path()
}
+func checkValidOptionalPath(t *testing.T, path OptionalPath, expectedString string) {
+ t.Helper()
+ if !path.Valid() {
+ t.Errorf("Initialized OptionalPath should not be invalid")
+ }
+ if path.String() != expectedString {
+ t.Errorf("Initialized OptionalPath String() should return %q, not %q", expectedString, path.String())
+ }
+ paths := path.AsPaths()
+ if len(paths) != 1 {
+ t.Errorf("Initialized OptionalPath AsPaths() should return Paths with length 1, not %q", paths)
+ }
+ path.Path()
+}
+
func check(t *testing.T, testType, testString string,
got interface{}, err []error,
expected interface{}, expectedErr []error) {