remove v1.Semantics

pkg/api/v1/helpers_test.go

@@ -18,74 +18,12 @@ package v1
 
 import (
 	"reflect"
-	"strings"
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api/resource"
+	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/labels"
 )
 
-func TestConversionError(t *testing.T) {
-	var i int
-	var s string
-	i = 3
-	s = "foo"
-	c := ConversionError{
-		In: &i, Out: &s,
-		Message: "Can't make x into y, silly",
-	}
-	var e error
-	e = &c // ensure it implements error
-	msg := e.Error()
-	t.Logf("Message is %v", msg)
-	for _, part := range []string{"3", "int", "string", "Can't"} {
-		if !strings.Contains(msg, part) {
-			t.Errorf("didn't find %v", part)
-		}
-	}
-}
-
-func TestSemantic(t *testing.T) {
-	table := []struct {
-		a, b        interface{}
-		shouldEqual bool
-	}{
-		{resource.MustParse("0"), resource.Quantity{}, true},
-		{resource.Quantity{}, resource.MustParse("0"), true},
-		{resource.Quantity{}, resource.MustParse("1m"), false},
-		{
-			resource.NewQuantity(5, resource.BinarySI),
-			resource.NewQuantity(5, resource.DecimalSI),
-			true,
-		},
-		{resource.MustParse("2m"), resource.MustParse("1m"), false},
-	}
-
-	for index, item := range table {
-		if e, a := item.shouldEqual, Semantic.DeepEqual(item.a, item.b); e != a {
-			t.Errorf("case[%d], expected %v, got %v.", index, e, a)
-		}
-	}
-}
-
-func TestIsStandardResource(t *testing.T) {
-	testCases := []struct {
-		input  string
-		output bool
-	}{
-		{"cpu", true},
-		{"memory", true},
-		{"disk", false},
-		{"blah", false},
-		{"x.y.z", false},
-	}
-	for i, tc := range testCases {
-		if IsStandardResourceName(tc.input) != tc.output {
-			t.Errorf("case[%d], expected: %t, got: %t", i, tc.output, !tc.output)
-		}
-	}
-}
-
 func TestAddToNodeAddresses(t *testing.T) {
 	testCases := []struct {
 		existing []NodeAddress
@@ -137,7 +75,7 @@ func TestAddToNodeAddresses(t *testing.T) {
 
 	for i, tc := range testCases {
 		AddToNodeAddresses(&tc.existing, tc.toAdd...)
-		if !Semantic.DeepEqual(tc.expected, tc.existing) {
+		if !api.Semantic.DeepEqual(tc.expected, tc.existing) {
 			t.Errorf("case[%d], expected: %v, got: %v", i, tc.expected, tc.existing)
 		}
 	}