From 532e1ca20cae5702705daf11044762cc605a4035 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Thu, 30 Jul 2015 14:45:27 -0400
Subject: [PATCH] Update generator tests to passing

---
 pkg/runtime/conversion_generation_test.go | 18 ++++++++++++------
 pkg/runtime/deep_copy_generation_test.go  | 18 +++++++++++++-----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/pkg/runtime/conversion_generation_test.go b/pkg/runtime/conversion_generation_test.go
index e2ce4f50256..1fd0c4da026 100644
--- a/pkg/runtime/conversion_generation_test.go
+++ b/pkg/runtime/conversion_generation_test.go
@@ -23,31 +23,37 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"path"
 	"testing"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
 	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-
-	"github.com/golang/glog"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 )
 
 func generateConversions(t *testing.T, version string) bytes.Buffer {
-	g := runtime.NewConversionGenerator(api.Scheme.Raw())
+	g := runtime.NewConversionGenerator(api.Scheme.Raw(), path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", version))
+	apiShort := g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
+	g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource")
+	// TODO(wojtek-t): Change the overwrites to a flag.
 	g.OverwritePackage(version, "")
 	for _, knownType := range api.Scheme.KnownTypes(version) {
 		if err := g.GenerateConversionsForType(version, knownType); err != nil {
-			glog.Errorf("error while generating conversion functions for %v: %v", knownType, err)
+			t.Fatalf("error while generating conversion functions for %v: %v", knownType, err)
 		}
 	}
-
+	g.RepackImports(util.NewStringSet())
 	var functions bytes.Buffer
 	functionsWriter := bufio.NewWriter(&functions)
+	if err := g.WriteImports(functionsWriter); err != nil {
+		t.Fatalf("error while writing imports: %v", err)
+	}
 	if err := g.WriteConversionFunctions(functionsWriter); err != nil {
 		t.Fatalf("couldn't generate conversion functions: %v", err)
 	}
-	if err := g.RegisterConversionFunctions(functionsWriter); err != nil {
+	if err := g.RegisterConversionFunctions(functionsWriter, fmt.Sprintf("%s.Scheme", apiShort)); err != nil {
 		t.Fatalf("couldn't generate conversion function names: %v", err)
 	}
 	if err := functionsWriter.Flush(); err != nil {
diff --git a/pkg/runtime/deep_copy_generation_test.go b/pkg/runtime/deep_copy_generation_test.go
index e7cd18b021a..06a042ecc44 100644
--- a/pkg/runtime/deep_copy_generation_test.go
+++ b/pkg/runtime/deep_copy_generation_test.go
@@ -22,23 +22,30 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path"
 	"testing"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
 	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 
 	"github.com/golang/glog"
 )
 
 func generateDeepCopies(t *testing.T, version string) bytes.Buffer {
-	g := runtime.NewDeepCopyGenerator(api.Scheme.Raw())
-	g.OverwritePackage(version, "")
 	testedVersion := version
-	if version == "api" {
+	registerTo := "api.Scheme"
+	if testedVersion == "api" {
 		testedVersion = api.Scheme.Raw().InternalVersion
+		registerTo = "Scheme"
 	}
+
+	g := runtime.NewDeepCopyGenerator(api.Scheme.Raw(), path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", testedVersion), util.NewStringSet("github.com/GoogleCloudPlatform/kubernetes"))
+	g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
+	g.OverwritePackage(version, "")
+
 	for _, knownType := range api.Scheme.KnownTypes(testedVersion) {
 		if err := g.AddType(knownType); err != nil {
 			glog.Errorf("error while generating deep-copy functions for %v: %v", knownType, err)
@@ -47,13 +54,14 @@ func generateDeepCopies(t *testing.T, version string) bytes.Buffer {
 
 	var functions bytes.Buffer
 	functionsWriter := bufio.NewWriter(&functions)
-	if err := g.WriteImports(functionsWriter, version); err != nil {
+	g.RepackImports()
+	if err := g.WriteImports(functionsWriter); err != nil {
 		t.Fatalf("couldn't generate deep-copy function imports: %v", err)
 	}
 	if err := g.WriteDeepCopyFunctions(functionsWriter); err != nil {
 		t.Fatalf("couldn't generate deep-copy functions: %v", err)
 	}
-	if err := g.RegisterDeepCopyFunctions(functionsWriter, version); err != nil {
+	if err := g.RegisterDeepCopyFunctions(functionsWriter, registerTo); err != nil {
 		t.Fatalf("couldn't generate deep-copy function names: %v", err)
 	}
 	if err := functionsWriter.Flush(); err != nil {