Merge pull request #740 from wabbajack-tools/fix-libceftests

Fix libceftests
This commit is contained in:
Timothy Baldridge
2020-04-22 17:24:13 -06:00
committed by GitHub
3 changed files with 8 additions and 6 deletions

View File

@ -11,7 +11,7 @@ namespace Wabbajack.Common.Test
{ {
using (var queue = new WorkQueue()) using (var queue = new WorkQueue())
{ {
var speed = Utils.TestDiskSpeed(queue, @".\"); var speed = Utils.TestDiskSpeed(queue, AbsolutePath.EntryPoint);
} }
} }

View File

@ -3,6 +3,7 @@ using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using Wabbajack.Common; using Wabbajack.Common;
using Wabbajack.Common.Serialization.Json;
using Wabbajack.Lib.Validation; using Wabbajack.Lib.Validation;
using Wabbajack.Lib.WebAutomation; using Wabbajack.Lib.WebAutomation;
@ -18,6 +19,7 @@ namespace Wabbajack.Lib.Downloaders
return new State(url.ToString()); return new State(url.ToString());
} }
[JsonName("MediaFireDownloader+State")]
public class State : AbstractDownloadState public class State : AbstractDownloadState
{ {
public string Url { get; } public string Url { get; }

View File

@ -193,7 +193,7 @@ namespace Wabbajack.Test
//Assert.Equal(File.ReadAllText(filename.Path), "Cheese for Everyone!"); //Assert.Equal(File.ReadAllText(filename.Path), "Cheese for Everyone!");
} }
/*
[Fact] [Fact]
public async Task MediaFireDownload() public async Task MediaFireDownload()
{ {
@ -211,18 +211,18 @@ namespace Wabbajack.Test
((MediaFireDownloader.State) url_state).Url); ((MediaFireDownloader.State) url_state).Url);
var converted = RoundTripState(state); var converted = RoundTripState(state);
Assert.True(await converted.Verify()); Assert.True(await converted.Verify(new Archive(state: null!) { Size = 20 }));
using var filename = new TempFile(); using var filename = new TempFile();
Assert.True(converted.IsWhitelisted(new ServerWhitelist Assert.True(converted.IsWhitelisted(new ServerWhitelist
{AllowedPrefixes = new List<string> {"http://www.mediafire.com/file/agiqzm1xwebczpx/"}})); {AllowedPrefixes = new List<string> {"http://www.mediafire.com/file/agiqzm1xwebczpx/"}}));
Assert.False(converted.IsWhitelisted(new ServerWhitelist {AllowedPrefixes = new List<string>()})); Assert.False(converted.IsWhitelisted(new ServerWhitelist {AllowedPrefixes = new List<string>()}));
await converted.Download(new Archive {Name = "Media Fire Test.txt"}, filename.Path); await converted.Download(new Archive(state: null!) { Name = "Media Fire Test.zip" }, filename.Path);
Assert.Equal(File.ReadAllText(filename.Path), "Cheese for Everyone!"); Assert.Equal("Cheese for Everyone!", await filename.Path.ReadAllTextAsync());
}*/ }
[Fact] [Fact]
public async Task NexusDownload() public async Task NexusDownload()