Move test resource to misc/test.

This commit is contained in:
Naoki Kosaka
2021-06-21 07:37:42 +09:00
parent 1260985b75
commit 846b600d95
22 changed files with 33 additions and 33 deletions

View File

@ -12,13 +12,13 @@ import (
func TestMain(m *testing.M) {
var err error
testConfigPath := "../misc/config.yml"
testConfigPath := "../misc/test/config.yml"
file, _ := os.Open(testConfigPath)
defer file.Close()
viper.SetConfigType("yaml")
viper.ReadConfig(file)
viper.Set("ACTOR_PEM", "../misc/testKey.pem")
viper.Set("ACTOR_PEM", "../misc/test/testKey.pem")
viper.BindEnv("REDIS_URL")
globalConfig, err = models.NewRelayConfig()

View File

@ -20,7 +20,7 @@ func TestDecodeActivity(t *testing.T) {
InboxURL: "https://innocent.yukimochi.io/inbox",
})
file, _ := os.Open("../misc/create.json")
file, _ := os.Open("../misc/test/create.json")
body, _ := ioutil.ReadAll(file)
length := strconv.Itoa(len(body))
req, _ := http.NewRequest("POST", "/inbox", bytes.NewReader(body))
@ -50,7 +50,7 @@ func TestDecodeActivityWithNoSignature(t *testing.T) {
InboxURL: "https://innocent.yukimochi.io/inbox",
})
file, _ := os.Open("../misc/create.json")
file, _ := os.Open("../misc/test/create.json")
body, _ := ioutil.ReadAll(file)
length := strconv.Itoa(len(body))
req, _ := http.NewRequest("POST", "/inbox", bytes.NewReader(body))
@ -74,7 +74,7 @@ func TestDecodeActivityWithNotFoundKeyId(t *testing.T) {
InboxURL: "https://innocent.yukimochi.io/inbox",
})
file, _ := os.Open("../misc/create.json")
file, _ := os.Open("../misc/test/create.json")
body, _ := ioutil.ReadAll(file)
length := strconv.Itoa(len(body))
req, _ := http.NewRequest("POST", "/inbox", bytes.NewReader(body))
@ -99,7 +99,7 @@ func TestDecodeActivityWithInvalidDigest(t *testing.T) {
InboxURL: "https://innocent.yukimochi.io/inbox",
})
file, _ := os.Open("../misc/create.json")
file, _ := os.Open("../misc/test/create.json")
body, _ := ioutil.ReadAll(file)
length := strconv.Itoa(len(body))
req, _ := http.NewRequest("POST", "/inbox", bytes.NewReader(body))

View File

@ -254,19 +254,19 @@ func mockActivityDecoderProvider(activity *models.Activity, actor *models.Actor)
func mockActivity(req string) models.Activity {
switch req {
case "Follow":
file, _ := os.Open("../misc/follow.json")
file, _ := os.Open("../misc/test/follow.json")
body, _ := ioutil.ReadAll(file)
var activity models.Activity
json.Unmarshal(body, &activity)
return activity
case "Invalid-Follow":
file, _ := os.Open("../misc/followAsActor.json")
file, _ := os.Open("../misc/test/followAsActor.json")
body, _ := ioutil.ReadAll(file)
var activity models.Activity
json.Unmarshal(body, &activity)
return activity
case "Unfollow":
file, _ := os.Open("../misc/unfollow.json")
file, _ := os.Open("../misc/test/unfollow.json")
body, _ := ioutil.ReadAll(file)
var activity models.Activity
json.Unmarshal(body, &activity)
@ -282,7 +282,7 @@ func mockActivity(req string) models.Activity {
json.Unmarshal([]byte(body), &activity)
return activity
case "Create":
file, _ := os.Open("../misc/create.json")
file, _ := os.Open("../misc/test/create.json")
body, _ := ioutil.ReadAll(file)
var activity models.Activity
json.Unmarshal(body, &activity)
@ -293,13 +293,13 @@ func mockActivity(req string) models.Activity {
json.Unmarshal([]byte(body), &activity)
return activity
case "Announce":
file, _ := os.Open("../misc/announce.json")
file, _ := os.Open("../misc/test/announce.json")
body, _ := ioutil.ReadAll(file)
var activity models.Activity
json.Unmarshal(body, &activity)
return activity
case "Undo":
file, _ := os.Open("../misc/undo.json")
file, _ := os.Open("../misc/test/undo.json")
body, _ := ioutil.ReadAll(file)
var activity models.Activity
json.Unmarshal(body, &activity)
@ -312,19 +312,19 @@ func mockActivity(req string) models.Activity {
func mockActor(req string) models.Actor {
switch req {
case "Person":
file, _ := os.Open("../misc/person.json")
file, _ := os.Open("../misc/test/person.json")
body, _ := ioutil.ReadAll(file)
var actor models.Actor
json.Unmarshal(body, &actor)
return actor
case "Service":
file, _ := os.Open("../misc/service.json")
file, _ := os.Open("../misc/test/service.json")
body, _ := ioutil.ReadAll(file)
var actor models.Actor
json.Unmarshal(body, &actor)
return actor
case "Application":
file, _ := os.Open("../misc/application.json")
file, _ := os.Open("../misc/test/application.json")
body, _ := ioutil.ReadAll(file)
var actor models.Actor
json.Unmarshal(body, &actor)