From 230b684dbbbaf654dd76a3b3c9e6dad465f48fef Mon Sep 17 00:00:00 2001 From: Scott Nichols Date: Mon, 22 Apr 2019 08:31:00 -0700 Subject: [PATCH] Fix imports for sub test. --- .../subscription/subscription_test.go | 425 +++++++++--------- 1 file changed, 213 insertions(+), 212 deletions(-) diff --git a/pkg/reconciler/subscription/subscription_test.go b/pkg/reconciler/subscription/subscription_test.go index fe9f0441a88..84bf5e5255d 100644 --- a/pkg/reconciler/subscription/subscription_test.go +++ b/pkg/reconciler/subscription/subscription_test.go @@ -19,7 +19,6 @@ package subscription import ( "encoding/json" "fmt" - testing2 "github.com/knative/eventing/pkg/reconciler/testing" "testing" corev1 "k8s.io/api/core/v1" @@ -39,6 +38,8 @@ import ( duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1" "github.com/knative/pkg/controller" logtesting "github.com/knative/pkg/logging/testing" + + . "github.com/knative/eventing/pkg/reconciler/testing" . "github.com/knative/pkg/reconciler/testing" ) @@ -115,14 +116,14 @@ func TestAllCases(t *testing.T) { }, { Name: "subscription, but subscriber is not addressable", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), ), - testing2.NewUnstructured(subscriberGVK, subscriberName, testNS), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewUnstructured(subscriberGVK, subscriberName, testNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), }, Key: testNS + "/" + subscriptionName, @@ -131,23 +132,23 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeWarning, "SubscriberResolveFailed", "Failed to resolve spec.subscriber: status does not contain address"), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, + WithInitSubscriptionConditions, ), }}, }, { Name: "subscription, but subscriber does not exist", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), }, Key: testNS + "/" + subscriptionName, @@ -156,26 +157,26 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeWarning, "SubscriberResolveFailed", "Failed to resolve spec.subscriber: subscribers.testing.eventing.knative.dev %q not found", subscriberName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, + WithInitSubscriptionConditions, ), }}, }, { Name: "subscription, reply does not exist", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithSubscriptionReply(channelGVK, replyName), + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithSubscriptionReply(channelGVK, replyName), ), - testing2.NewUnstructured(subscriberGVK, subscriberName, testNS, - testing2.WithUnstructuredAddressable(subscriberDNS)), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewUnstructured(subscriberGVK, subscriberName, testNS, + WithUnstructuredAddressable(subscriberDNS)), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), }, Key: testNS + "/" + subscriptionName, @@ -184,31 +185,31 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeWarning, "ResultResolveFailed", "Failed to resolve spec.reply: channels.eventing.knative.dev %q not found", replyName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithSubscriptionReply(channelGVK, replyName), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithSubscriptionReply(channelGVK, replyName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), + WithInitSubscriptionConditions, + WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), ), }}, }, { Name: "subscription, reply is not addressable", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithSubscriptionReply(subscriberGVK, replyName), // reply will be a subscriberGVK for this test + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithSubscriptionReply(subscriberGVK, replyName), // reply will be a subscriberGVK for this test ), - testing2.NewUnstructured(subscriberGVK, subscriberName, testNS, - testing2.WithUnstructuredAddressable(subscriberDNS), + NewUnstructured(subscriberGVK, subscriberName, testNS, + WithUnstructuredAddressable(subscriberDNS), ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), - testing2.NewUnstructured(subscriberGVK, replyName, testNS), + NewUnstructured(subscriberGVK, replyName, testNS), }, Key: testNS + "/" + subscriptionName, WantErr: true, @@ -217,28 +218,28 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeWarning, "SubscriptionUpdateStatusFailed", "Failed to update Subscription's status: status does not contain address"), // TODO: BUGBUG THIS IS WEIRD }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithSubscriptionReply(subscriberGVK, replyName), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithSubscriptionReply(subscriberGVK, replyName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), + WithInitSubscriptionConditions, + WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), ), }}, }, { Name: "subscription, valid channel+subscriber", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), ), - testing2.NewUnstructured(subscriberGVK, subscriberName, testNS, - testing2.WithUnstructuredAddressable(subscriberDNS), + NewUnstructured(subscriberGVK, subscriberName, testNS, + WithUnstructuredAddressable(subscriberDNS), ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), }, Key: testNS + "/" + subscriptionName, @@ -247,13 +248,13 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeNormal, "SubscriptionReconciled", "Subscription reconciled: %q", subscriptionName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), ), }}, WantPatches: []clientgotesting.PatchActionImpl{ @@ -265,17 +266,17 @@ func TestAllCases(t *testing.T) { }, { Name: "subscription, valid channel+reply", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionReply(channelGVK, replyName), + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionReply(channelGVK, replyName), ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), - testing2.NewChannel(replyName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(replyDNS), + NewChannel(replyName, testNS, + WithInitChannelConditions, + WithChannelAddress(replyDNS), ), }, Key: testNS + "/" + subscriptionName, @@ -284,13 +285,13 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeNormal, "SubscriptionReconciled", "Subscription reconciled: %q", subscriptionName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionReply(channelGVK, replyName), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionReply(channelGVK, replyName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionReply(replyURI), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionReply(replyURI), ), }}, WantPatches: []clientgotesting.PatchActionImpl{ @@ -302,21 +303,21 @@ func TestAllCases(t *testing.T) { }, { Name: "subscription, valid channel+subscriber+reply", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithSubscriptionReply(channelGVK, replyName), + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithSubscriptionReply(channelGVK, replyName), ), - testing2.NewUnstructured(subscriberGVK, subscriberName, testNS, - testing2.WithUnstructuredAddressable(subscriberDNS), + NewUnstructured(subscriberGVK, subscriberName, testNS, + WithUnstructuredAddressable(subscriberDNS), ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), - testing2.NewChannel(replyName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(replyDNS), + NewChannel(replyName, testNS, + WithInitChannelConditions, + WithChannelAddress(replyDNS), ), }, Key: testNS + "/" + subscriptionName, @@ -325,15 +326,15 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeNormal, "SubscriptionReconciled", "Subscription reconciled: %q", subscriptionName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithSubscriptionReply(channelGVK, replyName), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithSubscriptionReply(channelGVK, replyName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), - testing2.WithSubscriptionPhysicalSubscriptionReply(replyURI), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), + WithSubscriptionPhysicalSubscriptionReply(replyURI), ), }}, WantPatches: []clientgotesting.PatchActionImpl{ @@ -345,21 +346,21 @@ func TestAllCases(t *testing.T) { }, { Name: "subscription, valid remove reply", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), - testing2.WithSubscriptionPhysicalSubscriptionReply(replyURI), - ), - testing2.NewUnstructured(subscriberGVK, subscriberName, testNS, - testing2.WithUnstructuredAddressable(subscriberDNS), - ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), - testing2.WithChannelSubscribers([]v1alpha1.ChannelSubscriberSpec{ + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), + WithSubscriptionPhysicalSubscriptionReply(replyURI), + ), + NewUnstructured(subscriberGVK, subscriberName, testNS, + WithUnstructuredAddressable(subscriberDNS), + ), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), + WithChannelSubscribers([]v1alpha1.ChannelSubscriberSpec{ {UID: subscriptionUID, SubscriberURI: subscriberURI, ReplyURI: replyURI, DeprecatedRef: &corev1.ObjectReference{Name: subscriptionName, Namespace: testNS, UID: subscriptionUID}}, }), ), @@ -370,12 +371,12 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeNormal, "SubscriptionReconciled", "Subscription reconciled: %q", subscriptionName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), ), }}, WantPatches: []clientgotesting.PatchActionImpl{ @@ -387,24 +388,24 @@ func TestAllCases(t *testing.T) { }, { Name: "subscription, valid remove subscriber", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithInitSubscriptionConditions, - testing2.WithSubscriptionReply(channelGVK, replyName), - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), - testing2.WithSubscriptionPhysicalSubscriptionReply(replyURI), - ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), - testing2.WithChannelSubscribers([]v1alpha1.ChannelSubscriberSpec{ + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithInitSubscriptionConditions, + WithSubscriptionReply(channelGVK, replyName), + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionSubscriber(subscriberURI), + WithSubscriptionPhysicalSubscriptionReply(replyURI), + ), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), + WithChannelSubscribers([]v1alpha1.ChannelSubscriberSpec{ {UID: subscriptionUID, SubscriberURI: subscriberURI, ReplyURI: replyURI, DeprecatedRef: &corev1.ObjectReference{Name: subscriptionName, Namespace: testNS, UID: subscriptionUID}}, }), ), - testing2.NewChannel(replyName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(replyDNS), + NewChannel(replyName, testNS, + WithInitChannelConditions, + WithChannelAddress(replyDNS), ), }, Key: testNS + "/" + subscriptionName, @@ -413,12 +414,12 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeNormal, "SubscriptionReconciled", "Subscription reconciled: %q", subscriptionName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionReply(channelGVK, replyName), - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionReply(replyURI), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionReply(channelGVK, replyName), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionReply(replyURI), ), }}, WantPatches: []clientgotesting.PatchActionImpl{ @@ -430,13 +431,13 @@ func TestAllCases(t *testing.T) { }, { Name: "subscription, channel+subscriber as service, does not exist", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(serviceGVK, serviceName), + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(serviceGVK, serviceName), ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), }, Key: testNS + "/" + subscriptionName, @@ -445,25 +446,25 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeWarning, "SubscriberResolveFailed", "Failed to resolve spec.subscriber: services %q not found", serviceName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(serviceGVK, serviceName), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(serviceGVK, serviceName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, + WithInitSubscriptionConditions, ), }}, }, { Name: "subscription, valid channel+subscriber as service", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(serviceGVK, serviceName), + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(serviceGVK, serviceName), ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), - testing2.NewService(serviceName, testNS), + NewService(serviceName, testNS), }, Key: testNS + "/" + subscriptionName, WantErr: false, @@ -471,13 +472,13 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeNormal, "SubscriptionReconciled", "Subscription reconciled: %q", subscriptionName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(serviceGVK, serviceName), + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(serviceGVK, serviceName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), ), }}, WantPatches: []clientgotesting.PatchActionImpl{ @@ -489,23 +490,23 @@ func TestAllCases(t *testing.T) { }, { Name: "subscription, two subscribers for a channel", Objects: []runtime.Object{ - testing2.NewSubscription("a_"+subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(serviceGVK, serviceName), + NewSubscription("a_"+subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(serviceGVK, serviceName), ), // an already rec'ed subscription - testing2.NewSubscription("b_"+subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(serviceGVK, serviceName), - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), + NewSubscription("b_"+subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(serviceGVK, serviceName), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), - testing2.NewService(serviceName, testNS), + NewService(serviceName, testNS), }, Key: testNS + "/" + "a_" + subscriptionName, WantErr: false, @@ -513,13 +514,13 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeNormal, "SubscriptionReconciled", "Subscription reconciled: %q", "a_"+subscriptionName), }, WantStatusUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription("a_"+subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(serviceGVK, serviceName), + Object: NewSubscription("a_"+subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(serviceGVK, serviceName), // The first reconciliation will initialize the status conditions. - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), ), }}, WantPatches: []clientgotesting.PatchActionImpl{ @@ -532,26 +533,26 @@ func TestAllCases(t *testing.T) { }, { Name: "subscription deleted", Objects: []runtime.Object{ - testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithSubscriptionReply(channelGVK, replyName), - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionFinalizers(finalizerName), - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), - testing2.WithSubscriptionDeleted, + NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithSubscriptionReply(channelGVK, replyName), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionFinalizers(finalizerName), + WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), + WithSubscriptionDeleted, ), - testing2.NewUnstructured(subscriberGVK, subscriberName, testNS, - testing2.WithUnstructuredAddressable(subscriberDNS), + NewUnstructured(subscriberGVK, subscriberName, testNS, + WithUnstructuredAddressable(subscriberDNS), ), - testing2.NewChannel(channelName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(channelDNS), + NewChannel(channelName, testNS, + WithInitChannelConditions, + WithChannelAddress(channelDNS), ), - testing2.NewChannel(replyName, testNS, - testing2.WithInitChannelConditions, - testing2.WithChannelAddress(replyDNS), + NewChannel(replyName, testNS, + WithInitChannelConditions, + WithChannelAddress(replyDNS), ), }, Key: testNS + "/" + subscriptionName, @@ -560,14 +561,14 @@ func TestAllCases(t *testing.T) { Eventf(corev1.EventTypeNormal, "SubscriptionReconciled", "Subscription reconciled: %q", subscriptionName), }, WantUpdates: []clientgotesting.UpdateActionImpl{{ - Object: testing2.NewSubscription(subscriptionName, testNS, - testing2.WithSubscriptionChannel(channelGVK, channelName), - testing2.WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), - testing2.WithSubscriptionReply(channelGVK, replyName), - testing2.WithInitSubscriptionConditions, - testing2.MarkSubscriptionReady, - testing2.WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), - testing2.WithSubscriptionDeleted, + Object: NewSubscription(subscriptionName, testNS, + WithSubscriptionChannel(channelGVK, channelName), + WithSubscriptionSubscriberRef(subscriberGVK, subscriberName), + WithSubscriptionReply(channelGVK, replyName), + WithInitSubscriptionConditions, + MarkSubscriptionReady, + WithSubscriptionPhysicalSubscriptionSubscriber(serviceURI), + WithSubscriptionDeleted, ), }}, WantPatches: []clientgotesting.PatchActionImpl{ @@ -577,7 +578,7 @@ func TestAllCases(t *testing.T) { } defer logtesting.ClearAll() - table.Test(t, testing2.MakeFactory(func(listers *testing2.Listers, opt reconciler.Options) controller.Reconciler { + table.Test(t, MakeFactory(func(listers *Listers, opt reconciler.Options) controller.Reconciler { return &Reconciler{ Base: reconciler.NewBase(opt, controllerAgentName), subscriptionLister: listers.GetSubscriptionLister(),