From e75b35f92148758a849f012c7d443048c73450f2 Mon Sep 17 00:00:00 2001 From: Marc Ole Bulling Date: Fri, 30 Apr 2021 12:53:31 +0200 Subject: [PATCH] Undo incorrect refactoring --- internal/configuration/Configuration_test.go | 172 +++++++++---------- internal/helper/OS_test.go | 28 +-- internal/storage/FileServing_test.go | 152 ++++++++-------- 3 files changed, 176 insertions(+), 176 deletions(-) diff --git a/internal/configuration/Configuration_test.go b/internal/configuration/Configuration_test.go index 2a47064..1056781 100644 --- a/internal/configuration/Configuration_test.go +++ b/internal/configuration/Configuration_test.go @@ -2,29 +2,29 @@ package configuration import ( "Gokapi/internal/environment" - testconfiguration "Gokapi/internal/test" - testconfiguration2 "Gokapi/internal/test/testconfiguration" + "Gokapi/internal/test" + "Gokapi/internal/test/testconfiguration" "os" "testing" "time" ) func TestMain(m *testing.M) { - testconfiguration2.Create(false) + testconfiguration.Create(false) exitVal := m.Run() - testconfiguration2.Delete() + testconfiguration.Delete() os.Exit(exitVal) } func TestLoad(t *testing.T) { Load() - testconfiguration.IsEqualString(t, Environment.ConfigDir, "test") - testconfiguration.IsEqualString(t, ServerSettings.Port, "127.0.0.1:53843") - testconfiguration.IsEqualString(t, ServerSettings.AdminName, "test") - testconfiguration.IsEqualString(t, ServerSettings.ServerUrl, "http://127.0.0.1:53843/") - testconfiguration.IsEqualString(t, ServerSettings.AdminPassword, "10340aece68aa4fb14507ae45b05506026f276cf") - testconfiguration.IsEqualString(t, HashPassword("testtest", false), "10340aece68aa4fb14507ae45b05506026f276cf") - testconfiguration.IsEqualInt(t, ServerSettings.LengthId, 20) + test.IsEqualString(t, Environment.ConfigDir, "test") + test.IsEqualString(t, ServerSettings.Port, "127.0.0.1:53843") + test.IsEqualString(t, ServerSettings.AdminName, "test") + test.IsEqualString(t, ServerSettings.ServerUrl, "http://127.0.0.1:53843/") + test.IsEqualString(t, ServerSettings.AdminPassword, "10340aece68aa4fb14507ae45b05506026f276cf") + test.IsEqualString(t, HashPassword("testtest", false), "10340aece68aa4fb14507ae45b05506026f276cf") + test.IsEqualInt(t, ServerSettings.LengthId, 20) } func TestMutex(t *testing.T) { @@ -33,16 +33,16 @@ func TestMutex(t *testing.T) { go func() { time.Sleep(100 * time.Millisecond) LockSessions() - testconfiguration.IsEqualInt(t, ServerSettings.ConfigVersion, -9) + test.IsEqualInt(t, ServerSettings.ConfigVersion, -9) ServerSettings.ConfigVersion = oldValue UnlockSessionsAndSave() - testconfiguration.IsEqualInt(t, ServerSettings.ConfigVersion, oldValue) + test.IsEqualInt(t, ServerSettings.ConfigVersion, oldValue) finished <- true }() LockSessions() ServerSettings.ConfigVersion = -9 time.Sleep(150 * time.Millisecond) - testconfiguration.IsEqualInt(t, ServerSettings.ConfigVersion, -9) + test.IsEqualInt(t, ServerSettings.ConfigVersion, -9) UnlockSessionsAndSave() <-finished } @@ -57,19 +57,19 @@ func TestCreateNewConfig(t *testing.T) { os.Setenv("GOKAPI_SALT_ADMIN", "salt123") os.Setenv("GOKAPI_LOCALHOST", "false") Load() - testconfiguration.IsEqualString(t, Environment.ConfigDir, "test") - testconfiguration.IsEqualString(t, ServerSettings.Port, ":1234") - testconfiguration.IsEqualString(t, ServerSettings.AdminName, "test2") - testconfiguration.IsEqualString(t, ServerSettings.ServerUrl, "http://test.com/") - testconfiguration.IsEqualString(t, ServerSettings.RedirectUrl, "http://test2.com") - testconfiguration.IsEqualString(t, ServerSettings.AdminPassword, "5bbf5684437a4c658d2e0890d784694afb63f715") - testconfiguration.IsEqualString(t, HashPassword("testtest2", false), "5bbf5684437a4c658d2e0890d784694afb63f715") - testconfiguration.IsEqualInt(t, ServerSettings.LengthId, 15) + test.IsEqualString(t, Environment.ConfigDir, "test") + test.IsEqualString(t, ServerSettings.Port, ":1234") + test.IsEqualString(t, ServerSettings.AdminName, "test2") + test.IsEqualString(t, ServerSettings.ServerUrl, "http://test.com/") + test.IsEqualString(t, ServerSettings.RedirectUrl, "http://test2.com") + test.IsEqualString(t, ServerSettings.AdminPassword, "5bbf5684437a4c658d2e0890d784694afb63f715") + test.IsEqualString(t, HashPassword("testtest2", false), "5bbf5684437a4c658d2e0890d784694afb63f715") + test.IsEqualInt(t, ServerSettings.LengthId, 15) os.Remove("test/config.json") os.Unsetenv("GOKAPI_SALT_ADMIN") Load() - testconfiguration.IsEqualInt(t, len(ServerSettings.SaltAdmin), 30) - testconfiguration.IsNotEqualString(t, ServerSettings.SaltAdmin, "eefwkjqweduiotbrkl##$2342brerlk2321") + test.IsEqualInt(t, len(ServerSettings.SaltAdmin), 30) + test.IsNotEqualString(t, ServerSettings.SaltAdmin, "eefwkjqweduiotbrkl##$2342brerlk2321") os.Unsetenv("GOKAPI_USERNAME") os.Unsetenv("GOKAPI_PASSWORD") os.Unsetenv("GOKAPI_PORT") @@ -79,99 +79,99 @@ func TestCreateNewConfig(t *testing.T) { } func TestUpgradeDb(t *testing.T) { - testconfiguration2.WriteUpgradeConfigFile() + testconfiguration.WriteUpgradeConfigFile() Load() - testconfiguration.IsEqualString(t, ServerSettings.SaltAdmin, "eefwkjqweduiotbrkl##$2342brerlk2321") - testconfiguration.IsEqualString(t, ServerSettings.SaltFiles, "P1UI5sRNDwuBgOvOYhNsmucZ2pqo4KEvOoqqbpdu") - testconfiguration.IsEqualString(t, ServerSettings.DataDir, Environment.DataDir) - testconfiguration.IsEqualInt(t, ServerSettings.LengthId, 15) - testconfiguration.IsEqualBool(t, ServerSettings.Hotlinks == nil, false) - testconfiguration.IsEqualBool(t, ServerSettings.DownloadStatus == nil, false) - testconfiguration.IsEqualString(t, ServerSettings.Files["MgXJLe4XLfpXcL12ec4i"].ContentType, "application/octet-stream") - testconfiguration.IsEqualInt(t, ServerSettings.ConfigVersion, currentConfigVersion) - testconfiguration2.Create(false) + test.IsEqualString(t, ServerSettings.SaltAdmin, "eefwkjqweduiotbrkl##$2342brerlk2321") + test.IsEqualString(t, ServerSettings.SaltFiles, "P1UI5sRNDwuBgOvOYhNsmucZ2pqo4KEvOoqqbpdu") + test.IsEqualString(t, ServerSettings.DataDir, Environment.DataDir) + test.IsEqualInt(t, ServerSettings.LengthId, 15) + test.IsEqualBool(t, ServerSettings.Hotlinks == nil, false) + test.IsEqualBool(t, ServerSettings.DownloadStatus == nil, false) + test.IsEqualString(t, ServerSettings.Files["MgXJLe4XLfpXcL12ec4i"].ContentType, "application/octet-stream") + test.IsEqualInt(t, ServerSettings.ConfigVersion, currentConfigVersion) + testconfiguration.Create(false) Load() } func TestAskForUsername(t *testing.T) { - original := testconfiguration2.StartMockInputStdin("admin") + original := testconfiguration.StartMockInputStdin("admin") output := askForUsername() - testconfiguration2.StopMockInputStdin(original) - testconfiguration.IsEqualString(t, output, "admin") + testconfiguration.StopMockInputStdin(original) + test.IsEqualString(t, output, "admin") } func TestIsValidPortNumber(t *testing.T) { - testconfiguration.IsEqualBool(t, isValidPortNumber("invalid"), false) - testconfiguration.IsEqualBool(t, isValidPortNumber("-1"), false) - testconfiguration.IsEqualBool(t, isValidPortNumber("0"), true) - testconfiguration.IsEqualBool(t, isValidPortNumber("100"), true) - testconfiguration.IsEqualBool(t, isValidPortNumber("65353"), true) - testconfiguration.IsEqualBool(t, isValidPortNumber("65354"), false) + test.IsEqualBool(t, isValidPortNumber("invalid"), false) + test.IsEqualBool(t, isValidPortNumber("-1"), false) + test.IsEqualBool(t, isValidPortNumber("0"), true) + test.IsEqualBool(t, isValidPortNumber("100"), true) + test.IsEqualBool(t, isValidPortNumber("65353"), true) + test.IsEqualBool(t, isValidPortNumber("65354"), false) } func TestHashPassword(t *testing.T) { - testconfiguration.IsEqualString(t, HashPassword("123", false), "423b63a68c68bd7e07b14590927c1e9a473fe035") - testconfiguration.IsEqualString(t, HashPassword("", false), "") - testconfiguration.IsEqualString(t, HashPassword("123", true), "7b30508aa9b233ab4b8a11b2af5816bdb58ca3e7") + test.IsEqualString(t, HashPassword("123", false), "423b63a68c68bd7e07b14590927c1e9a473fe035") + test.IsEqualString(t, HashPassword("", false), "") + test.IsEqualString(t, HashPassword("123", true), "7b30508aa9b233ab4b8a11b2af5816bdb58ca3e7") } func TestIsValidUrl(t *testing.T) { - testconfiguration.IsEqualBool(t, isValidUrl("http://"), false) - testconfiguration.IsEqualBool(t, isValidUrl("https://"), false) - testconfiguration.IsEqualBool(t, isValidUrl("invalid"), false) - testconfiguration.IsEqualBool(t, isValidUrl("http://abc"), true) - testconfiguration.IsEqualBool(t, isValidUrl("https://abc"), true) + test.IsEqualBool(t, isValidUrl("http://"), false) + test.IsEqualBool(t, isValidUrl("https://"), false) + test.IsEqualBool(t, isValidUrl("invalid"), false) + test.IsEqualBool(t, isValidUrl("http://abc"), true) + test.IsEqualBool(t, isValidUrl("https://abc"), true) } func TestAddTrailingSlash(t *testing.T) { - testconfiguration.IsEqualString(t, addTrailingSlash("abc"), "abc/") - testconfiguration.IsEqualString(t, addTrailingSlash("abc/"), "abc/") - testconfiguration.IsEqualString(t, addTrailingSlash("/"), "/") - testconfiguration.IsEqualString(t, addTrailingSlash(""), "/") + test.IsEqualString(t, addTrailingSlash("abc"), "abc/") + test.IsEqualString(t, addTrailingSlash("abc/"), "abc/") + test.IsEqualString(t, addTrailingSlash("/"), "/") + test.IsEqualString(t, addTrailingSlash(""), "/") } func TestAskForRedirect(t *testing.T) { - original := testconfiguration2.StartMockInputStdin("") + original := testconfiguration.StartMockInputStdin("") url := askForRedirect() - testconfiguration2.StopMockInputStdin(original) - testconfiguration.IsEqualString(t, url, "https://github.com/Forceu/Gokapi/") - original = testconfiguration2.StartMockInputStdin("https://test.com") + testconfiguration.StopMockInputStdin(original) + test.IsEqualString(t, url, "https://github.com/Forceu/Gokapi/") + original = testconfiguration.StartMockInputStdin("https://test.com") url = askForRedirect() - testconfiguration2.StopMockInputStdin(original) - testconfiguration.IsEqualString(t, url, "https://test.com") + testconfiguration.StopMockInputStdin(original) + test.IsEqualString(t, url, "https://test.com") } func TestAskForLocalOnly(t *testing.T) { environment.IsDocker = "true" - testconfiguration.IsEqualString(t, askForLocalOnly(), environment.IsTrue) + test.IsEqualString(t, askForLocalOnly(), environment.IsTrue) environment.IsDocker = "false" - original := testconfiguration2.StartMockInputStdin("") - testconfiguration.IsEqualString(t, askForLocalOnly(), environment.IsTrue) - testconfiguration2.StopMockInputStdin(original) - original = testconfiguration2.StartMockInputStdin("no") - testconfiguration.IsEqualString(t, askForLocalOnly(), environment.IsFalse) - testconfiguration2.StopMockInputStdin(original) - original = testconfiguration2.StartMockInputStdin("yes") - testconfiguration.IsEqualString(t, askForLocalOnly(), environment.IsTrue) - testconfiguration2.StopMockInputStdin(original) - original = testconfiguration2.StartMockInputStdin("n") - testconfiguration.IsEqualString(t, askForLocalOnly(), environment.IsFalse) - testconfiguration2.StopMockInputStdin(original) + original := testconfiguration.StartMockInputStdin("") + test.IsEqualString(t, askForLocalOnly(), environment.IsTrue) + testconfiguration.StopMockInputStdin(original) + original = testconfiguration.StartMockInputStdin("no") + test.IsEqualString(t, askForLocalOnly(), environment.IsFalse) + testconfiguration.StopMockInputStdin(original) + original = testconfiguration.StartMockInputStdin("yes") + test.IsEqualString(t, askForLocalOnly(), environment.IsTrue) + testconfiguration.StopMockInputStdin(original) + original = testconfiguration.StartMockInputStdin("n") + test.IsEqualString(t, askForLocalOnly(), environment.IsFalse) + testconfiguration.StopMockInputStdin(original) } func TestAskForPort(t *testing.T) { - original := testconfiguration2.StartMockInputStdin("8000") - testconfiguration.IsEqualString(t, askForPort(), "8000") - testconfiguration2.StopMockInputStdin(original) - original = testconfiguration2.StartMockInputStdin("") - testconfiguration.IsEqualString(t, askForPort(), defaultPort) - testconfiguration2.StopMockInputStdin(original) + original := testconfiguration.StartMockInputStdin("8000") + test.IsEqualString(t, askForPort(), "8000") + testconfiguration.StopMockInputStdin(original) + original = testconfiguration.StartMockInputStdin("") + test.IsEqualString(t, askForPort(), defaultPort) + testconfiguration.StopMockInputStdin(original) } func TestAskForUrl(t *testing.T) { - original := testconfiguration2.StartMockInputStdin("https://test.com") - testconfiguration.IsEqualString(t, askForUrl("1234"), "https://test.com/") - testconfiguration2.StopMockInputStdin(original) - original = testconfiguration2.StartMockInputStdin("") - testconfiguration.IsEqualString(t, askForUrl("1234"), "http://127.0.0.1:1234/") - testconfiguration2.StopMockInputStdin(original) + original := testconfiguration.StartMockInputStdin("https://test.com") + test.IsEqualString(t, askForUrl("1234"), "https://test.com/") + testconfiguration.StopMockInputStdin(original) + original = testconfiguration.StartMockInputStdin("") + test.IsEqualString(t, askForUrl("1234"), "http://127.0.0.1:1234/") + testconfiguration.StopMockInputStdin(original) } diff --git a/internal/helper/OS_test.go b/internal/helper/OS_test.go index eeba4e8..ed298d5 100644 --- a/internal/helper/OS_test.go +++ b/internal/helper/OS_test.go @@ -1,36 +1,36 @@ package helper import ( - testconfiguration "Gokapi/internal/test" - testconfiguration2 "Gokapi/internal/test/testconfiguration" + "Gokapi/internal/test" + "Gokapi/internal/test/testconfiguration" "io/ioutil" "os" "testing" ) func TestIsInArray(t *testing.T) { - testconfiguration.IsEqualBool(t, IsInArray([]string{"test", "test2", "test3"}, "test2"), true) - testconfiguration.IsEqualBool(t, IsInArray([]string{"test", "test2", "test3"}, "invalid"), false) + test.IsEqualBool(t, IsInArray([]string{"test", "test2", "test3"}, "test2"), true) + test.IsEqualBool(t, IsInArray([]string{"test", "test2", "test3"}, "invalid"), false) } func TestFolderCreation(t *testing.T) { - testconfiguration.IsEqualBool(t, FolderExists("invalid"), false) - testconfiguration.IsEqualBool(t, FileExists("invalid/file"), false) + test.IsEqualBool(t, FolderExists("invalid"), false) + test.IsEqualBool(t, FileExists("invalid/file"), false) CreateDir("invalid") - testconfiguration.IsEqualBool(t, FolderExists("invalid"), true) + test.IsEqualBool(t, FolderExists("invalid"), true) err := ioutil.WriteFile("invalid/file", []byte("test"), 0644) if err != nil { t.Error(err) } - testconfiguration.IsEqualBool(t, FileExists("invalid/file"), true) + test.IsEqualBool(t, FileExists("invalid/file"), true) os.RemoveAll("invalid") } func TestReadLine(t *testing.T) { - original := testconfiguration2.StartMockInputStdin("test") + original := testconfiguration.StartMockInputStdin("test") output := ReadLine() - testconfiguration2.StopMockInputStdin(original) - testconfiguration.IsEqualString(t, output, "test") + testconfiguration.StopMockInputStdin(original) + test.IsEqualString(t, output, "test") } func TestGetFileSize(t *testing.T) { @@ -40,12 +40,12 @@ func TestGetFileSize(t *testing.T) { t.Fatal(err) } size, _ := GetFileSize(file) - testconfiguration.IsEqualInt(t, int(size), 0) + test.IsEqualInt(t, int(size), 0) os.WriteFile("testfile", []byte("123"), 0777) size, _ = GetFileSize(file) - testconfiguration.IsEqualInt(t, int(size), 3) + test.IsEqualInt(t, int(size), 3) file, _ = os.OpenFile("invalid", os.O_RDONLY, 0644) size, _ = GetFileSize(file) - testconfiguration.IsEqualInt(t, int(size), 0) + test.IsEqualInt(t, int(size), 0) os.Remove("testfile") } diff --git a/internal/storage/FileServing_test.go b/internal/storage/FileServing_test.go index 1582d23..73b40d3 100644 --- a/internal/storage/FileServing_test.go +++ b/internal/storage/FileServing_test.go @@ -4,8 +4,8 @@ import ( "Gokapi/internal/configuration" "Gokapi/internal/helper" "Gokapi/internal/models" - testconfiguration "Gokapi/internal/test" - testconfiguration2 "Gokapi/internal/test/testconfiguration" + "Gokapi/internal/test" + "Gokapi/internal/test/testconfiguration" "bytes" "io/ioutil" "mime/multipart" @@ -16,10 +16,10 @@ import ( ) func TestMain(m *testing.M) { - testconfiguration2.Create(true) + testconfiguration.Create(true) configuration.Load() exitVal := m.Run() - testconfiguration2.Delete() + testconfiguration.Delete() os.Exit(exitVal) } @@ -27,42 +27,42 @@ var idNewFile string func TestGetFile(t *testing.T) { _, result := GetFile("invalid") - testconfiguration.IsEqualBool(t, result, false) + test.IsEqualBool(t, result, false) file, result := GetFile("Wzol7LyY2QVczXynJtVo") - testconfiguration.IsEqualBool(t, result, true) - testconfiguration.IsEqualString(t, file.Id, "Wzol7LyY2QVczXynJtVo") - testconfiguration.IsEqualString(t, file.Name, "smallfile2") - testconfiguration.IsEqualString(t, file.Size, "8 B") - testconfiguration.IsEqualInt(t, file.DownloadsRemaining, 1) + test.IsEqualBool(t, result, true) + test.IsEqualString(t, file.Id, "Wzol7LyY2QVczXynJtVo") + test.IsEqualString(t, file.Name, "smallfile2") + test.IsEqualString(t, file.Size, "8 B") + test.IsEqualInt(t, file.DownloadsRemaining, 1) _, result = GetFile("deletedfile1234") - testconfiguration.IsEqualBool(t, result, false) + test.IsEqualBool(t, result, false) } func TestGetFileByHotlink(t *testing.T) { _, result := GetFileByHotlink("invalid") - testconfiguration.IsEqualBool(t, result, false) + test.IsEqualBool(t, result, false) _, result = GetFileByHotlink("") - testconfiguration.IsEqualBool(t, result, false) + test.IsEqualBool(t, result, false) file, result := GetFileByHotlink("PhSs6mFtf8O5YGlLMfNw9rYXx9XRNkzCnJZpQBi7inunv3Z4A.jpg") - testconfiguration.IsEqualBool(t, result, true) - testconfiguration.IsEqualString(t, file.Id, "n1tSTAGj8zan9KaT4u6p") - testconfiguration.IsEqualString(t, file.Name, "picture.jpg") - testconfiguration.IsEqualString(t, file.Size, "4 B") - testconfiguration.IsEqualInt(t, file.DownloadsRemaining, 1) + test.IsEqualBool(t, result, true) + test.IsEqualString(t, file.Id, "n1tSTAGj8zan9KaT4u6p") + test.IsEqualString(t, file.Name, "picture.jpg") + test.IsEqualString(t, file.Size, "4 B") + test.IsEqualInt(t, file.DownloadsRemaining, 1) } func TestAddHotlink(t *testing.T) { file := models.File{Name: "test.dat", Id: "testIdE"} addHotlink(&file) - testconfiguration.IsEqualString(t, file.HotlinkId, "") + test.IsEqualString(t, file.HotlinkId, "") file = models.File{Name: "test.jpg", Id: "testId"} addHotlink(&file) - testconfiguration.IsEqualInt(t, len(file.HotlinkId), 44) + test.IsEqualInt(t, len(file.HotlinkId), 44) lastCharacters := file.HotlinkId[len(file.HotlinkId)-4:] - testconfiguration.IsEqualBool(t, lastCharacters == ".jpg", true) - testconfiguration.IsEqualString(t, configuration.ServerSettings.Hotlinks[file.HotlinkId].FileId, "testId") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Hotlinks[file.HotlinkId].Id, file.HotlinkId) + test.IsEqualBool(t, lastCharacters == ".jpg", true) + test.IsEqualString(t, configuration.ServerSettings.Hotlinks[file.HotlinkId].FileId, "testId") + test.IsEqualString(t, configuration.ServerSettings.Hotlinks[file.HotlinkId].Id, file.HotlinkId) } func TestNewFile(t *testing.T) { @@ -77,77 +77,77 @@ func TestNewFile(t *testing.T) { Size: int64(len(content)), } file, err := NewFile(bytes.NewReader(content), &header, 2147483600, 1, "") - testconfiguration.IsNil(t, err) - testconfiguration.IsEqualString(t, file.Name, "test.dat") - testconfiguration.IsEqualString(t, file.SHA256, "f1474c19eff0fc8998fa6e1b1f7bf31793b103a6") - testconfiguration.IsEqualString(t, file.HotlinkId, "") - testconfiguration.IsEqualString(t, file.PasswordHash, "") - testconfiguration.IsEqualString(t, file.Size, "35 B") - testconfiguration.IsEqualString(t, file.ExpireAtString, "2038-01-19 03:13") - testconfiguration.IsEqualInt(t, file.DownloadsRemaining, 1) - testconfiguration.IsEqualInt(t, len(file.Id), 20) - testconfiguration.IsEqualInt(t, int(file.ExpireAt), 2147483600) + test.IsNil(t, err) + test.IsEqualString(t, file.Name, "test.dat") + test.IsEqualString(t, file.SHA256, "f1474c19eff0fc8998fa6e1b1f7bf31793b103a6") + test.IsEqualString(t, file.HotlinkId, "") + test.IsEqualString(t, file.PasswordHash, "") + test.IsEqualString(t, file.Size, "35 B") + test.IsEqualString(t, file.ExpireAtString, "2038-01-19 03:13") + test.IsEqualInt(t, file.DownloadsRemaining, 1) + test.IsEqualInt(t, len(file.Id), 20) + test.IsEqualInt(t, int(file.ExpireAt), 2147483600) idNewFile = file.Id } func TestServeFile(t *testing.T) { file, result := GetFile(idNewFile) - testconfiguration.IsEqualBool(t, result, true) + test.IsEqualBool(t, result, true) r := httptest.NewRequest("GET", "/upload", nil) w := httptest.NewRecorder() ServeFile(file, w, r, true) _, result = GetFile(idNewFile) - testconfiguration.IsEqualBool(t, result, false) + test.IsEqualBool(t, result, false) - testconfiguration.IsEqualString(t, w.Result().Header.Get("Content-Disposition"), "attachment; filename=\"test.dat\"") - testconfiguration.IsEqualString(t, w.Result().Header.Get("Content-Length"), "35") - testconfiguration.IsEqualString(t, w.Result().Header.Get("Content-Type"), "text") + test.IsEqualString(t, w.Result().Header.Get("Content-Disposition"), "attachment; filename=\"test.dat\"") + test.IsEqualString(t, w.Result().Header.Get("Content-Length"), "35") + test.IsEqualString(t, w.Result().Header.Get("Content-Type"), "text") content, err := ioutil.ReadAll(w.Result().Body) - testconfiguration.IsNil(t, err) - testconfiguration.IsEqualString(t, string(content), "This is a file for testing purposes") + test.IsNil(t, err) + test.IsEqualString(t, string(content), "This is a file for testing purposes") } func TestCleanUp(t *testing.T) { - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["cleanuptest123456789"].Name, "cleanup") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "DeletedFile") - testconfiguration.IsEqualBool(t, helper.FileExists("test/data/2341354656543213246465465465432456898794"), true) + test.IsEqualString(t, configuration.ServerSettings.Files["cleanuptest123456789"].Name, "cleanup") + test.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") + test.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") + test.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") + test.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") + test.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "DeletedFile") + test.IsEqualBool(t, helper.FileExists("test/data/2341354656543213246465465465432456898794"), true) CleanUp(false) - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["cleanuptest123456789"].Name, "cleanup") - testconfiguration.IsEqualBool(t, helper.FileExists("test/data/2341354656543213246465465465432456898794"), true) - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") + test.IsEqualString(t, configuration.ServerSettings.Files["cleanuptest123456789"].Name, "cleanup") + test.IsEqualBool(t, helper.FileExists("test/data/2341354656543213246465465465432456898794"), true) + test.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") + test.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") + test.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") + test.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") file, _ := GetFile("n1tSTAGj8zan9KaT4u6p") file.DownloadsRemaining = 0 configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"] = file CleanUp(false) - testconfiguration.IsEqualBool(t, helper.FileExists("test/data/a8fdc205a9f19cc1c7507a60c4f01b13d11d7fd0"), false) - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") + test.IsEqualBool(t, helper.FileExists("test/data/a8fdc205a9f19cc1c7507a60c4f01b13d11d7fd0"), false) + test.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") + test.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") + test.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") file, _ = GetFile("Wzol7LyY2QVczXynJtVo") file.DownloadsRemaining = 0 configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"] = file CleanUp(false) - testconfiguration.IsEqualBool(t, helper.FileExists("test/data/e017693e4a04a59d0b0f400fe98177fe7ee13cf7"), true) - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") + test.IsEqualBool(t, helper.FileExists("test/data/e017693e4a04a59d0b0f400fe98177fe7ee13cf7"), true) + test.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") + test.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") file, _ = GetFile("e4TjE7CokWK0giiLNxDL") file.DownloadsRemaining = 0 @@ -157,17 +157,17 @@ func TestCleanUp(t *testing.T) { configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"] = file CleanUp(false) - testconfiguration.IsEqualBool(t, helper.FileExists("test/data/e017693e4a04a59d0b0f400fe98177fe7ee13cf7"), false) - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "") + test.IsEqualBool(t, helper.FileExists("test/data/e017693e4a04a59d0b0f400fe98177fe7ee13cf7"), false) + test.IsEqualString(t, configuration.ServerSettings.Files["Wzol7LyY2QVczXynJtVo"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["deletedfile123456789"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["e4TjE7CokWK0giiLNxDL"].Name, "") + test.IsEqualString(t, configuration.ServerSettings.Files["wefffewhtrhhtrhtrhtr"].Name, "") - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["cleanuptest123456789"].Name, "cleanup") - testconfiguration.IsEqualBool(t, helper.FileExists("test/data/2341354656543213246465465465432456898794"), true) + test.IsEqualString(t, configuration.ServerSettings.Files["cleanuptest123456789"].Name, "cleanup") + test.IsEqualBool(t, helper.FileExists("test/data/2341354656543213246465465465432456898794"), true) configuration.ServerSettings.DownloadStatus = make(map[string]models.DownloadStatus) CleanUp(false) - testconfiguration.IsEqualString(t, configuration.ServerSettings.Files["cleanuptest123456789"].Name, "") - testconfiguration.IsEqualBool(t, helper.FileExists("test/data/2341354656543213246465465465432456898794"), false) + test.IsEqualString(t, configuration.ServerSettings.Files["cleanuptest123456789"].Name, "") + test.IsEqualBool(t, helper.FileExists("test/data/2341354656543213246465465465432456898794"), false) }