From 5841367e64d52b74daa958a3372b3cb0483496c9 Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Sun, 29 Mar 2020 22:02:29 -0600 Subject: [PATCH] Add Test file and fix broken test --- Wabbajack.BuildServer.Test/ABuildServerSystemTest.cs | 2 +- Wabbajack.BuildServer.Test/UploadedFilesTest.cs | 2 +- Wabbajack.BuildServer.Test/Wabbajack.BuildServer.Test.csproj | 2 +- Wabbajack.BuildServer.Test/sql/uploaded_files_ingest.json | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 Wabbajack.BuildServer.Test/sql/uploaded_files_ingest.json diff --git a/Wabbajack.BuildServer.Test/ABuildServerSystemTest.cs b/Wabbajack.BuildServer.Test/ABuildServerSystemTest.cs index b343dc60..782f3629 100644 --- a/Wabbajack.BuildServer.Test/ABuildServerSystemTest.cs +++ b/Wabbajack.BuildServer.Test/ABuildServerSystemTest.cs @@ -29,7 +29,7 @@ namespace Wabbajack.BuildServer.Test { $"WabbajackSettings:DownloadDir={"tmp".RelativeTo(AbsolutePath.EntryPoint)}", $"WabbajackSettings:ArchiveDir={"archives".RelativeTo(AbsolutePath.EntryPoint)}", - $"WabbajackSettings:TempDir={ServerTempFolder}", + $"WabbajackSettings:TempFolder={ServerTempFolder}", $"WabbajackSettings:SQLConnection={PublicConnStr}", }, true); _host = builder.Build(); diff --git a/Wabbajack.BuildServer.Test/UploadedFilesTest.cs b/Wabbajack.BuildServer.Test/UploadedFilesTest.cs index 624372f1..0382cf39 100644 --- a/Wabbajack.BuildServer.Test/UploadedFilesTest.cs +++ b/Wabbajack.BuildServer.Test/UploadedFilesTest.cs @@ -25,7 +25,7 @@ namespace Wabbajack.BuildServer.Test Utils.Log("Loaded: " + result); - Assert.Equal("251", result); + Assert.Equal("4", result); } } } diff --git a/Wabbajack.BuildServer.Test/Wabbajack.BuildServer.Test.csproj b/Wabbajack.BuildServer.Test/Wabbajack.BuildServer.Test.csproj index d9ce3da6..e8550032 100644 --- a/Wabbajack.BuildServer.Test/Wabbajack.BuildServer.Test.csproj +++ b/Wabbajack.BuildServer.Test/Wabbajack.BuildServer.Test.csproj @@ -25,7 +25,7 @@ - PreserveNewest + Always diff --git a/Wabbajack.BuildServer.Test/sql/uploaded_files_ingest.json b/Wabbajack.BuildServer.Test/sql/uploaded_files_ingest.json new file mode 100644 index 00000000..a07813cd --- /dev/null +++ b/Wabbajack.BuildServer.Test/sql/uploaded_files_ingest.json @@ -0,0 +1,4 @@ +{"_id":"90db7c47-a8ae-4a62-9c2e-b7d357a16665","Name":"file1.zip","Size":{"$numberInt":"56946233"},"Hash":"8t3PgB/J/Ps=","Uploader":"total","UploadDate":{"$date":{"$numberLong":"1579472623183"}}} +{"_id":"63f8f868-0f4d-4997-922b-ee952984973a","Name":"file2.zip","Size":{"$numberInt":"558782831"},"Hash":"XYl4fIcAUWo=","Uploader":"total","UploadDate":{"$date":{"$numberLong":"1579650208226"}},"CDNName":"wabbajackpush"} +{"_id":"1f18f301-67eb-46c9-928a-088f6666bf61","Name":"file2.zip","Size":{"$numberInt":"397558132"},"Hash":"uhXJw1MTdJI=","Uploader":"timboman","UploadDate":{"$date":{"$numberLong":"1579661152181"}},"CDNName":"wabbajackpush"} +{"_id":"17b3e918-8409-48e6-b7ff-6af858bfd1ba","Name":"file3.zip","Size":{"$numberInt":"633419999"},"Hash":"yyDD50X2kNM=","Uploader":"timboman","UploadDate":{"$date":{"$numberLong":"1579662459461"}},"CDNName":"wabbajackpush"}