lilfade/Activity-Relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Go version update and fix tests. (#44)

Browse Source
This commit is contained in:
Naoki Kosaka
2021-06-17 00:39:35 +09:00
committed by GitHub
parent 638a1e7319
commit 7894e78c3f
12 changed files with 932 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cli/cli_test.go
View File

@ -5,15 +5,16 @@ import (
"testing"
"github.com/spf13/viper"
state "github.com/yukimochi/Activity-Relay/State"
)
func TestMain(m *testing.M) {
viper.Set("actor_pem", "../misc/testKey.pem")
viper.Set("relay_domain", "relay.yukimochi.example.org")
initConfig()
relayState = state.NewState(relayState.RedisClient, false)
relayState.RedisClient.FlushAll().Result()
code := m.Run()
os.Exit(code)
relayState.RedisClient.FlushAll().Result()
}

27
cli/config_test.go
View File

@ -9,57 +9,68 @@ import (
)
func TestServiceBlock(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
relayState.SetConfig(BlockService, false)
app.SetArgs([]string{"config", "enable", "service-block"})
app.Execute()
relayState.Load()
if !relayState.RelayConfig.BlockService {
t.Fatalf("Not Enabled Blocking feature for service-type actor")
}
app.SetArgs([]string{"config", "enable", "-d", "service-block"})
app.Execute()
relayState.Load()
if relayState.RelayConfig.BlockService {
t.Fatalf("Not Disabled Blocking feature for service-type actor")
}
}
func TestManuallyAccept(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
relayState.SetConfig(ManuallyAccept, false)
app.SetArgs([]string{"config", "enable", "manually-accept"})
app.Execute()
relayState.Load()
if !relayState.RelayConfig.ManuallyAccept {
t.Fatalf("Not Enabled Manually accept follow-request feature")
}
app.SetArgs([]string{"config", "enable", "-d", "manually-accept"})
app.Execute()
relayState.Load()
if relayState.RelayConfig.ManuallyAccept {
t.Fatalf("Not Disabled Manually accept follow-request feature")
}
}
func TestCreateAsAnnounce(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
relayState.SetConfig(CreateAsAnnounce, false)
app.SetArgs([]string{"config", "enable", "create-as-announce"})
app.Execute()
relayState.Load()
if !relayState.RelayConfig.CreateAsAnnounce {
t.Fatalf("Enable announce activity instead of relay create activity")
}
app.SetArgs([]string{"config", "enable", "-d", "create-as-announce"})
app.Execute()
relayState.Load()
if relayState.RelayConfig.CreateAsAnnounce {
t.Fatalf("Enable announce activity instead of relay create activity")
}
}
func TestInvalidConfig(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
@ -74,6 +85,8 @@ func TestInvalidConfig(t *testing.T) {
}
func TestListConfig(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
@ -101,6 +114,8 @@ func TestListConfig(t *testing.T) {
}
func TestExportConfig(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
@ -120,10 +135,13 @@ func TestExportConfig(t *testing.T) {
}
func TestImportConfig(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
app.Execute()
relayState.Load()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
@ -140,7 +158,4 @@ func TestImportConfig(t *testing.T) {
if strings.Split(output, "\n")[0] != string(jsonData) {
t.Fatalf("Invalid Response.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}

61
cli/domain_test.go
View File

@ -7,10 +7,12 @@ import (
)
func TestListDomainSubscriber(t *testing.T) {
app := buildNewCmd()
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
app.Execute()
relayState.Load()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
@ -26,16 +28,16 @@ Total : 1
if output != valid {
t.Fatalf("Invalid Response.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestListDomainLimited(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
app.Execute()
relayState.Load()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
@ -51,16 +53,16 @@ Total : 1
if output != valid {
t.Fatalf("Invalid Response.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestListDomainBlocked(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
app.Execute()
relayState.Load()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
@ -76,16 +78,16 @@ Total : 1
if output != valid {
t.Fatalf("Invalid Response.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestSetDomainBlocked(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"domain", "set", "-t", "blocked", "testdomain.example.jp"})
app.Execute()
relayState.Load()
valid := false
for _, domain := range relayState.BlockedDomains {
@ -97,16 +99,16 @@ func TestSetDomainBlocked(t *testing.T) {
if !valid {
t.Fatalf("Not set blocked domain")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestSetDomainLimited(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"domain", "set", "-t", "limited", "testdomain.example.jp"})
app.Execute()
relayState.Load()
valid := false
for _, domain := range relayState.LimitedDomains {
@ -118,12 +120,11 @@ func TestSetDomainLimited(t *testing.T) {
if !valid {
t.Fatalf("Not set limited domain")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestUnsetDomainBlocked(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
@ -131,6 +132,7 @@ func TestUnsetDomainBlocked(t *testing.T) {
app.SetArgs([]string{"domain", "set", "-t", "blocked", "-u", "blockedDomain.example.jp"})
app.Execute()
relayState.Load()
valid := true
for _, domain := range relayState.BlockedDomains {
@ -142,12 +144,11 @@ func TestUnsetDomainBlocked(t *testing.T) {
if !valid {
t.Fatalf("Not unset blocked domain")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestUnsetDomainLimited(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
@ -155,6 +156,7 @@ func TestUnsetDomainLimited(t *testing.T) {
app.SetArgs([]string{"domain", "set", "-t", "limited", "-u", "limitedDomain.example.jp"})
app.Execute()
relayState.Load()
valid := true
for _, domain := range relayState.LimitedDomains {
@ -166,16 +168,16 @@ func TestUnsetDomainLimited(t *testing.T) {
if !valid {
t.Fatalf("Not unset blocked domain")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestSetDomainInvalid(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
app.Execute()
relayState.Load()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
@ -187,12 +189,11 @@ func TestSetDomainInvalid(t *testing.T) {
if strings.Split(output, "\n")[0] != "Invalid type given" {
t.Fatalf("Invalid Response.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestUnfollowDomain(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
@ -200,6 +201,7 @@ func TestUnfollowDomain(t *testing.T) {
app.SetArgs([]string{"domain", "unfollow", "subscription.example.jp"})
app.Execute()
relayState.Load()
valid := true
for _, domain := range relayState.Subscriptions {
@ -211,16 +213,16 @@ func TestUnfollowDomain(t *testing.T) {
if !valid {
t.Fatalf("Not unfollowed domain")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestInvalidUnfollowDomain(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
app.SetArgs([]string{"config", "import", "--json", "../misc/exampleConfig.json"})
app.Execute()
relayState.Load()
buffer := new(bytes.Buffer)
app.SetOutput(buffer)
@ -232,7 +234,4 @@ func TestInvalidUnfollowDomain(t *testing.T) {
if strings.Split(output, "\n")[0] != "Invalid domain [unknown.tld] given" {
t.Fatalf("Invalid Response.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}

28
cli/follow_test.go
View File

@ -7,6 +7,8 @@ import (
)
func TestListFollows(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
buffer := new(bytes.Buffer)
@ -31,12 +33,11 @@ Total : 1
if output != valid {
t.Fatalf("Invalid Response.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestAcceptFollow(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
relayState.RedisClient.HMSet("relay:pending:example.com", map[string]interface{}{
@ -59,12 +60,11 @@ func TestAcceptFollow(t *testing.T) {
if valid != 1 {
t.Fatalf("Not created subscription.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestRejectFollow(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
relayState.RedisClient.HMSet("relay:pending:example.com", map[string]interface{}{
@ -87,12 +87,11 @@ func TestRejectFollow(t *testing.T) {
if valid != 0 {
t.Fatalf("Created subscription.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestInvalidFollow(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
buffer := new(bytes.Buffer)
@ -105,12 +104,11 @@ func TestInvalidFollow(t *testing.T) {
if strings.Split(output, "\n")[0] != "Invalid domain [unknown.tld] given" {
t.Fatalf("Invalid Response.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestInvalidRejectFollow(t *testing.T) {
relayState.RedisClient.FlushAll().Result()
app := buildNewCmd()
buffer := new(bytes.Buffer)
@ -123,9 +121,6 @@ func TestInvalidRejectFollow(t *testing.T) {
if strings.Split(output, "\n")[0] != "Invalid domain [unknown.tld] given" {
t.Fatalf("Invalid Response.")
}
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}
func TestCreateUpdateActorActivity(t *testing.T) {
@ -136,7 +131,4 @@ func TestCreateUpdateActorActivity(t *testing.T) {
app.SetArgs([]string{"follow", "update"})
app.Execute()
relayState.RedisClient.FlushAll().Result()
relayState.Load()
}