From f4d0bce701f4740bd65919e20ddb96203916ae55 Mon Sep 17 00:00:00 2001
From: slinkydeveloper <francescoguard@gmail.com>
Date: Thu, 11 Feb 2021 18:35:26 +0100
Subject: [PATCH] Fix rebase issues

Signed-off-by: Francesco Guardiani <francescoguard@gmail.com>
---
 test/rekt/features/broker/ingress.go        | 37 ++++++++-------------
 test/rekt/features/broker/source_to_sink.go |  8 +++--
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/test/rekt/features/broker/ingress.go b/test/rekt/features/broker/ingress.go
index e323fe0b04b..5423551f2ab 100644
--- a/test/rekt/features/broker/ingress.go
+++ b/test/rekt/features/broker/ingress.go
@@ -18,19 +18,20 @@ package broker
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 	cetest "github.com/cloudevents/sdk-go/v2/test"
 	"knative.dev/reconciler-test/pkg/eventshub"
 	"knative.dev/reconciler-test/pkg/feature"
-	eventshub2 "knative.dev/reconciler-test/pkg/test_images/eventshub"
 
 	"knative.dev/eventing/test/rekt/features"
 	"knative.dev/eventing/test/rekt/resources/broker"
 	"knative.dev/eventing/test/rekt/resources/svc"
 	"knative.dev/eventing/test/rekt/resources/trigger"
+
+	. "github.com/cloudevents/sdk-go/v2/test"
+	. "knative.dev/reconciler-test/pkg/eventshub/assert"
 )
 
 func BrokerIngressConformanceFeatures(brokerClass string) []*feature.Feature {
@@ -71,21 +72,14 @@ func brokerIngressConformanceFeature(brokerClass string, version string, enc clo
 	})
 
 	f.Stable("ingress supports v"+version).
-		Must("accept the event", eventshub.OnStore(sourceName).Match(
-			eventshub.MatchKind(eventshub2.EventResponse),
-			func(info eventshub2.EventInfo) error {
-				if info.StatusCode != 202 {
-					return fmt.Errorf("event status code don't match. Expected: '%d', Actual: '%d'", 200, info.StatusCode)
-				}
-				return nil
-			},
+		Must("accept the event", OnStore(sourceName).Match(
+			MatchKind(EventResponse),
+			MatchStatusCode(202),
 		).AtLeast(1)).
 		Must("deliver the event",
-			eventshub.OnStore(sinkName).Match(
-				eventshub.MatchEvent(cetest.AllOf(
-					cetest.HasId(event.ID()),
-					cetest.HasSpecVersion(event.SpecVersion()),
-				)),
+			OnStore(sinkName).MatchEvent(
+				HasId(event.ID()),
+				HasSpecVersion(event.SpecVersion()),
 			).AtLeast(1))
 
 	return f
@@ -124,17 +118,12 @@ func brokerIngressConformanceBadEvent(brokerClass string) *feature.Feature {
 	})
 
 	f.Stable("ingress").
-		Must("respond with 400 on bad event", eventshub.OnStore(sourceName).Match(
-			eventshub.MatchKind(eventshub2.EventResponse),
-			func(info eventshub2.EventInfo) error {
-				if info.StatusCode != 400 {
-					return fmt.Errorf("event status code don't match. Expected: '%d', Actual: '%d'", 400, info.StatusCode)
-				}
-				return nil
-			},
+		Must("respond with 400 on bad event", OnStore(sourceName).Match(
+			MatchKind(EventResponse),
+			MatchStatusCode(400),
 		).AtLeast(1)).
 		Must("must not propagate bad event",
-			eventshub.OnStore(sinkName).MatchEvent(cetest.HasId(eventID)).Not())
+			OnStore(sinkName).MatchEvent(HasId(eventID)).Not())
 
 	return f
 }
diff --git a/test/rekt/features/broker/source_to_sink.go b/test/rekt/features/broker/source_to_sink.go
index 4691fb2c4e4..37f6fb88d22 100644
--- a/test/rekt/features/broker/source_to_sink.go
+++ b/test/rekt/features/broker/source_to_sink.go
@@ -20,11 +20,13 @@ import (
 	"context"
 	"testing"
 
+	"knative.dev/reconciler-test/pkg/eventshub"
+	"knative.dev/reconciler-test/pkg/feature"
+
+	"knative.dev/eventing/test/rekt/features"
 	"knative.dev/eventing/test/rekt/resources/broker"
 	"knative.dev/eventing/test/rekt/resources/svc"
 	"knative.dev/eventing/test/rekt/resources/trigger"
-	"knative.dev/reconciler-test/pkg/eventshub"
-	"knative.dev/reconciler-test/pkg/feature"
 
 	. "github.com/cloudevents/sdk-go/v2/test"
 	. "knative.dev/reconciler-test/pkg/eventshub/assert"
@@ -60,7 +62,7 @@ func SourceToSink(brokerName string) *feature.Feature {
 
 	f.Stable("broker as middleware").
 		Must("deliver an event",
-			eventshub.OnStore(sink).Match(eventshub.MatchEvent(HasId(event.ID()))).Exact(1))
+			OnStore(sink).MatchEvent(HasId(event.ID())).Exact(1))
 
 	return f
 }