summaryrefslogtreecommitdiffstats
path: root/gateway
diff options
context:
space:
mode:
authorWim <wim@42.be>2018-03-05 00:30:46 +0100
committerWim <wim@42.be>2018-03-05 00:30:46 +0100
commit98027446c895de648c65af33f2010c73c752a8da (patch)
tree98f42e35f2700f1e65015ced1df949fd3125bd77 /gateway
parentf2f1d874e1b4f997c111de87121eec98eef66381 (diff)
downloadmatterbridge-msglm-98027446c895de648c65af33f2010c73c752a8da.tar.gz
matterbridge-msglm-98027446c895de648c65af33f2010c73c752a8da.tar.bz2
matterbridge-msglm-98027446c895de648c65af33f2010c73c752a8da.zip
Fix tests and make megacheck happy
Diffstat (limited to 'gateway')
-rw-r--r--gateway/gateway.go9
-rw-r--r--gateway/gateway_test.go30
2 files changed, 10 insertions, 29 deletions
diff --git a/gateway/gateway.go b/gateway/gateway.go
index a637dcf7..694fa95b 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -23,7 +23,6 @@ import (
"github.com/hashicorp/golang-lru"
"github.com/peterhellberg/emojilib"
"net/http"
- "reflect"
"regexp"
"strings"
"time"
@@ -450,14 +449,6 @@ func getChannelID(msg config.Message) string {
return msg.Channel + msg.Account
}
-//getField returns the Protocol configuration for a specific protocol (field)
-func getField(cfg *config.Config, field string) map[string]config.Protocol {
- r := reflect.ValueOf(cfg)
- f := reflect.Indirect(r).FieldByName(field)
- i := f.Interface()
- return i.(map[string]config.Protocol)
-}
-
func isApi(account string) bool {
return strings.HasPrefix(account, "api.")
}
diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
index 76faa890..25242177 100644
--- a/gateway/gateway_test.go
+++ b/gateway/gateway_test.go
@@ -3,14 +3,13 @@ package gateway
import (
"fmt"
"github.com/42wim/matterbridge/bridge/config"
- "github.com/BurntSushi/toml"
"github.com/stretchr/testify/assert"
"strconv"
"testing"
)
-var testconfig = `
+var testconfig = []byte(`
[irc.freenode]
[mattermost.test]
[gitter.42wim]
@@ -37,9 +36,9 @@ var testconfig = `
[[gateway.inout]]
account="slack.test"
channel="testing"
- `
+ `)
-var testconfig2 = `
+var testconfig2 = []byte(`
[irc.freenode]
[mattermost.test]
[gitter.42wim]
@@ -80,8 +79,9 @@ var testconfig2 = `
[[gateway.out]]
account = "discord.test"
channel = "general2"
- `
-var testconfig3 = `
+ `)
+
+var testconfig3 = []byte(`
[irc.zzz]
[telegram.zzz]
[slack.zzz]
@@ -149,13 +149,10 @@ enable=true
[[gateway.inout]]
account="telegram.zzz"
channel="--333333333333"
-`
+`)
-func maketestRouter(input string) *Router {
- var cfg *config.Config
- if _, err := toml.Decode(input, &cfg); err != nil {
- fmt.Println(err)
- }
+func maketestRouter(input []byte) *Router {
+ cfg := config.NewConfigFromString(input)
r, err := NewRouter(cfg)
if err != nil {
fmt.Println(err)
@@ -163,14 +160,7 @@ func maketestRouter(input string) *Router {
return r
}
func TestNewRouter(t *testing.T) {
- var cfg *config.Config
- if _, err := toml.Decode(testconfig, &cfg); err != nil {
- fmt.Println(err)
- }
- r, err := NewRouter(cfg)
- if err != nil {
- fmt.Println(err)
- }
+ r := maketestRouter(testconfig)
assert.Equal(t, 1, len(r.Gateways))
assert.Equal(t, 4, len(r.Gateways["bridge1"].Bridges))
assert.Equal(t, 4, len(r.Gateways["bridge1"].Channels))