Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the broken tests

Browse Source
This commit is contained in:
halgari 2019-12-13 06:02:58 -07:00
parent 75d37888d2
commit 61579bc3b6
6 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack.Lib/ACompiler.cs
View File

@ -224,7 +224,7 @@ namespace Wabbajack.Lib
var result = new Archive
{
State = (AbstractDownloadState) DownloadDispatcher.ResolveArchive(archive.IniData)
State = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(archive.IniData)
};
if (result.State == null)

4
Wabbajack.Lib/MO2Compiler.cs
View File

@ -151,7 +151,7 @@ namespace Wabbajack.Lib
})
.ToList();
await CleanInvalidArchives();
await CleanInvalidArchives();
UpdateTracker.NextStep("Finding Install Files");
Directory.CreateDirectory(ModListOutputFolder);
@ -233,7 +233,7 @@ namespace Wabbajack.Lib
Info($"No match for {nomatch.Count()} files");
foreach (var file in nomatch)
Info($" {file.To}");
if (nomatch.Count() > 0)
if (nomatch.Any())
{
if (IgnoreMissingFiles)
{

18
Wabbajack.Test/ContentRightsManagementTests.cs
View File

@ -15,6 +15,8 @@ namespace Wabbajack.Test
public class ContentRightsManagementTests
{
private ValidateModlist validate;
private WorkQueue queue;
private static string permissions = @"
@ -49,12 +51,16 @@ namespace Wabbajack.Test
[TestInitialize]
public void TestSetup()
{
using (var workQueue = new WorkQueue())
{
validate = new ValidateModlist(workQueue);
validate.LoadAuthorPermissionsFromString(permissions);
validate.LoadServerWhitelist(server_whitelist);
}
queue = new WorkQueue();
validate = new ValidateModlist(queue);
validate.LoadAuthorPermissionsFromString(permissions);
validate.LoadServerWhitelist(server_whitelist);
}
[TestCleanup]
public void TestCleanup()
{
queue?.Dispose();
}
[TestMethod]

20
Wabbajack.Test/DownloaderTests.cs
View File

@ -45,7 +45,7 @@ namespace Wabbajack.Test
var ini = @"[General]
directURL=https://mega.nz/#!CsMSFaaJ!-uziC4mbJPRy2e4pPk8Gjb3oDT_38Be9fzZ6Ld4NL-k";
var state = (AbstractDownloadState)DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);
@ -76,7 +76,7 @@ namespace Wabbajack.Test
var ini = @"[General]
directURL=https://www.dropbox.com/s/5hov3m2pboppoc2/WABBAJACK_TEST_FILE.txt?dl=0";
var state = (AbstractDownloadState)DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);
@ -106,7 +106,7 @@ namespace Wabbajack.Test
var ini = @"[General]
directURL=https://drive.google.com/file/d/1grLRTrpHxlg7VPxATTFNfq2OkU_Plvh_/view?usp=sharing";
var state = (AbstractDownloadState)DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);
@ -136,7 +136,7 @@ namespace Wabbajack.Test
var ini = @"[General]
directURL=http://build.wabbajack.org/WABBAJACK_TEST_FILE.txt";
var state = (AbstractDownloadState)DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);
@ -165,7 +165,7 @@ namespace Wabbajack.Test
var ini = @"[General]
manualURL=http://build.wabbajack.org/WABBAJACK_TEST_FILE.zip";
var state = (AbstractDownloadState)DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);
@ -188,7 +188,7 @@ namespace Wabbajack.Test
var ini = @"[General]
directURL=http://www.mediafire.com/file/agiqzm1xwebczpx/WABBAJACK_TEST_FILE.txt";
var state = (AbstractDownloadState) DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);
@ -224,7 +224,7 @@ namespace Wabbajack.Test
modID = 12604
fileID=35407";
var state = (AbstractDownloadState)DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);
@ -254,7 +254,7 @@ namespace Wabbajack.Test
var ini = @"[General]
directURL=https://www.moddb.com/downloads/start/124908?referer=https%3A%2F%2Fwww.moddb.com%2Fmods%2Fautopause";
var state = (AbstractDownloadState)DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);
@ -282,7 +282,7 @@ namespace Wabbajack.Test
var ini = @"[General]
directURL=https://www.loverslab.com/files/file/11116-test-file-for-wabbajack-integration/?do=download&r=737123&confirm=1&t=1";
var state = (AbstractDownloadState)DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);
@ -311,7 +311,7 @@ namespace Wabbajack.Test
gameName={Game.SkyrimSpecialEdition.MetaData().MO2ArchiveName}
gameFile=Data/Update.esm";
var state = (AbstractDownloadState)DownloadDispatcher.ResolveArchive(ini.LoadIniString());
var state = (AbstractDownloadState)await DownloadDispatcher.ResolveArchive(ini.LoadIniString());
Assert.IsNotNull(state);

10
Wabbajack.Test/EndToEndTests.cs
View File

@ -64,7 +64,7 @@ namespace Wabbajack.Test
utils.Configure();
var modlist = CompileAndInstall(profile);
var modlist = await CompileAndInstall(profile);
utils.VerifyAllFiles();
@ -88,7 +88,7 @@ namespace Wabbajack.Test
if (!File.Exists(src))
{
var state = DownloadDispatcher.ResolveArchive(url);
await state.Download(new Archive() { Name = "Unknown"}, src);
await state.Download(new Archive { Name = "Unknown"}, src);
}
if (!Directory.Exists(utils.DownloadsFolder))
@ -142,11 +142,11 @@ namespace Wabbajack.Test
private async Task<ModList> CompileAndInstall(string profile)
{
var compiler = await ConfigureAndRunCompiler(profile);
Install(compiler);
await Install(compiler);
return compiler.ModList;
}
private void Install(MO2Compiler compiler)
private async Task Install(MO2Compiler compiler)
{
var modlist = AInstaller.LoadFromFile(compiler.ModListOutputFile);
var installer = new MO2Installer(
@ -155,7 +155,7 @@ namespace Wabbajack.Test
outputFolder: utils.InstallFolder,
downloadFolder: utils.DownloadsFolder);
installer.GameFolder = utils.GameFolder;
installer.Begin().Wait();
await installer.Begin();
}
private async Task<MO2Compiler> ConfigureAndRunCompiler(string profile)

6
Wabbajack.Test/SanityTests.cs
View File

@ -120,7 +120,7 @@ namespace Wabbajack.Test
var game_file = Path.Combine(utils.GameFolder, "Data", "Update.esm");
utils.GenerateRandomFileData(game_file, 20);
var modlist = CompileAndInstall(profile);
var modlist = await CompileAndInstall(profile);
utils.VerifyInstalledFile(mod, @"Update.esm");
@ -133,7 +133,7 @@ namespace Wabbajack.Test
}
[TestMethod]
public void SetScreenSizeTest()
public async Task SetScreenSizeTest()
{
var profile = utils.AddProfile();
var mod = utils.AddMod("dummy");
@ -147,7 +147,7 @@ namespace Wabbajack.Test
"iSize W=-200"
});
var modlist = CompileAndInstall(profile);
var modlist = await CompileAndInstall(profile);
var ini = Path.Combine(utils.InstallFolder, "profiles", profile, "somegameprefs.ini").LoadIniFile();