Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'component-tweaks' into 20-06-24-submodule

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-06-24 12:00:58 +02:00
parent 78085855db 27aefeb35d
commit d73f9d3721
7 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -69,7 +69,8 @@ namespace Content.IntegrationTests.Tests
catch (Exception e)
{
Logger.LogS(LogLevel.Error, "EntityTest", "Entity '" + prototype.ID + "' threw: " + e.Message);
Assert.Fail();
//Assert.Fail();
throw;
}
}
});

22
Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
View File

@@ -1,4 +1,5 @@
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using NUnit.Framework;
using Robust.Server.Interfaces.Maps;
@@ -37,19 +38,34 @@ namespace Content.IntegrationTests.Tests
string one;
string two;
using (var stream = userData.Open(new ResourcePath("save load save 1.yml"), FileMode.Open))
var rp1 = new ResourcePath("save load save 1.yml");
using (var stream = userData.Open(rp1, FileMode.Open))
using (var reader = new StreamReader(stream))
{
one = reader.ReadToEnd();
}
using (var stream = userData.Open(new ResourcePath("save load save 2.yml"), FileMode.Open))
var rp2 = new ResourcePath("save load save 2.yml");
using (var stream = userData.Open(rp2, FileMode.Open))
using (var reader = new StreamReader(stream))
{
two = reader.ReadToEnd();
}
Assert.That(one, Is.EqualTo(two));
Assert.Multiple(() => {
Assert.That(one, Is.EqualTo(two));
var failed = TestContext.CurrentContext.Result.Assertions.FirstOrDefault();
if (failed != null)
{
var path1 = Path.Combine(userData.RootDir!,rp1.ToRelativeSystemPath());
var path2 = Path.Combine(userData.RootDir!,rp2.ToRelativeSystemPath());
TestContext.AddTestAttachment(path1);
TestContext.AddTestAttachment(path2);
TestContext.Error.WriteLine("Complete output:");
TestContext.Error.WriteLine(path1);
TestContext.Error.WriteLine(path2);
}
});
}
/// <summary>