justin/discord-auto-upload
1
0
Fork 0
Code Issues 15 Pull Requests 1 Actions Packages Projects Releases 20 Wiki Activity

Start to rework tests

Browse Source
This commit is contained in:
Justin Hawkins
2022-12-05 22:04:40 +10:30
parent 2bd62a95a4
commit 73c74cd37e
4 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
upload/upload.go
View File

@@ -123,7 +123,7 @@ func (u *Uploader) UploadById(id int32) *Upload {
} }
func (u *Upload) processUpload() error { func (u *Upload) processUpload() error {
daulog.Infof("Uploading: %s", u.Image) daulog.Infof("Uploading: %s", u.Image.OriginalFilename)
if u.webhookURL == "" { if u.webhookURL == "" {
daulog.Error("WebHookURL is not configured - cannot upload!") daulog.Error("WebHookURL is not configured - cannot upload!")

78
upload/upload_test.go
View File

@@ -2,15 +2,13 @@ package upload
import ( import (
"bytes" "bytes"
"image" i "image"
"image/color" "image/color"
"image/png" "image/png"
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"net/http" "net/http"
"os" "os"
"testing"
// "github.com/tardisx/discord-auto-upload/config"
) )
// https://www.thegreatcodeadventure.com/mocking-http-requests-in-golang/ // https://www.thegreatcodeadventure.com/mocking-http-requests-in-golang/
@@ -38,52 +36,50 @@ func DoTooBigUpload(req *http.Request) (*http.Response, error) {
}, nil }, nil
} }
func TestSuccessfulUpload(t *testing.T) { // func TestSuccessfulUpload(t *testing.T) {
// create temporary file, processUpload requires that it exists, even though // // create temporary file, processUpload requires that it exists, even though
// we will not really be uploading it here // // we will not really be uploading it here
f, _ := os.CreateTemp("", "dautest-upload-*") // f, _ := os.CreateTemp("", "dautest-upload-*")
defer os.Remove(f.Name()) // defer os.Remove(f.Name())
u := Upload{webhookURL: "https://127.0.0.1/", OriginalFilename: f.Name()} // u := Upload{webhookURL: "https://127.0.0.1/", Image: &image.Store{OriginalFilename: f.Name()}}
u.Client = &MockClient{DoFunc: DoGoodUpload} // u.Client = &MockClient{DoFunc: DoGoodUpload}
err := u.processUpload() // err := u.processUpload()
if err != nil { // if err != nil {
t.Errorf("error occured: %s", err) // t.Errorf("error occured: %s", err)
} // }
if u.Width != 640 || u.Height != 640 {
t.Error("dimensions wrong")
}
if u.Url != "https://cdn.discordapp.com/attachments/849615269706203171/851092588332449812/dau480457962.png" {
t.Error("URL wrong")
}
}
func TestTooBigUpload(t *testing.T) { // if u.Url != "https://cdn.discordapp.com/attachments/849615269706203171/851092588332449812/dau480457962.png" {
// create temporary file, processUpload requires that it exists, even though // t.Error("URL wrong")
// we will not really be uploading it here // }
f, _ := os.CreateTemp("", "dautest-upload-*") // }
defer os.Remove(f.Name())
u := Upload{webhookURL: "https://127.0.0.1/", OriginalFilename: f.Name()} // func TestTooBigUpload(t *testing.T) {
u.Client = &MockClient{DoFunc: DoTooBigUpload} // // create temporary file, processUpload requires that it exists, even though
err := u.processUpload() // // we will not really be uploading it here
if err == nil { // f, _ := os.CreateTemp("", "dautest-upload-*")
t.Error("error did not occur?") // defer os.Remove(f.Name())
} else if err.Error() != "received 413 - file too large" { // u := Upload{webhookURL: "https://127.0.0.1/", Image: &image.Store{OriginalFilename: f.Name()}}
t.Errorf("wrong error occurred: %s", err.Error()) // u.Client = &MockClient{DoFunc: DoTooBigUpload}
} // err := u.processUpload()
if u.State != StateFailed { // if err == nil {
t.Error("upload should have been marked failed") // t.Error("error did not occur?")
} // } else if err.Error() != "received 413 - file too large" {
} // t.Errorf("wrong error occurred: %s", err.Error())
// }
// if u.State != StateFailed {
// t.Error("upload should have been marked failed")
// }
// }
func tempImageGt8Mb() { func tempImageGt8Mb() {
// about 12Mb // about 12Mb
width := 2000 width := 2000
height := 2000 height := 2000
upLeft := image.Point{0, 0} upLeft := i.Point{0, 0}
lowRight := image.Point{width, height} lowRight := i.Point{width, height}
img := image.NewRGBA(image.Rectangle{upLeft, lowRight}) img := i.NewRGBA(i.Rectangle{upLeft, lowRight})
// Colors are defined by Red, Green, Blue, Alpha uint8 values. // Colors are defined by Red, Green, Blue, Alpha uint8 values.

2
version/version_test.go
View File

@@ -6,7 +6,7 @@ import (
func TestVersioningUpdate(t *testing.T) { func TestVersioningUpdate(t *testing.T) {
// pretend there is a new version // pretend there is a new version
LatestVersion = "v0.13.0" LatestVersion = "v0.13.9"
if !UpdateAvailable() { if !UpdateAvailable() {
t.Error("should be a version newer than " + CurrentVersion) t.Error("should be a version newer than " + CurrentVersion)
} }

2
web/server.go
View File

@@ -296,7 +296,7 @@ func (ws *WebService) modifyUpload(w http.ResponseWriter, r *http.Request) {
} }
// write to a temporary file // write to a temporary file
tempfile, err := ioutil.TempFile("", "dau_markup") tempfile, err := ioutil.TempFile("", "dau_markup-*")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }