From 9537acefc21998605ddbe7124edb5c27352e57b0 Mon Sep 17 00:00:00 2001
From: Ross Light <light@google.com>
Date: Fri, 6 Jul 2018 11:18:07 -0700
Subject: [PATCH] wire: use return in tests instead of panic
 (google/go-cloud#169)

Fixes google/go-cloud#105
---
 internal/wire/testdata/Chain/foo/wire.go                    | 3 ++-
 internal/wire/testdata/Cleanup/foo/wire.go                  | 3 ++-
 internal/wire/testdata/CopyOtherDecls/foo/foo.go            | 3 ++-
 internal/wire/testdata/Cycle/foo/wire.go                    | 3 ++-
 internal/wire/testdata/EmptyVar/foo/wire.go                 | 3 ++-
 internal/wire/testdata/ExportedValue/foo/wire.go            | 3 ++-
 .../wire/testdata/ExportedValueDifferentPackage/foo/wire.go | 3 ++-
 internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go | 5 +++--
 internal/wire/testdata/InjectInput/foo/wire.go              | 3 ++-
 internal/wire/testdata/InjectInputConflict/foo/wire.go      | 3 ++-
 .../{InjectWithReturn => InjectWithPanic}/foo/foo.go        | 0
 .../{InjectWithReturn => InjectWithPanic}/foo/wire.go       | 3 +--
 .../testdata/{InjectWithReturn => InjectWithPanic}/out.txt  | 0
 .../wire/testdata/{InjectWithReturn => InjectWithPanic}/pkg | 0
 internal/wire/testdata/InterfaceBinding/foo/wire.go         | 3 ++-
 internal/wire/testdata/InterfaceBindingReuse/foo/wire.go    | 6 ++++--
 internal/wire/testdata/NiladicIdentity/foo/wire.go          | 3 ++-
 internal/wire/testdata/NiladicValue/foo/wire.go             | 3 ++-
 internal/wire/testdata/NoImplicitInterface/foo/wire.go      | 3 ++-
 internal/wire/testdata/NoInjectParamNames/foo/wire.go       | 3 ++-
 internal/wire/testdata/PartialCleanup/foo/wire.go           | 3 ++-
 internal/wire/testdata/PkgImport/foo/wire.go                | 3 ++-
 internal/wire/testdata/ReturnError/foo/wire.go              | 3 ++-
 internal/wire/testdata/Struct/foo/wire.go                   | 3 ++-
 internal/wire/testdata/StructPointer/foo/wire.go            | 3 ++-
 internal/wire/testdata/TwoDeps/foo/wire.go                  | 3 ++-
 internal/wire/testdata/UnexportedValue/foo/wire.go          | 3 ++-
 internal/wire/testdata/ValueChain/foo/wire.go               | 3 ++-
 internal/wire/testdata/ValueConversion/foo/wire.go          | 3 ++-
 internal/wire/testdata/VarValue/foo/wire.go                 | 3 ++-
 internal/wire/testdata/Vendor/foo/wire.go                   | 3 ++-
 31 files changed, 58 insertions(+), 31 deletions(-)
 rename internal/wire/testdata/{InjectWithReturn => InjectWithPanic}/foo/foo.go (100%)
 rename internal/wire/testdata/{InjectWithReturn => InjectWithPanic}/foo/wire.go (94%)
 rename internal/wire/testdata/{InjectWithReturn => InjectWithPanic}/out.txt (100%)
 rename internal/wire/testdata/{InjectWithReturn => InjectWithPanic}/pkg (100%)

diff --git a/internal/wire/testdata/Chain/foo/wire.go b/internal/wire/testdata/Chain/foo/wire.go
index 55ba464..d08b058 100644
--- a/internal/wire/testdata/Chain/foo/wire.go
+++ b/internal/wire/testdata/Chain/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFooBar() FooBar {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return 0
 }
diff --git a/internal/wire/testdata/Cleanup/foo/wire.go b/internal/wire/testdata/Cleanup/foo/wire.go
index 281a4d6..41d9561 100644
--- a/internal/wire/testdata/Cleanup/foo/wire.go
+++ b/internal/wire/testdata/Cleanup/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectBar() (*Bar, func()) {
-	panic(wire.Build(provideFoo, provideBar))
+	wire.Build(provideFoo, provideBar)
+	return nil, nil
 }
diff --git a/internal/wire/testdata/CopyOtherDecls/foo/foo.go b/internal/wire/testdata/CopyOtherDecls/foo/foo.go
index fc33212..4a5a383 100644
--- a/internal/wire/testdata/CopyOtherDecls/foo/foo.go
+++ b/internal/wire/testdata/CopyOtherDecls/foo/foo.go
@@ -35,5 +35,6 @@ func provideMessage() string {
 }
 
 func injectedMessage() string {
-	panic(wire.Build(provideMessage))
+	wire.Build(provideMessage)
+	return ""
 }
diff --git a/internal/wire/testdata/Cycle/foo/wire.go b/internal/wire/testdata/Cycle/foo/wire.go
index 9aff17e..4b67f55 100644
--- a/internal/wire/testdata/Cycle/foo/wire.go
+++ b/internal/wire/testdata/Cycle/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectedBaz() Baz {
-	panic(wire.Build(provideFoo, provideBar, provideBaz))
+	wire.Build(provideFoo, provideBar, provideBaz)
+	return 0
 }
diff --git a/internal/wire/testdata/EmptyVar/foo/wire.go b/internal/wire/testdata/EmptyVar/foo/wire.go
index 694633f..2e040f8 100644
--- a/internal/wire/testdata/EmptyVar/foo/wire.go
+++ b/internal/wire/testdata/EmptyVar/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectedMessage() string {
-	panic(wire.Build(myFakeSet))
+	wire.Build(myFakeSet)
+	return ""
 }
diff --git a/internal/wire/testdata/ExportedValue/foo/wire.go b/internal/wire/testdata/ExportedValue/foo/wire.go
index f31b925..cf54a48 100644
--- a/internal/wire/testdata/ExportedValue/foo/wire.go
+++ b/internal/wire/testdata/ExportedValue/foo/wire.go
@@ -22,5 +22,6 @@ import (
 )
 
 func injectedMessage() string {
-	panic(wire.Build(bar.Value))
+	wire.Build(bar.Value)
+	return ""
 }
diff --git a/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go b/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go
index f9c12a1..f7ebb84 100644
--- a/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go
+++ b/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go
@@ -24,5 +24,6 @@ import (
 )
 
 func injectedFile() *os.File {
-	panic(wire.Build(bar.Value))
+	wire.Build(bar.Value)
+	return nil
 }
diff --git a/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go b/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go
index 4bfcf4f..b1e8c27 100644
--- a/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go
+++ b/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go
@@ -17,10 +17,11 @@
 package main
 
 import (
-	"github.com/google/go-cloud/wire"
 	"foo"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooer() foo.Fooer {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return nil
 }
diff --git a/internal/wire/testdata/InjectInput/foo/wire.go b/internal/wire/testdata/InjectInput/foo/wire.go
index 32def6e..db3cff6 100644
--- a/internal/wire/testdata/InjectInput/foo/wire.go
+++ b/internal/wire/testdata/InjectInput/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFooBar(foo Foo) FooBar {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return 0
 }
diff --git a/internal/wire/testdata/InjectInputConflict/foo/wire.go b/internal/wire/testdata/InjectInputConflict/foo/wire.go
index f316ce1..c126f25 100644
--- a/internal/wire/testdata/InjectInputConflict/foo/wire.go
+++ b/internal/wire/testdata/InjectInputConflict/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectBar(foo Foo) Bar {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return 0
 }
diff --git a/internal/wire/testdata/InjectWithReturn/foo/foo.go b/internal/wire/testdata/InjectWithPanic/foo/foo.go
similarity index 100%
rename from internal/wire/testdata/InjectWithReturn/foo/foo.go
rename to internal/wire/testdata/InjectWithPanic/foo/foo.go
diff --git a/internal/wire/testdata/InjectWithReturn/foo/wire.go b/internal/wire/testdata/InjectWithPanic/foo/wire.go
similarity index 94%
rename from internal/wire/testdata/InjectWithReturn/foo/wire.go
rename to internal/wire/testdata/InjectWithPanic/foo/wire.go
index fcaecc3..7c1e5a8 100644
--- a/internal/wire/testdata/InjectWithReturn/foo/wire.go
+++ b/internal/wire/testdata/InjectWithPanic/foo/wire.go
@@ -21,6 +21,5 @@ import (
 )
 
 func injectedMessage() string {
-	wire.Build(provideMessage)
-	return ""
+	panic(wire.Build(provideMessage))
 }
diff --git a/internal/wire/testdata/InjectWithReturn/out.txt b/internal/wire/testdata/InjectWithPanic/out.txt
similarity index 100%
rename from internal/wire/testdata/InjectWithReturn/out.txt
rename to internal/wire/testdata/InjectWithPanic/out.txt
diff --git a/internal/wire/testdata/InjectWithReturn/pkg b/internal/wire/testdata/InjectWithPanic/pkg
similarity index 100%
rename from internal/wire/testdata/InjectWithReturn/pkg
rename to internal/wire/testdata/InjectWithPanic/pkg
diff --git a/internal/wire/testdata/InterfaceBinding/foo/wire.go b/internal/wire/testdata/InterfaceBinding/foo/wire.go
index 6aa286a..b489768 100644
--- a/internal/wire/testdata/InterfaceBinding/foo/wire.go
+++ b/internal/wire/testdata/InterfaceBinding/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFooer() Fooer {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return nil
 }
diff --git a/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go b/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go
index e0a6143..90efd23 100644
--- a/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go
+++ b/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go
@@ -21,8 +21,10 @@ import (
 )
 
 func injectFooBar() FooBar {
-	panic(wire.Build(
+	wire.Build(
 		provideBar,
 		provideFooBar,
-		wire.Bind((*Fooer)(nil), (*Bar)(nil))))
+		wire.Bind((*Fooer)(nil), (*Bar)(nil)),
+	)
+	return FooBar{}
 }
diff --git a/internal/wire/testdata/NiladicIdentity/foo/wire.go b/internal/wire/testdata/NiladicIdentity/foo/wire.go
index 7c1e5a8..fcaecc3 100644
--- a/internal/wire/testdata/NiladicIdentity/foo/wire.go
+++ b/internal/wire/testdata/NiladicIdentity/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectedMessage() string {
-	panic(wire.Build(provideMessage))
+	wire.Build(provideMessage)
+	return ""
 }
diff --git a/internal/wire/testdata/NiladicValue/foo/wire.go b/internal/wire/testdata/NiladicValue/foo/wire.go
index d8165ee..80ec41b 100644
--- a/internal/wire/testdata/NiladicValue/foo/wire.go
+++ b/internal/wire/testdata/NiladicValue/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectedMessage() string {
-	panic(wire.Build(wire.Value("Hello, World!")))
+	wire.Build(wire.Value("Hello, World!"))
+	return ""
 }
diff --git a/internal/wire/testdata/NoImplicitInterface/foo/wire.go b/internal/wire/testdata/NoImplicitInterface/foo/wire.go
index b73bf41..0040565 100644
--- a/internal/wire/testdata/NoImplicitInterface/foo/wire.go
+++ b/internal/wire/testdata/NoImplicitInterface/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFooer() Fooer {
-	panic(wire.Build(provideBar))
+	wire.Build(provideBar)
+	return nil
 }
diff --git a/internal/wire/testdata/NoInjectParamNames/foo/wire.go b/internal/wire/testdata/NoInjectParamNames/foo/wire.go
index 354a705..32c3930 100644
--- a/internal/wire/testdata/NoInjectParamNames/foo/wire.go
+++ b/internal/wire/testdata/NoInjectParamNames/foo/wire.go
@@ -26,5 +26,6 @@ import (
 // parameter names on the inject stub.
 
 func inject(stdcontext.Context, struct{}) (context, error) {
-	panic(wire.Build(provide))
+	wire.Build(provide)
+	return context{}, nil
 }
diff --git a/internal/wire/testdata/PartialCleanup/foo/wire.go b/internal/wire/testdata/PartialCleanup/foo/wire.go
index 62dd47a..4437532 100644
--- a/internal/wire/testdata/PartialCleanup/foo/wire.go
+++ b/internal/wire/testdata/PartialCleanup/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectBaz() (Baz, func(), error) {
-	panic(wire.Build(provideFoo, provideBar, provideBaz))
+	wire.Build(provideFoo, provideBar, provideBaz)
+	return 0, nil, nil
 }
diff --git a/internal/wire/testdata/PkgImport/foo/wire.go b/internal/wire/testdata/PkgImport/foo/wire.go
index 55ba464..d08b058 100644
--- a/internal/wire/testdata/PkgImport/foo/wire.go
+++ b/internal/wire/testdata/PkgImport/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFooBar() FooBar {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return 0
 }
diff --git a/internal/wire/testdata/ReturnError/foo/wire.go b/internal/wire/testdata/ReturnError/foo/wire.go
index b181e34..bf7ee06 100644
--- a/internal/wire/testdata/ReturnError/foo/wire.go
+++ b/internal/wire/testdata/ReturnError/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFoo() (Foo, error) {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return 0, nil
 }
diff --git a/internal/wire/testdata/Struct/foo/wire.go b/internal/wire/testdata/Struct/foo/wire.go
index 55ba464..479b780 100644
--- a/internal/wire/testdata/Struct/foo/wire.go
+++ b/internal/wire/testdata/Struct/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFooBar() FooBar {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return FooBar{}
 }
diff --git a/internal/wire/testdata/StructPointer/foo/wire.go b/internal/wire/testdata/StructPointer/foo/wire.go
index 6cf4d85..c9215bf 100644
--- a/internal/wire/testdata/StructPointer/foo/wire.go
+++ b/internal/wire/testdata/StructPointer/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFooBar() *FooBar {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return nil
 }
diff --git a/internal/wire/testdata/TwoDeps/foo/wire.go b/internal/wire/testdata/TwoDeps/foo/wire.go
index 55ba464..d08b058 100644
--- a/internal/wire/testdata/TwoDeps/foo/wire.go
+++ b/internal/wire/testdata/TwoDeps/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFooBar() FooBar {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return 0
 }
diff --git a/internal/wire/testdata/UnexportedValue/foo/wire.go b/internal/wire/testdata/UnexportedValue/foo/wire.go
index f31b925..cf54a48 100644
--- a/internal/wire/testdata/UnexportedValue/foo/wire.go
+++ b/internal/wire/testdata/UnexportedValue/foo/wire.go
@@ -22,5 +22,6 @@ import (
 )
 
 func injectedMessage() string {
-	panic(wire.Build(bar.Value))
+	wire.Build(bar.Value)
+	return ""
 }
diff --git a/internal/wire/testdata/ValueChain/foo/wire.go b/internal/wire/testdata/ValueChain/foo/wire.go
index 55ba464..d08b058 100644
--- a/internal/wire/testdata/ValueChain/foo/wire.go
+++ b/internal/wire/testdata/ValueChain/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectFooBar() FooBar {
-	panic(wire.Build(Set))
+	wire.Build(Set)
+	return 0
 }
diff --git a/internal/wire/testdata/ValueConversion/foo/wire.go b/internal/wire/testdata/ValueConversion/foo/wire.go
index 9178b74..067bedc 100644
--- a/internal/wire/testdata/ValueConversion/foo/wire.go
+++ b/internal/wire/testdata/ValueConversion/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectedMessage() Foo {
-	panic(wire.Build(wire.Value(Foo("Hello, World!"))))
+	wire.Build(wire.Value(Foo("Hello, World!")))
+	return ""
 }
diff --git a/internal/wire/testdata/VarValue/foo/wire.go b/internal/wire/testdata/VarValue/foo/wire.go
index e8e749b..e1bda37 100644
--- a/internal/wire/testdata/VarValue/foo/wire.go
+++ b/internal/wire/testdata/VarValue/foo/wire.go
@@ -21,5 +21,6 @@ import (
 )
 
 func injectedMessage() string {
-	panic(wire.Build(wire.Value(msg)))
+	wire.Build(wire.Value(msg))
+	return ""
 }
diff --git a/internal/wire/testdata/Vendor/foo/wire.go b/internal/wire/testdata/Vendor/foo/wire.go
index 2389188..a3d76cd 100644
--- a/internal/wire/testdata/Vendor/foo/wire.go
+++ b/internal/wire/testdata/Vendor/foo/wire.go
@@ -22,5 +22,6 @@ import (
 )
 
 func injectedMessage() string {
-	panic(wire.Build(bar.ProvideMessage))
+	wire.Build(bar.ProvideMessage)
+	return ""
 }