Remove 'or any later version' license choice

[reliable-chat] / server / server_test.go

diff --git a/server/server_test.go b/server/server_test.go
index 5031c898a25f1d81359e7cb81c20c9b2e33fefef..b9a7c925ebc1822b5e1764bc3642a0c74b4ecea1 100644 (file)
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -3,8 +3,7 @@
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
+ *  published by the Free Software Foundation, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -40,6 +39,11 @@ func TestMessageInsertAndRetreive(t *testing.T) {
        at := time.Now()
        var zero_time time.Time
        store := start_store()
+       defer func() {
+               close(store.Get)
+               close(store.Add)
+       }()
+
        store.Add <- &Message{at, id, say}
        messages_from_store := make(chan []Message, 1)
        store.Get <- &StoreRequest{zero_time, messages_from_store}
@@ -48,8 +52,6 @@ func TestMessageInsertAndRetreive(t *testing.T) {
                t.FailNow()
        }
        expectMessage(t, &messages[0], at, id, say)
-       close(store.Get)
-       close(store.Add)
 }
 
 func TestFetchBlocksUntilSpeak(t *testing.T) {
@@ -59,6 +61,11 @@ func TestFetchBlocksUntilSpeak(t *testing.T) {
        at := time.Now()
        var zero_time time.Time
        store := start_store()
+       defer func() {
+               close(store.Get)
+               close(store.Add)
+       }()
+
        messages_from_store := make(chan []Message, 1)
        store.Get <- &StoreRequest{zero_time, messages_from_store}
        for start_fetch_wait_count == fetch_wait_count.String() {
@@ -70,8 +77,6 @@ func TestFetchBlocksUntilSpeak(t *testing.T) {
                t.FailNow()
        }
        expectMessage(t, &messages[0], at, id, say)
-       close(store.Get)
-       close(store.Add)
 }
 
 func TestMultipleListeners(t *testing.T) {
@@ -80,6 +85,11 @@ func TestMultipleListeners(t *testing.T) {
        at := time.Now()
        var zero_time time.Time
        store := start_store()
+       defer func() {
+               close(store.Get)
+               close(store.Add)
+       }()
+
        const num_clients = 13
        var messages_from_store [num_clients]chan []Message
        for i := 0; i < num_clients; i++ {
@@ -94,8 +104,6 @@ func TestMultipleListeners(t *testing.T) {
                }
                expectMessage(t, &messages[0], at, id, say)
        }
-       close(store.Get)
-       close(store.Add)
 }
 
 func parseDuration(s string) time.Duration {
@@ -128,6 +136,11 @@ func TestPartialRetreive(t *testing.T) {
        at2 := base.Add(parseDuration("-2m"))
        at3 := base.Add(parseDuration("-1m"))
        store := start_store()
+       defer func() {
+               close(store.Get)
+               close(store.Add)
+       }()
+
        store.Add <- &Message{at1, id1, say1}
        store.Add <- &Message{at2, id2, say2}
        store.Add <- &Message{at3, id3, say3}
@@ -142,8 +155,6 @@ func TestPartialRetreive(t *testing.T) {
        }
        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) {
@@ -160,6 +171,11 @@ func TestPrecisePartialRetreive(t *testing.T) {
        at3 := base.Add(parseDuration("-1m"))
        since := at2
        store := start_store()
+       defer func() {
+               close(store.Get)
+               close(store.Add)
+       }()
+
        store.Add <- &Message{at1, id1, say1}
        store.Add <- &Message{at2, id2, say2}
        store.Add <- &Message{at3, id3, say3}
@@ -173,8 +189,6 @@ func TestPrecisePartialRetreive(t *testing.T) {
                t.FailNow()
        }
        expectMessage(t, &messages[0], at3, id3, say3)
-       close(store.Get)
-       close(store.Add)
 }
 
 func TestTypicalFlow(t *testing.T) {
@@ -183,6 +197,10 @@ 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()
+       defer func() {
+               close(store.Get)
+               close(store.Add)
+       }()
 
        // A waiting zero-time fetch.
        var zero_time time.Time
@@ -221,7 +239,47 @@ func TestTypicalFlow(t *testing.T) {
                t.FailNow()
        }
        expectMessage(t, &messages2[0], at2, id2, say2)
+}
+
+func TestExpiryDueToLimit(t *testing.T) {
+       previous_limit := *max_messages
+       defer func() { *max_messages = previous_limit }()
+       *max_messages = 2
+
+       start_speak_count := atoi(speak_count.String())
+       start_drop_count := atoi(drop_due_to_limit_count.String())
+       id1 := "12"
+       id2 := "13"
+       id3 := "14"
+       say1 := "'E's passed on!"
+       say2 := "This parrot is no more!"
+       say3 := "He has ceased to be!"
+       base := time.Now()
+       at1 := base.Add(parseDuration("-3m"))
+       at2 := base.Add(parseDuration("-2m"))
+       at3 := base.Add(parseDuration("-1m"))
+       store := start_store()
+       defer func() {
+               close(store.Get)
+               close(store.Add)
+       }()
 
-       close(store.Get)
-       close(store.Add)
+       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()
+       }
+       if atoi(drop_due_to_limit_count.String()) != start_drop_count+1 {
+               t.Fail()
+       }
+       messages_from_store := make(chan []Message, 1)
+       var zero_time time.Time
+       store.Get <- &StoreRequest{zero_time, messages_from_store}
+       messages := <-messages_from_store
+       if len(messages) != 2 {
+               t.FailNow()
+       }
+       expectMessage(t, &messages[0], at2, id2, say2)
+       expectMessage(t, &messages[1], at3, id3, say3)
 }