fix: adapter register tests

Author: katallaxie

.test/reports/unit-test-coverage.out

@@ -39,7 +39,7 @@ type dataExample struct {
 
 func (a *Adapter) newEvent() cloudevents.Event {
 	event := cloudevents.NewEvent()
-	event.SetType("dev.knative.sample")
+	event.SetType("com.zeiss.eventing.sources.sample")
 	event.SetSource("sample.knative.dev/heartbeat-source")
 
 	if err := event.SetData(cloudevents.ApplicationJSON, &dataExample{
@@ -61,7 +61,7 @@ func (a *Adapter) Start(ctx context.Context) error {
 		case <-time.After(a.interval):
 			event := a.newEvent()
 			a.logger.Infow("Sending new event", zap.String("event", event.String()))
-			if result := a.client.Send(context.Background(), event); !cloudevents.IsACK(result) {
+			if result := a.client.Send(ctx, event); !cloudevents.IsACK(result) {
 				a.logger.Infow("failed to send event", zap.String("event", event.String()), zap.Error(result))
 				// We got an error but it could be transient, try again next interval.
 				continue
@@ -77,6 +77,7 @@ func NewAdapter(ctx context.Context, aEnv adapter.EnvConfigAccessor, ceClient cl
 	env := aEnv.(*envConfig) // Will always be our own envConfig type
 	logger := logging.FromContext(ctx)
 	logger.Infow("Heartbeat example", zap.Duration("interval", env.Interval))
+
 	return &Adapter{
 		interval: env.Interval,
 		client:   ceClient,

.test/reports/unit-test.xml

@@ -43,8 +43,8 @@ func TestAdapter(t *testing.T) {
 func verify(t *testing.T, received chan cloudevents.Event) {
 	for _, id := range []int{0, 1, 2} {
 		e := <-received
-		assert.Equal(t, "dev.knative.sample", e.Type())
-		//m := map[string]json.RawMessage{}
+		assert.Equal(t, "com.zeiss.eventing.sources.sample", e.Type())
+		// m := map[string]json.RawMessage{}
 		m := &dataExample{}
 		assert.NoError(t, e.DataAs(&m))
 		n := &dataExample{Sequence: id, Heartbeat: "1ms"}
@@ -97,7 +97,7 @@ type sink struct {
 
 func newSink(t *testing.T) *sink {
 	s := &sink{received: make(chan cloudevents.Event)}
-	//s.ctx, s.close = context.WithTimeout(context.Background(), 5*time.Second)
+	// s.ctx, s.close = context.WithTimeout(context.Background(), 5*time.Second)
 	s.ctx, s.close = context.WithTimeout(context.Background(), 1500*time.Millisecond)
 	var err error
 	s.listener, err = net.Listen("tcp", ":0")

pkg/adapter/adapter.go

@@ -1,19 +1,3 @@
-/*
-Copyright 2019 The Knative Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 package v1alpha1
 
 import (
@@ -23,15 +7,15 @@ import (
 )
 
 func TestRegisterHelpers(t *testing.T) {
-	if got, want := Kind("Foo"), "Foo.samples.knative.dev"; got.String() != want {
+	if got, want := Kind("Foo"), "Foo.sources.eventing.zeiss.com"; got.String() != want {
 		t.Errorf("Kind(Foo) = %v, want %v", got.String(), want)
 	}
 
-	if got, want := Resource("Foo"), "Foo.samples.knative.dev"; got.String() != want {
+	if got, want := Resource("Foo"), "Foo.sources.eventing.zeiss.com"; got.String() != want {
 		t.Errorf("Resource(Foo) = %v, want %v", got.String(), want)
 	}
 
-	if got, want := SchemeGroupVersion.String(), "samples.knative.dev/v1alpha1"; got != want {
+	if got, want := SchemeGroupVersion.String(), "sources.eventing.zeiss.com/v1alpha1"; got != want {
 		t.Errorf("SchemeGroupVersion() = %v, want %v", got, want)
 	}
 

pkg/adapter/adapter_test.go

@@ -24,14 +24,14 @@ import (
 
 // SetDefaults mutates SampleSource.
 func (s *SampleSource) SetDefaults(ctx context.Context) {
-	//Add code for Mutating admission webhook.
+	// Add code for Mutating admission webhook.
 
-	//example: If ServiceAccountName is unspecified, default to the "default" service account.
+	// example: If ServiceAccountName is unspecified, default to the "default" service account.
 	if s != nil && s.Spec.ServiceAccountName == "" {
 		s.Spec.ServiceAccountName = "default"
 	}
 
-	//example: If Interval is unspecified, default to "10s".
+	// example: If Interval is unspecified, default to "10s".
 	if s != nil && s.Spec.Interval == "" {
 		s.Spec.Interval = "10s"
 	}

pkg/apis/sources/v1alpha1/register_test.go

@@ -27,29 +27,29 @@ import (
 func (s *SampleSource) Validate(ctx context.Context) *apis.FieldError {
 	var errs *apis.FieldError
 
-	//example: validation for "spec" field.
+	// example: validation for "spec" field.
 	errs = errs.Also(s.Spec.Validate(ctx).ViaField("spec"))
 
-	//errs is nil if everything is fine.
+	// errs is nil if everything is fine.
 	return errs
 }
 
 // Validate validates SampleSourceSpec.
 func (sspec *SampleSourceSpec) Validate(ctx context.Context) *apis.FieldError {
-	//Add code for validation webhook for SampleSourceSpec.
+	// Add code for validation webhook for SampleSourceSpec.
 	var errs *apis.FieldError
 
-	//example: validation for sink field.
+	// example: validation for sink field.
 	if fe := sspec.Sink.Validate(ctx); fe != nil {
 		errs = errs.Also(fe.ViaField("sink"))
 	}
 
-	//example: validation for interval field.
+	// example: validation for interval field.
 	if _, fe := time.ParseDuration(sspec.Interval); fe != nil {
 		errs = errs.Also(apis.ErrInvalidValue(fe, "interval"))
 	}
 
-	//example: validation for serviceAccountName field.
+	// example: validation for serviceAccountName field.
 	if sspec.ServiceAccountName == "" {
 		errs = errs.Also(apis.ErrMissingField("serviceAccountName"))
 	}

pkg/apis/sources/v1alpha1/samplesource_defaults.go

@@ -37,7 +37,6 @@ var _ reconcilersamplesource.Interface = (*Reconciler)(nil)
 
 // ReconcileKind implements Interface.ReconcileKind.
 func (r *Reconciler) ReconcileKind(ctx context.Context, src *v1alpha1.SampleSource) pkgreconciler.Event {
-
 	ctx = sourcesv1.WithURIResolver(ctx, r.sinkResolver)
 
 	ra, sb, event := r.dr.ReconcileDeployment(ctx, src, makeSinkBinding(src),