Switch to versioned ListOptions in server.

pkg/api/v1/conversion_test.go

@@ -17,12 +17,9 @@ limitations under the License.
 package v1_test
 
 import (
-	"encoding/json"
-	"reflect"
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/unversioned"
 	versioned "k8s.io/kubernetes/pkg/api/v1"
 )
 
@@ -71,33 +68,3 @@ func TestPodSpecConversion(t *testing.T) {
 		}
 	}
 }
-
-func TestListOptionsConversion(t *testing.T) {
-	testCases := []versioned.ListOptions{
-		{},
-		{ResourceVersion: "1"},
-		{LabelSelector: "a=b,c=d", FieldSelector: "a=b,c!=d", ResourceVersion: "5"},
-	}
-
-	for _, test := range testCases {
-		marshalled, err := json.Marshal(test)
-		if err != nil {
-			t.Errorf("unexpected error: %#v", err)
-		}
-		newRep := unversioned.ListOptions{}
-		if err := json.Unmarshal(marshalled, &newRep); err != nil {
-			t.Errorf("unexpected error: %#v", err)
-		}
-		unversionedMarshalled, err := json.Marshal(newRep)
-		if err != nil {
-			t.Errorf("unexpected error: %#", err)
-		}
-		base := versioned.ListOptions{}
-		if err := json.Unmarshal(unversionedMarshalled, &base); err != nil {
-			t.Errorf("unexpected error: %#v", err)
-		}
-		if !reflect.DeepEqual(test, base) {
-			t.Errorf("expected: %#v, got: %#v", test, base)
-		}
-	}
-}