3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-23 03:02:48 +01:00

Make sure ISUPPORT outputs are sorted and tested

This commit is contained in:
Daniel Oaks 2017-07-30 22:42:37 +10:00
parent 0fe3855582
commit ffabd26653
2 changed files with 70 additions and 21 deletions

View File

@ -4,6 +4,7 @@
package irc package irc
import "fmt" import "fmt"
import "sort"
const isupportSupportedString = "are supported by this server" const isupportSupportedString = "are supported by this server"
@ -41,9 +42,7 @@ func getTokenString(name string, value *string) string {
// GetDifference returns the difference between two token lists. // GetDifference returns the difference between two token lists.
func (il *ISupportList) GetDifference(newil *ISupportList) [][]string { func (il *ISupportList) GetDifference(newil *ISupportList) [][]string {
replies := make([][]string, 0) var outTokens sort.StringSlice
var length int // Length of the current cache
var cache []string // Token list cache
// append removed tokens // append removed tokens
for name := range il.Tokens { for name := range il.Tokens {
@ -54,32 +53,29 @@ func (il *ISupportList) GetDifference(newil *ISupportList) [][]string {
token := fmt.Sprintf("-%s", name) token := fmt.Sprintf("-%s", name)
if len(token)+length <= maxLastArgLength { outTokens = append(outTokens, token)
// account for the space separating tokens
if len(cache) > 0 {
length++
}
cache = append(cache, token)
length += len(token)
}
if len(cache) == 13 || len(token)+length >= maxLastArgLength {
cache = append(cache, isupportSupportedString)
replies = append(replies, cache)
cache = make([]string, 0)
length = 0
}
} }
// append added tokens // append added tokens
for name, value := range newil.Tokens { for name, value := range newil.Tokens {
newval, exists := il.Tokens[name] newval, exists := il.Tokens[name]
if exists && *value == *newval { if exists && ((value == nil && newval == nil) || (value != nil && newval != nil && *value == *newval)) {
continue continue
} }
token := getTokenString(name, value) token := getTokenString(name, value)
outTokens = append(outTokens, token)
}
sort.Sort(outTokens)
// create output list
replies := make([][]string, 0)
var length int // Length of the current cache
var cache []string // Token list cache
for _, token := range outTokens {
if len(token)+length <= maxLastArgLength { if len(token)+length <= maxLastArgLength {
// account for the space separating tokens // account for the space separating tokens
if len(cache) > 0 { if len(cache) > 0 {
@ -111,8 +107,15 @@ func (il *ISupportList) RegenerateCachedReply() {
var length int // Length of the current cache var length int // Length of the current cache
var cache []string // Token list cache var cache []string // Token list cache
for name, value := range il.Tokens { // make sure we get a sorted list of tokens, needed for tests and looks nice
token := getTokenString(name, value) var tokens sort.StringSlice
for name := range il.Tokens {
tokens = append(tokens, name)
}
sort.Sort(tokens)
for _, name := range tokens {
token := getTokenString(name, il.Tokens[name])
if len(token)+length <= maxLastArgLength { if len(token)+length <= maxLastArgLength {
// account for the space separating tokens // account for the space separating tokens

46
irc/isupport_test.go Normal file
View File

@ -0,0 +1,46 @@
// Copyright (c) 2016 Daniel Oaks <daniel@danieloaks.net>
// released under the MIT license
package irc
import (
"reflect"
"testing"
)
func TestISUPPORT(t *testing.T) {
// create first list
tList1 := NewISupportList()
tList1.Add("SASL", "yes")
tList1.Add("CASEMAPPING", "rfc1459-strict")
tList1.Add("INVEX", "i")
tList1.AddNoValue("EXTBAN")
tList1.Add("RANDKILL", "whenever")
tList1.RegenerateCachedReply()
expected := [][]string{{"CASEMAPPING=rfc1459-strict", "EXTBAN", "INVEX=i", "RANDKILL=whenever", "SASL=yes", "are supported by this server"}}
if !reflect.DeepEqual(tList1.CachedReply, expected) {
t.Error("tList1's cached reply does not match expected cached reply")
}
// create second list
tList2 := NewISupportList()
tList2.Add("SASL", "yes")
tList2.Add("CASEMAPPING", "ascii")
tList2.AddNoValue("INVEX")
tList2.Add("EXTBAN", "TestBah")
tList2.AddNoValue("STABLEKILL")
tList2.RegenerateCachedReply()
expected = [][]string{{"CASEMAPPING=ascii", "EXTBAN=TestBah", "INVEX", "SASL=yes", "STABLEKILL", "are supported by this server"}}
if !reflect.DeepEqual(tList2.CachedReply, expected) {
t.Error("tList2's cached reply does not match expected cached reply")
}
// compare lists
actual := tList1.GetDifference(tList2)
expected = [][]string{{"-RANDKILL", "CASEMAPPING=ascii", "EXTBAN=TestBah", "INVEX", "STABLEKILL", "are supported by this server"}}
if !reflect.DeepEqual(actual, expected) {
t.Error("difference reply does not match expected difference reply")
}
}