Better visibility for the server status indicators

[reliable-chat] / server / server_test.go

diff --git a/server/server_test.go b/server/server_test.go
index 72e2b2152bac50ea18c42f19aea8c3901c16e573..fb20ddc4070459b5bf9668a8b1ae2ac164c5af42 100644 (file)
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -5,30 +5,39 @@ import "runtime"
 import "strconv"
 import "time"
 
+func expectMessage(t *testing.T, m *Message, at time.Time, id, say string) {
+       if m.Time != at {
+               t.Fail()
+       }
+       if m.ID != id {
+               t.Fail()
+       }
+       if m.Text != say {
+               t.Fail()
+       }
+}
+
 func TestMessageInsertAndRetreive(t *testing.T) {
+       id := "1"
        say := "'Ello, Mister Polly Parrot!"
        at := time.Now()
        var zero_time time.Time
        store := start_store()
-       store.Add <- &Message{at, say}
+       store.Add <- &Message{at, id, say}
        messages_from_store := make(chan []Message, 1)
        store.Get <- &StoreRequest{zero_time, messages_from_store}
        messages := <-messages_from_store
        if len(messages) != 1 {
                t.FailNow()
        }
-       if messages[0].Time != at {
-               t.Fail()
-       }
-       if messages[0].Text != say {
-               t.Fail()
-       }
+       expectMessage(t, &messages[0], at, id, say)
        close(store.Get)
        close(store.Add)
 }
 
 func TestFetchBlocksUntilSpeak(t *testing.T) {
        start_fetch_wait_count := fetch_wait_count.String()
+       id := "2"
        say := "I've got a lovely fresh cuttle fish for you"
        at := time.Now()
        var zero_time time.Time
@@ -38,22 +47,18 @@ func TestFetchBlocksUntilSpeak(t *testing.T) {
        for start_fetch_wait_count == fetch_wait_count.String() {
                runtime.Gosched()
        }
-       store.Add <- &Message{at, say}
+       store.Add <- &Message{at, id, say}
        messages := <-messages_from_store
        if len(messages) != 1 {
                t.FailNow()
        }
-       if messages[0].Time != at {
-               t.Fail()
-       }
-       if messages[0].Text != say {
-               t.Fail()
-       }
+       expectMessage(t, &messages[0], at, id, say)
        close(store.Get)
        close(store.Add)
 }
 
 func TestMultipleListeners(t *testing.T) {
+       id := "3"
        say := "This is your nine o'clock alarm call!"
        at := time.Now()
        var zero_time time.Time
@@ -64,18 +69,13 @@ func TestMultipleListeners(t *testing.T) {
                messages_from_store[i] = make(chan []Message, 1)
                store.Get <- &StoreRequest{zero_time, messages_from_store[i]}
        }
-       store.Add <- &Message{at, say}
+       store.Add <- &Message{at, id, say}
        for i := 0; i < num_clients; i++ {
                messages := <-messages_from_store[i]
                if len(messages) != 1 {
                        t.FailNow()
                }
-               if messages[0].Time != at {
-                       t.Fail()
-               }
-               if messages[0].Text != say {
-                       t.Fail()
-               }
+               expectMessage(t,& messages[0], at, id, say)
        }
        close(store.Get)
        close(store.Add)
@@ -99,6 +99,9 @@ func atoi(s string) int {
 
 func TestPartialRetreive(t *testing.T) {
        start_speak_count := atoi(speak_count.String())
+       id1 := "4"
+       id2 := "5"
+       id3 := "6"
        say1 := "No, no.....No, 'e's stunned!"
        say2 := "You stunned him, just as he was wakin' up!"
        say3 := "Norwegian Blues stun easily, major."
@@ -108,9 +111,9 @@ func TestPartialRetreive(t *testing.T) {
        at2 := base.Add(parseDuration("-2m"))
        at3 := base.Add(parseDuration("-1m"))
        store := start_store()
-       store.Add <- &Message{at1, say1}
-       store.Add <- &Message{at2, say2}
-       store.Add <- &Message{at3, say3}
+       store.Add <- &Message{at1, id1, say1}
+       store.Add <- &Message{at2, id2, say2}
+       store.Add <- &Message{at3, id3, say3}
        for atoi(speak_count.String()) != start_speak_count+3 {
                runtime.Gosched()
        }
@@ -120,24 +123,17 @@ func TestPartialRetreive(t *testing.T) {
        if len(messages) != 2 {
                t.FailNow()
        }
-       if messages[0].Time != at2 {
-               t.Fail()
-       }
-       if messages[0].Text != say2 {
-               t.Fail()
-       }
-       if messages[1].Time != at3 {
-               t.Fail()
-       }
-       if messages[1].Text != say3 {
-               t.Fail()
-       }
+       expectMessage(t, &messages[0], at2, id2, say2)
+       expectMessage(t, &messages[1], at3, id3, say3)
        close(store.Get)
        close(store.Add)
 }
 
 func TestPrecisePartialRetreive(t *testing.T) {
        start_speak_count := atoi(speak_count.String())
+       id1 := "7"
+       id2 := "8"
+       id3 := "9"
        say1 := "Well, he's...he's, ah...probably pining for the fjords."
        say2 := "PININ' for the FJORDS?!?!?!?"
        say3 := "look, why did he fall flat on his back the moment I got 'im home?"
@@ -147,9 +143,9 @@ func TestPrecisePartialRetreive(t *testing.T) {
        at3 := base.Add(parseDuration("-1m"))
        since := at2
        store := start_store()
-       store.Add <- &Message{at1, say1}
-       store.Add <- &Message{at2, say2}
-       store.Add <- &Message{at3, say3}
+       store.Add <- &Message{at1, id1, say1}
+       store.Add <- &Message{at2, id2, say2}
+       store.Add <- &Message{at3, id3, say3}
        for atoi(speak_count.String()) != start_speak_count+3 {
                runtime.Gosched()
        }
@@ -159,17 +155,14 @@ func TestPrecisePartialRetreive(t *testing.T) {
        if len(messages) != 1 {
                t.FailNow()
        }
-       if messages[0].Time != at3 {
-               t.Fail()
-       }
-       if messages[0].Text != say3 {
-               t.Fail()
-       }
+       expectMessage(t, &messages[0], at3, id3, say3)
        close(store.Get)
        close(store.Add)
 }
 
 func TestTypicalFlow(t *testing.T) {
+       id1 := "10"
+       id2 := "11"
        say1 := "The Norwegian Blue prefers kippin' on it's back!"
        say2 := "Remarkable bird, innit, squire?  Lovely plumage!"
        store := start_store()
@@ -185,17 +178,12 @@ func TestTypicalFlow(t *testing.T) {
 
        // Someone speaks.  This triggers delivery.
        at1 := time.Now()
-       store.Add <- &Message{at1, say1}
+       store.Add <- &Message{at1, id1, say1}
        messages1 := <-fetch1
        if len(messages1) != 1 {
                t.FailNow()
        }
-       if messages1[0].Time != at1 {
-               t.Fail()
-       }
-       if messages1[0].Text != say1 {
-               t.Fail()
-       }
+       expectMessage(t, &messages1[0], at1, id1, say1)
 
        // Upon recipt, client blocks on fetch with since=at1
        prev_fetch_wait_count = fetch_wait_count.String()
@@ -210,17 +198,12 @@ func TestTypicalFlow(t *testing.T) {
        if !at2.After(at1) {
                t.Fail()
        }
-       store.Add <- &Message{at2, say2}
+       store.Add <- &Message{at2, id2, say2}
        messages2 := <-fetch2
        if len(messages2) != 1 {
                t.FailNow()
        }
-       if messages2[0].Time != at2 {
-               t.Fail()
-       }
-       if messages2[0].Text != say2 {
-               t.Fail()
-       }
+       expectMessage(t, &messages2[0], at2, id2, say2)
 
        close(store.Get)
        close(store.Add)