From 32b8d8958edacdd1ccb1289a7dd63d506d0a19c1 Mon Sep 17 00:00:00 2001
From: vyzo <vyzo@hackzen.org>
Date: Fri, 19 Mar 2021 21:44:02 +0200
Subject: [PATCH] fix TestValidate, add TestValidate2

---
 validation_test.go | 64 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/validation_test.go b/validation_test.go
index ad3b291..68ed8e3 100644
--- a/validation_test.go
+++ b/validation_test.go
@@ -100,22 +100,60 @@ func TestValidate(t *testing.T) {
 	}
 
 	for _, tc := range msgs {
-		for _, p := range psubs {
-			err := p.Publish(topic, tc.msg)
+		err := psubs[0].Publish(topic, tc.msg)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		select {
+		case msg := <-sub.ch:
+			if !tc.validates {
+				t.Log(msg)
+				t.Error("expected message validation to filter out the message")
+			}
+		case <-time.After(333 * time.Millisecond):
+			if tc.validates {
+				t.Error("expected message validation to accept the message")
+			}
+		}
+	}
+}
+
+func TestValidate2(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	hosts := getNetHosts(t, ctx, 1)
+	psubs := getPubsubs(ctx, hosts)
+
+	topic := "foobar"
+
+	err := psubs[0].RegisterTopicValidator(topic, func(ctx context.Context, from peer.ID, msg *Message) bool {
+		return !bytes.Contains(msg.Data, []byte("illegal"))
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	msgs := []struct {
+		msg       []byte
+		validates bool
+	}{
+		{msg: []byte("this is a legal message"), validates: true},
+		{msg: []byte("there also is nothing controversial about this message"), validates: true},
+		{msg: []byte("openly illegal content will be censored"), validates: false},
+		{msg: []byte("but subversive actors will use leetspeek to spread 1ll3g4l content"), validates: true},
+	}
+
+	for _, tc := range msgs {
+		err := psubs[0].Publish(topic, tc.msg)
+		if tc.validates {
 			if err != nil {
 				t.Fatal(err)
 			}
-
-			select {
-			case msg := <-sub.ch:
-				if !tc.validates {
-					t.Log(msg)
-					t.Error("expected message validation to filter out the message")
-				}
-			case <-time.After(333 * time.Millisecond):
-				if tc.validates {
-					t.Error("expected message validation to accept the message")
-				}
+		} else {
+			if err == nil {
+				t.Fatal("expected validation to fail for this message")
 			}
 		}
 	}