Move FieldPath and errors to a sub-package

This makes the naming and reading a lot simpler.

pkg/util/validation/field/errors_test.go

@@ -0,0 +1,134 @@
+/*
+Copyright 2014 The Kubernetes Authors 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 field
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+)
+
+func TestMakeFuncs(t *testing.T) {
+	testCases := []struct {
+		fn       func() *Error
+		expected ErrorType
+	}{
+		{
+			func() *Error { return NewInvalidError(NewPath("f"), "v", "d") },
+			ErrorTypeInvalid,
+		},
+		{
+			func() *Error { return NewNotSupportedError(NewPath("f"), "v", nil) },
+			ErrorTypeNotSupported,
+		},
+		{
+			func() *Error { return NewDuplicateError(NewPath("f"), "v") },
+			ErrorTypeDuplicate,
+		},
+		{
+			func() *Error { return NewNotFoundError(NewPath("f"), "v") },
+			ErrorTypeNotFound,
+		},
+		{
+			func() *Error { return NewRequiredError(NewPath("f")) },
+			ErrorTypeRequired,
+		},
+		{
+			func() *Error { return NewInternalError(NewPath("f"), fmt.Errorf("e")) },
+			ErrorTypeInternal,
+		},
+	}
+
+	for _, testCase := range testCases {
+		err := testCase.fn()
+		if err.Type != testCase.expected {
+			t.Errorf("expected Type %q, got %q", testCase.expected, err.Type)
+		}
+	}
+}
+
+func TestErrorUsefulMessage(t *testing.T) {
+	s := NewInvalidError(NewPath("foo"), "bar", "deet").Error()
+	t.Logf("message: %v", s)
+	for _, part := range []string{"foo", "bar", "deet", ErrorTypeInvalid.String()} {
+		if !strings.Contains(s, part) {
+			t.Errorf("error message did not contain expected part '%v'", part)
+		}
+	}
+
+	type complicated struct {
+		Baz   int
+		Qux   string
+		Inner interface{}
+		KV    map[string]int
+	}
+	s = NewInvalidError(
+		NewPath("foo"),
+		&complicated{
+			Baz:   1,
+			Qux:   "aoeu",
+			Inner: &complicated{Qux: "asdf"},
+			KV:    map[string]int{"Billy": 2},
+		},
+		"detail",
+	).Error()
+	t.Logf("message: %v", s)
+	for _, part := range []string{
+		"foo", ErrorTypeInvalid.String(),
+		"Baz", "Qux", "Inner", "KV", "detail",
+		"1", "aoeu", "asdf", "Billy", "2",
+	} {
+		if !strings.Contains(s, part) {
+			t.Errorf("error message did not contain expected part '%v'", part)
+		}
+	}
+}
+
+func TestToAggregate(t *testing.T) {
+	testCases := []ErrorList{
+		nil,
+		{},
+		{NewInvalidError(NewPath("f"), "v", "d")},
+		{NewInvalidError(NewPath("f"), "v", "d"), NewInternalError(NewPath(""), fmt.Errorf("e"))},
+	}
+	for i, tc := range testCases {
+		agg := tc.ToAggregate()
+		if len(tc) == 0 {
+			if agg != nil {
+				t.Errorf("[%d] Expected nil, got %#v", i, agg)
+			}
+		} else if agg == nil {
+			t.Errorf("[%d] Expected non-nil", i)
+		} else if len(tc) != len(agg.Errors()) {
+			t.Errorf("[%d] Expected %d, got %d", i, len(tc), len(agg.Errors()))
+		}
+	}
+}
+
+func TestErrListFilter(t *testing.T) {
+	list := ErrorList{
+		NewInvalidError(NewPath("test.field"), "", ""),
+		NewInvalidError(NewPath("field.test"), "", ""),
+		NewDuplicateError(NewPath("test"), "value"),
+	}
+	if len(list.Filter(NewErrorTypeMatcher(ErrorTypeDuplicate))) != 2 {
+		t.Errorf("should not filter")
+	}
+	if len(list.Filter(NewErrorTypeMatcher(ErrorTypeInvalid))) != 1 {
+		t.Errorf("should filter")
+	}
+}