- Updated: cleanup

Author: donutloop

bus/bus.go

@@ -34,8 +34,8 @@ func New() Bus {
 	}
 }
 
-// Dispatch sends an msg to registered handler that were declared
-// to accept values of a msg
+//Dispatch sends an msg to registered handler that were declared
+//to accept values of a msg
 func (b *InProcBus) Dispatch(msg Msg) error {
 	nameOfMsg := reflect.TypeOf(msg)
 
@@ -55,8 +55,8 @@ func (b *InProcBus) Dispatch(msg Msg) error {
 	return nil
 }
 
-// Dispatch sends an msg to all registered listeners that were declared
-// to accept values of a msg
+//Publish sends an msg to all registered listeners that were declared
+//to accept values of a msg
 func (b *InProcBus) Publish(msg Msg) error {
 	nameOfMsg := reflect.TypeOf(msg)
 	listeners := b.listeners[nameOfMsg.String()]
@@ -74,8 +74,8 @@ func (b *InProcBus) Publish(msg Msg) error {
 	return nil
 }
 
-// AddHandler registers a handler function that will be called when a matching
-// msg is dispatched.
+//AddHandler registers a handler function that will be called when a matching
+//msg is dispatched.
 func (b *InProcBus) AddHandler(handler HandlerFunc) error {
 	b.Mutex.Lock()
 	defer b.Mutex.Unlock()
@@ -92,8 +92,8 @@ func (b *InProcBus) AddHandler(handler HandlerFunc) error {
 	return nil
 }
 
-// AddListener registers a listener function that will be called when a matching
-// msg is dispatched.
+//AddListener registers a listener function that will be called when a matching
+//msg is dispatched.
 func (b *InProcBus) AddEventListener(handler HandlerFunc) {
 	b.Mutex.Lock()
 	defer b.Mutex.Unlock()
@@ -109,7 +109,7 @@ func (b *InProcBus) AddEventListener(handler HandlerFunc) {
 	b.listeners[typOfMsg.String()] = append(b.listeners[typOfMsg.String()], reflect.ValueOf(handler))
 }
 
-// panic if conditions not met (this is a programming error)
+//panic if conditions not met (this is a programming error)
 func validateHandlerFunc(handlerType reflect.Type) {
 	switch {
 	case handlerType.Kind() != reflect.Func:
@@ -121,8 +121,8 @@ func validateHandlerFunc(handlerType reflect.Type) {
 	}
 }
 
-// BadFuncError is raised via panic() when AddEventListener is called with an
-// invalid listener function.
+//BadFuncError is raised via panic() when AddEventListener or AddHandler is called with an
+//invalid listener function.
 type BadFuncError string
 
 func (bhf BadFuncError) Error() string {

bus/bus_test.go

@@ -21,27 +21,27 @@ func TestHandlerReturnsError(t *testing.T) {
 
 	err := b.Dispatch(new(msg))
 	if err == nil {
-		t.Fatal("Send query failed " + err.Error())
+		t.Fatalf("dispatch msg failed (%s)", err.Error())
 	}
 }
 
 func TestHandlerReturn(t *testing.T) {
 	b := bus.New()
 
-	b.AddHandler(func(q *msg) error {
-		q.body = "Hello, world!"
+	b.AddHandler(func(m *msg) error {
+		m.body = "Hello, world!"
 		return nil
 	})
 
 	msg := new(msg)
 	err := b.Dispatch(msg)
 
 	if err != nil {
-		t.Fatal("Send msg failed " + err.Error())
+		t.Fatalf("dispatch msg failed (%s)", err.Error())
 	}
 
 	if msg.body != "Hello, world!" {
-		t.Fatal("Failed to get response from handler")
+		t.Fatal("failed to get response from handler")
 	}
 }
 
@@ -61,11 +61,11 @@ func TestEventListeners(t *testing.T) {
 
 	err := b.Publish(new(msg))
 	if err != nil {
-		t.Fatal("Publish msg failed " + err.Error())
+		t.Fatalf("publish msg failed (%s)", err.Error())
 	}
 
 	if count != 11 {
-		t.Fatal(fmt.Sprintf("Publish msg failed, listeners called: %v, expected: %v", count, 11))
+		t.Fatal(fmt.Sprintf("publish msg failed, listeners called: %v, expected: %v", count, 11))
 	}
 }
 
@@ -80,7 +80,7 @@ func TestAddHandlerBadFunc(t *testing.T) {
 	}()
 
 	b := bus.New()
-	b.AddHandler(func(q *msg, s string) error {
+	b.AddHandler(func(m *msg, s string) error {
 		return nil
 	})
 }
@@ -96,7 +96,7 @@ func TestAddListenerBadFunc(t *testing.T) {
 	}()
 
 	b := bus.New()
-	b.AddEventListener(func(q *msg, s string) error {
+	b.AddEventListener(func(m *msg, s string) error {
 		return nil
 	})
 }
@@ -125,23 +125,23 @@ func BenchmarkRun(b *testing.B) {
 			return nil
 		})
 
-		b.AddHandler(func(q *msg) error {
+		b.AddHandler(func(m *msg) error {
 			return nil
 		})
 
-		b.AddHandler(func(q *msg) error {
+		b.AddHandler(func(m *msg) error {
 			return nil
 		})
 
-		b.AddHandler(func(q *msg) error {
+		b.AddHandler(func(m *msg) error {
 			return nil
 		})
 
-		b.AddHandler(func(q *msg) error {
+		b.AddHandler(func(m *msg) error {
 			return nil
 		})
 
-		b.AddHandler(func(q *msg) error {
+		b.AddHandler(func(m *msg) error {
 			return nil
 		})
 

concurrent/runner_test.go

@@ -28,7 +28,7 @@ func TestRun(t *testing.T) {
 
 	expectedValue := int32(6)
 	if counter != expectedValue {
-		t.Errorf(`unexpected value (Actual: %d, expected: %d)`, counter, expectedValue)
+		t.Errorf(`unexpected value (actual: %d, expected: %d)`, counter, expectedValue)
 	}
 }
 
@@ -50,12 +50,12 @@ func TestRunFail(t *testing.T) {
 
 	expectedCountOfErrors := 2
 	if len(errs) != expectedCountOfErrors {
-		t.Fatalf(`unexpected count of errors (Actual: %d, expected: %d)`, len(errs), expectedCountOfErrors)
+		t.Fatalf(`unexpected count of errors (actual: %d, expected: %d)`, len(errs), expectedCountOfErrors)
 	}
 
 	expectedValue := int32(3)
 	if counter != expectedValue {
-		t.Errorf(`unexpected value (Actual: %d, expected: %d)`, counter, expectedValue)
+		t.Errorf(`unexpected value (actual: %d, expected: %d)`, counter, expectedValue)
 	}
 }
 

schedule/schedule_test.go

@@ -36,7 +36,7 @@ func TestFIFOSchedule(t *testing.T) {
 	s.WaitFinish(100)
 	expectedJobCount := 100
 	if s.Scheduled() != expectedJobCount {
-		t.Fatalf("scheduled (Actual: %d, Expected: %d)", s.Scheduled(), expectedJobCount)
+		t.Fatalf("scheduled (actual: %d, expected: %d)", s.Scheduled(), expectedJobCount)
 	}
 }
 
@@ -64,7 +64,7 @@ func BenchmarkFIFOSchedule(b *testing.B) {
 
 		expectedJobCount := 100
 		if s.Scheduled() != expectedJobCount {
-			b.Fatalf("scheduled (Actual: %d, Expected: %d)", s.Scheduled(), expectedJobCount)
+			b.Fatalf("scheduled (actual: %d, expected: %d)", s.Scheduled(), expectedJobCount)
 			s.Stop()
 		}
 		s.Stop()