Callback rather than output channel

monitor/monitor_test.go

@@ -13,7 +13,7 @@ import (
 const testmport = ":13152"
 
 func Test_MonitorListen(t *testing.T) {
-	m, err := New(testmport)
+	m, err := New(testmport, func(string) {})
 	if err != nil {
 		t.Fatalf("cannot create new monitor: %v", err)
 	}
@@ -48,14 +48,12 @@ func Test_MonitorListen(t *testing.T) {
 }
 
 func Test_Monitor(t *testing.T) {
-	m, err := New(testmport)
+	m, err := New(testmport, func(string) {})
 	if err != nil {
 		t.Fatalf("cannot create new monitor: %v", err)
 	}
 	itemsNew := make(chan Item, 1)
-	itemsDone := make(chan Item, 1)
 	m.newItems = itemsNew
-	m.triggeredItems = itemsDone
 
 	if err := m.Start(); err != nil {
 		t.Fatalf("cannot start monitor: %v", err)
@@ -70,17 +68,6 @@ func Test_Monitor(t *testing.T) {
 		}
 	}
 
-	for i := 0; i < 2; i++ {
-		select {
-		case triggered := <-itemsDone:
-			if triggered.URL != "item"+strconv.Itoa(i) {
-				t.Fatalf("wrong item done order: %d was %v", i, triggered)
-			}
-		case <-time.After(time.Second * 5):
-			t.Fatalf("could not get done item in time limit")
-		}
-	}
-
 	if err := m.Stop(); err != nil {
 		t.Fatalf("could not stop monitor: %v", err)
 	}