fix unit test

fogfish · Nov 18, 2023 · 8366401 · 8366401
1 parent d862572
commit 8366401
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/internal/qtest/qtest.go b/internal/qtest/qtest.go
@@ -24,10 +24,9 @@ import (
 const (
 	Category = "Note"
 	Message  = "{\"some\":\"message\"}"
-	Event    = ""
 	Receipt  = "0x123456789abcdef"
 
-	EventCategory = "Event[Note]"
+	EventCategory = "qtest.EventNote"
 )
 
 var (
@@ -42,6 +41,11 @@ type User struct {
 	Some string `json:"some"`
 }
 
+type EventNote swarm.Event[*Note]
+
+func (EventNote) HKT1(swarm.EventType) {}
+func (EventNote) HKT2(*Note)           {}
+
 type effect = chan string
 type queueName = string
 type category = string
@@ -124,11 +128,11 @@ func TestEnqueueEvent(t *testing.T, factory enqueue) {
 
 	q := factory(eff, "test-queue", EventCategory, retry200ms)
 
-	note, _ := events.Enqueue[*Note, swarm.Event[*Note]](q)
+	note, _ := events.Enqueue[*Note, EventNote](q)
 	user, dlq := events.Enqueue[*User, swarm.Event[*User]](q)
 
 	t.Run("Enqueue", func(t *testing.T) {
-		note <- &swarm.Event[*Note]{
+		note <- &EventNote{
 			Object: &Note{Some: "message"},
 		}
 
@@ -140,7 +144,7 @@ func TestEnqueueEvent(t *testing.T, factory enqueue) {
 			it.Then(t).
 				Should(it.Nil(err)).
 				Should(it.Equal(*val.Object, Note{Some: "message"})).
-				Should(it.Equal(val.Type, "note:Event[Note]")).
+				Should(it.Equal(val.Type, "qtest.EventNote")).
 				ShouldNot(it.Equal(len(val.ID), 0)).
 				ShouldNot(it.True(val.Created.IsZero()))
 
@@ -231,7 +235,7 @@ func TestDequeueEvent(t *testing.T, factory dequeue) {
 	eff := make(chan string, 1)
 
 	t.Run("Typed", func(t *testing.T) {
-		event := swarm.Event[*Note]{
+		event := &EventNote{
 			ID:          "id",
 			Type:        "type",
 			Agent:       "agent",
@@ -243,7 +247,7 @@ func TestDequeueEvent(t *testing.T, factory dequeue) {
 
 		q := factory(eff, "test-queue", EventCategory, string(message), Receipt, retry200ms)
 
-		msg, ack := events.Dequeue[*Note, swarm.Event[*Note]](q)
+		msg, ack := events.Dequeue[*Note, EventNote](q)
 		go q.Await()
 
 		val := <-msg

diff --git a/queue/events/enqueue.go b/queue/events/enqueue.go
@@ -29,7 +29,6 @@ func Enqueue[T any, E swarm.EventKind[T]](q swarm.Broker, category ...string) (c
 	conf := q.Config()
 	ch := swarm.NewEvtEnqCh[T, E](conf.EnqueueCapacity)
 
-	catT := strings.ToLower(categoryOf[T]())
 	catE := categoryOf[E]()
 	if len(category) > 0 {
 		catE = category[0]
@@ -45,7 +44,7 @@ func Enqueue[T any, E swarm.EventKind[T]](q swarm.Broker, category ...string) (c
 
 		_, knd, src, _ := shape.Get(object)
 		if knd == "" {
-			knd = curie.IRI(catT + ":" + catE)
+			knd = curie.IRI(catE)
 		}
 
 		if src == "" {
@@ -83,9 +82,11 @@ func Enqueue[T any, E swarm.EventKind[T]](q swarm.Broker, category ...string) (c
 // normalized type name
 func categoryOf[T any]() string {
 	typ := reflect.TypeOf(new(T)).Elem()
+	cat := typ.String()
 	if typ.Kind() == reflect.Ptr {
-		return typ.Elem().String()
+		cat = typ.Elem().String()
 	}
 
-	return typ.String()
+	seq := strings.Split(cat, "[")
+	return seq[0]
 }