Test with since == message time

diff --git a/server/server_test.go b/server/server_test.go
index 13ad4a941e44c4fcfdc04ee922469c2b35f6cb06..72e2b2152bac50ea18c42f19aea8c3901c16e573 100644 (file)
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -135,3 +135,93 @@ func TestPartialRetreive(t *testing.T) {
        close(store.Get)
        close(store.Add)
 }
        close(store.Get)
        close(store.Add)
 }

+
+func TestPrecisePartialRetreive(t *testing.T) {
+       start_speak_count := atoi(speak_count.String())
+       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?"
+       base := time.Now()
+       at1 := base.Add(parseDuration("-3m"))
+       at2 := base.Add(parseDuration("-2m"))
+       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}
+       for atoi(speak_count.String()) != start_speak_count+3 {
+               runtime.Gosched()
+       }
+       messages_from_store := make(chan []Message, 1)
+       store.Get <- &StoreRequest{since, messages_from_store}
+       messages := <-messages_from_store
+       if len(messages) != 1 {
+               t.FailNow()
+       }
+       if messages[0].Time != at3 {
+               t.Fail()
+       }
+       if messages[0].Text != say3 {
+               t.Fail()
+       }
+       close(store.Get)
+       close(store.Add)
+}
+
+func TestTypicalFlow(t *testing.T) {
+       say1 := "The Norwegian Blue prefers kippin' on it's back!"
+       say2 := "Remarkable bird, innit, squire?  Lovely plumage!"
+       store := start_store()
+
+       // A waiting zero-time fetch.
+       var zero_time time.Time
+       prev_fetch_wait_count := fetch_wait_count.String()
+       fetch1 := make(chan []Message, 1)
+       store.Get <- &StoreRequest{zero_time, fetch1}
+       for prev_fetch_wait_count == fetch_wait_count.String() {
+               runtime.Gosched()
+       }
+
+       // Someone speaks.  This triggers delivery.
+       at1 := time.Now()
+       store.Add <- &Message{at1, say1}
+       messages1 := <-fetch1
+       if len(messages1) != 1 {
+               t.FailNow()
+       }
+       if messages1[0].Time != at1 {
+               t.Fail()
+       }
+       if messages1[0].Text != say1 {
+               t.Fail()
+       }
+
+       // Upon recipt, client blocks on fetch with since=at1
+       prev_fetch_wait_count = fetch_wait_count.String()
+       fetch2 := make(chan []Message, 1)
+       store.Get <- &StoreRequest{at1, fetch2}
+       for prev_fetch_wait_count == fetch_wait_count.String() {
+               runtime.Gosched()
+       }
+
+       // Someone speaks again.  This triggers another delivery.
+       at2 := time.Now()
+       if !at2.After(at1) {
+               t.Fail()
+       }
+       store.Add <- &Message{at2, say2}
+       messages2 := <-fetch2
+       if len(messages2) != 1 {
+               t.FailNow()
+       }
+       if messages2[0].Time != at2 {
+               t.Fail()
+       }
+       if messages2[0].Text != say2 {
+               t.Fail()
+       }
+
+       close(store.Get)
+       close(store.Add)
+}