Refactor tests to split ObjectMeta from TypeMeta

pkg/watch/json/decoder_test.go

@@ -36,7 +36,7 @@ func TestDecoder(t *testing.T) {
 		out, in := io.Pipe()
 		decoder := NewDecoder(out, testapi.Codec())
 
-		expect := &api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}}
+		expect := &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}
 		encoder := json.NewEncoder(in)
 		go func() {
 			data, err := testapi.Codec().Encode(expect)

pkg/watch/json/encoder_test.go

@@ -37,17 +37,17 @@ func TestEncodeDecodeRoundTrip(t *testing.T) {
 	}{
 		{
 			watch.Added,
-			&api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}},
+			&api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},
 			v1beta1.Codec,
 		},
 		{
 			watch.Modified,
-			&api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}},
+			&api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},
 			v1beta2.Codec,
 		},
 		{
 			watch.Deleted,
-			&api.Pod{TypeMeta: api.TypeMeta{Name: "foo"}},
+			&api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},
 			api.Codec,
 		},
 	}