registry: move generic registry tester into k8s.io/apiserver

pkg/registry/registrytest/etcd.go

@@ -17,22 +17,10 @@ limitations under the License.
 package registrytest
 
 import (
-	"fmt"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/api/meta"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/fields"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
-	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
-	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
-	"k8s.io/apiserver/pkg/registry/rest/resttest"
-	etcdstorage "k8s.io/apiserver/pkg/storage/etcd"
 	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
-	storagetesting "k8s.io/apiserver/pkg/storage/testing"
 	"k8s.io/kubernetes/pkg/api/testapi"
 )
 
@@ -41,171 +29,3 @@ func NewEtcdStorage(t *testing.T, group string) (*storagebackend.Config, *etcdte
 	config.Codec = testapi.Groups[group].StorageCodec()
 	return config, server
 }
-
-type Tester struct {
-	tester  *resttest.Tester
-	storage *genericregistry.Store
-}
-type UpdateFunc func(runtime.Object) runtime.Object
-
-func New(t *testing.T, storage *genericregistry.Store, scheme *runtime.Scheme) *Tester {
-	return &Tester{
-		tester:  resttest.New(t, storage, scheme),
-		storage: storage,
-	}
-}
-
-func (t *Tester) TestNamespace() string {
-	return t.tester.TestNamespace()
-}
-
-func (t *Tester) ClusterScope() *Tester {
-	t.tester = t.tester.ClusterScope()
-	return t
-}
-
-func (t *Tester) Namer(namer func(int) string) *Tester {
-	t.tester = t.tester.Namer(namer)
-	return t
-}
-
-func (t *Tester) AllowCreateOnUpdate() *Tester {
-	t.tester = t.tester.AllowCreateOnUpdate()
-	return t
-}
-
-func (t *Tester) GeneratesName() *Tester {
-	t.tester = t.tester.GeneratesName()
-	return t
-}
-
-func (t *Tester) ReturnDeletedObject() *Tester {
-	t.tester = t.tester.ReturnDeletedObject()
-	return t
-}
-
-func (t *Tester) TestCreate(valid runtime.Object, invalid ...runtime.Object) {
-	t.tester.TestCreate(
-		valid,
-		t.createObject,
-		t.getObject,
-		invalid...,
-	)
-}
-
-func (t *Tester) TestUpdate(valid runtime.Object, validUpdateFunc UpdateFunc, invalidUpdateFunc ...UpdateFunc) {
-	var invalidFuncs []resttest.UpdateFunc
-	for _, f := range invalidUpdateFunc {
-		invalidFuncs = append(invalidFuncs, resttest.UpdateFunc(f))
-	}
-	t.tester.TestUpdate(
-		valid,
-		t.createObject,
-		t.getObject,
-		resttest.UpdateFunc(validUpdateFunc),
-		invalidFuncs...,
-	)
-}
-
-func (t *Tester) TestDelete(valid runtime.Object) {
-	t.tester.TestDelete(
-		valid,
-		t.createObject,
-		t.getObject,
-		errors.IsNotFound,
-	)
-}
-
-func (t *Tester) TestDeleteGraceful(valid runtime.Object, expectedGrace int64) {
-	t.tester.TestDeleteGraceful(
-		valid,
-		t.createObject,
-		t.getObject,
-		expectedGrace,
-	)
-}
-
-func (t *Tester) TestGet(valid runtime.Object) {
-	t.tester.TestGet(valid)
-}
-
-func (t *Tester) TestList(valid runtime.Object) {
-	t.tester.TestList(
-		valid,
-		t.setObjectsForList,
-	)
-}
-
-func (t *Tester) TestWatch(valid runtime.Object, labelsPass, labelsFail []labels.Set, fieldsPass, fieldsFail []fields.Set) {
-	t.tester.TestWatch(
-		valid,
-		t.emitObject,
-		labelsPass,
-		labelsFail,
-		fieldsPass,
-		fieldsFail,
-		// TODO: This should be filtered, the registry should not be aware of this level of detail
-		[]string{etcdstorage.EtcdCreate, etcdstorage.EtcdDelete},
-	)
-}
-
-// Helper functions
-
-func (t *Tester) getObject(ctx genericapirequest.Context, obj runtime.Object) (runtime.Object, error) {
-	accessor, err := meta.Accessor(obj)
-	if err != nil {
-		return nil, err
-	}
-
-	result, err := t.storage.Get(ctx, accessor.GetName(), &metav1.GetOptions{})
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-func (t *Tester) createObject(ctx genericapirequest.Context, obj runtime.Object) error {
-	accessor, err := meta.Accessor(obj)
-	if err != nil {
-		return err
-	}
-	key, err := t.storage.KeyFunc(ctx, accessor.GetName())
-	if err != nil {
-		return err
-	}
-	return t.storage.Storage.Create(ctx, key, obj, nil, 0)
-}
-
-func (t *Tester) setObjectsForList(objects []runtime.Object) []runtime.Object {
-	key := t.storage.KeyRootFunc(t.tester.TestContext())
-	if _, err := t.storage.DeleteCollection(t.tester.TestContext(), nil, nil); err != nil {
-		t.tester.Errorf("unable to clear collection: %v", err)
-		return nil
-	}
-	if err := storagetesting.CreateObjList(key, t.storage.Storage, objects); err != nil {
-		t.tester.Errorf("unexpected error: %v", err)
-		return nil
-	}
-	return objects
-}
-
-func (t *Tester) emitObject(obj runtime.Object, action string) error {
-	ctx := t.tester.TestContext()
-	var err error
-
-	switch action {
-	case etcdstorage.EtcdCreate:
-		err = t.createObject(ctx, obj)
-	case etcdstorage.EtcdDelete:
-		var accessor metav1.Object
-		accessor, err = meta.Accessor(obj)
-		if err != nil {
-			return err
-		}
-		_, _, err = t.storage.Delete(ctx, accessor.GetName(), nil)
-	default:
-		err = fmt.Errorf("unexpected action: %v", action)
-	}
-
-	return err
-}