From 5e7381c04b2b1bc0b1ebd54f74c74868703c351e Mon Sep 17 00:00:00 2001
From: bel <bel@bel.bel>
Date: Sun, 5 Nov 2023 21:35:28 -0700
Subject: [PATCH] test fails appropriately

---
 replicator/driver.go          | 17 +++++++++++++++--
 replicator/replicator_test.go | 24 ++++++++++++++----------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/replicator/driver.go b/replicator/driver.go
index ec8cc1a..147d36a 100644
--- a/replicator/driver.go
+++ b/replicator/driver.go
@@ -1,6 +1,7 @@
 package replicator
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"net/url"
@@ -28,11 +29,11 @@ type (
 
 	KeyVersion struct {
 		Key     Key
-		Version []byte
+		Version Version
 	}
 
 	ValueVersion struct {
-		Value   []byte
+		Value   Value
 		Version Version
 	}
 )
@@ -64,3 +65,15 @@ func TimeAsVersion(t time.Time) Version {
 	n := t.UnixNano()
 	return []byte(strconv.FormatInt(n, 10))
 }
+
+func (version Version) Equal(other Version) bool {
+	return bytes.Equal(version, other)
+}
+
+func (key Key) Equal(other Key) bool {
+	return key == other
+}
+
+func (value Value) Equal(other Value) bool {
+	return bytes.Equal(value, other)
+}
diff --git a/replicator/replicator_test.go b/replicator/replicator_test.go
index 300d502..502298c 100644
--- a/replicator/replicator_test.go
+++ b/replicator/replicator_test.go
@@ -2,6 +2,7 @@ package replicator
 
 import (
 	"context"
+	"errors"
 	"sync"
 	"testing"
 	"time"
@@ -13,16 +14,19 @@ func TestReplicatorStream(t *testing.T) {
 	version := TimeAsVersion(time.Now())
 
 	cases := map[string]struct {
-		before func(Replicator)
-		during func(Replicator)
-		after  func(Replicator)
+		before func(*testing.T, Replicator)
+		during func(*testing.T, Replicator)
+		after  func(*testing.T, Replicator)
 	}{
 		"noop": {},
 		"one prior op moves": {
-			before: func(r Replicator) {
+			before: func(t *testing.T, r Replicator) {
 				r.Src.Set(nil, key, value, version)
 			},
-			after: func(r Replicator) {
+			after: func(t *testing.T, r Replicator) {
+				if got, _ := r.Dest.Get(nil, key); !got.Version.Equal(version) || !got.Value.Equal(value) {
+					t.Error(got)
+				}
 			},
 		},
 	}
@@ -30,30 +34,30 @@ func TestReplicatorStream(t *testing.T) {
 	for name, d := range cases {
 		c := d
 		t.Run(name, func(t *testing.T) {
-			replicator := NewReplicator(NewMap(), NewMap())
+			replicator := NewReplicator(NewMust(NewMap()), NewMust(NewMap()))
 			ctx, can := context.WithTimeout(context.Background(), time.Second*10)
 			defer can()
 
 			if c.before != nil {
-				c.before(replicator)
+				c.before(t, replicator)
 			}
 
 			wg := &sync.WaitGroup{}
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
-				if err := replicator.Stream(ctx); err != nil && ctx.Err() == nil {
+				if err := replicator.Stream(ctx); err != nil && !errors.Is(err, ctx.Err()) {
 					t.Fatal(err)
 				}
 			}()
 			if c.during != nil {
-				c.during(replicator)
+				c.during(t, replicator)
 			}
 
 			can()
 			wg.Wait()
 			if c.after != nil {
-				c.after(replicator)
+				c.after(t, replicator)
 			}
 		})
 	}