tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NUnit analyzer warnings in content.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-07-30 23:38:35 +02:00
parent 681f1419c7
commit fca7d8d81a
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.IntegrationTests/Tests/BuckleTest.cs
View File

@@ -60,7 +60,7 @@ namespace Content.IntegrationTests.Tests
Assert.False(ActionBlockerSystem.CanMove(human)); Assert.False(ActionBlockerSystem.CanMove(human));
Assert.False(ActionBlockerSystem.CanChangeDirection(human)); Assert.False(ActionBlockerSystem.CanChangeDirection(human));
Assert.False(EffectBlockerSystem.CanFall(human)); Assert.False(EffectBlockerSystem.CanFall(human));
Assert.AreEqual(human.Transform.WorldPosition, chair.Transform.WorldPosition); Assert.That(human.Transform.WorldPosition, Is.EqualTo(chair.Transform.WorldPosition));
// Side effects of buckling for the strap // Side effects of buckling for the strap
Assert.That(strap.BuckledEntities, Does.Contain(human)); Assert.That(strap.BuckledEntities, Does.Contain(human));

4
Content.IntegrationTests/Tests/GravityGridTest.cs
View File

@@ -44,7 +44,7 @@ namespace Content.IntegrationTests.Tests
Assert.That(generator.HasComponent<PowerReceiverComponent>()); Assert.That(generator.HasComponent<PowerReceiverComponent>());
var generatorComponent = generator.GetComponent<GravityGeneratorComponent>(); var generatorComponent = generator.GetComponent<GravityGeneratorComponent>();
var powerComponent = generator.GetComponent<PowerReceiverComponent>(); var powerComponent = generator.GetComponent<PowerReceiverComponent>();
Assert.AreEqual(generatorComponent.Status, GravityGeneratorStatus.Unpowered); Assert.That(generatorComponent.Status, Is.EqualTo(GravityGeneratorStatus.Unpowered));
powerComponent.NeedsPower = false; powerComponent.NeedsPower = false;
}); });
server.RunTicks(1); server.RunTicks(1);
@@ -53,7 +53,7 @@ namespace Content.IntegrationTests.Tests
{ {
var generatorComponent = generator.GetComponent<GravityGeneratorComponent>(); var generatorComponent = generator.GetComponent<GravityGeneratorComponent>();
Assert.AreEqual(generatorComponent.Status, GravityGeneratorStatus.On); Assert.That(generatorComponent.Status, Is.EqualTo(GravityGeneratorStatus.On));
Assert.That(!grid1.HasGravity); Assert.That(!grid1.HasGravity);
Assert.That(grid2.HasGravity); Assert.That(grid2.HasGravity);

8
Content.IntegrationTests/Tests/SaveLoadMapTest.cs
View File

@@ -55,15 +55,15 @@ namespace Content.IntegrationTests.Tests
if(!mapManager.TryFindGridAt(new MapId(10), new Vector2(10,10), out var mapGrid)) if(!mapManager.TryFindGridAt(new MapId(10), new Vector2(10,10), out var mapGrid))
Assert.Fail(); Assert.Fail();
Assert.AreEqual(new Vector2(10, 10), mapGrid.WorldPosition); Assert.That(mapGrid.WorldPosition, Is.EqualTo(new Vector2(10, 10)));
Assert.AreEqual(new Tile(1, 512), mapGrid.GetTileRef(new MapIndices(0, 0)).Tile); Assert.That(mapGrid.GetTileRef(new MapIndices(0, 0)).Tile, Is.EqualTo(new Tile(1, 512)));
} }
{ {
if (!mapManager.TryFindGridAt(new MapId(10), new Vector2(-8, -8), out var mapGrid)) if (!mapManager.TryFindGridAt(new MapId(10), new Vector2(-8, -8), out var mapGrid))
Assert.Fail(); Assert.Fail();
Assert.AreEqual(new Vector2(-8, -8), mapGrid.WorldPosition); Assert.That(mapGrid.WorldPosition, Is.EqualTo(new Vector2(-8, -8)));
Assert.AreEqual(new Tile(2, 511), mapGrid.GetTileRef(new MapIndices(0, 0)).Tile); Assert.That(mapGrid.GetTileRef(new MapIndices(0, 0)).Tile, Is.EqualTo(new Tile(2, 511)));
} }
} }

4
Content.Tests/Server/Preferences/PreferencesDatabaseTests.cs
View File

@@ -100,11 +100,11 @@ namespace Content.Tests.Server.Preferences
await db.SaveSelectedCharacterIndexAsync(username, slot); await db.SaveSelectedCharacterIndexAsync(username, slot);
await db.SaveCharacterSlotAsync(username, CharlieCharlieson(), slot); await db.SaveCharacterSlotAsync(username, CharlieCharlieson(), slot);
var prefs = await db.GetPlayerPreferencesAsync(username); var prefs = await db.GetPlayerPreferencesAsync(username);
Assert.AreEqual(prefs.SelectedCharacterIndex, 0); Assert.That(prefs.SelectedCharacterIndex, Is.EqualTo(0));
await db.SaveSelectedCharacterIndexAsync(username, MaxCharacterSlots); await db.SaveSelectedCharacterIndexAsync(username, MaxCharacterSlots);
prefs = await db.GetPlayerPreferencesAsync(username); prefs = await db.GetPlayerPreferencesAsync(username);
Assert.AreEqual(prefs.SelectedCharacterIndex, MaxCharacterSlots - 1); Assert.That(prefs.SelectedCharacterIndex, Is.EqualTo(MaxCharacterSlots - 1));
} }
} }
} }

24
Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Tests.Shared.Chemistry
public void ReagentUnitIntegerTests(int value, string expected) public void ReagentUnitIntegerTests(int value, string expected)
{ {
var result = ReagentUnit.New(value); var result = ReagentUnit.New(value);
Assert.AreEqual(expected, $"{result}"); Assert.That($"{result}", Is.EqualTo(expected));
} }
[Test] [Test]
@@ -23,7 +23,7 @@ namespace Content.Tests.Shared.Chemistry
public void ReagentUnitFloatTests(float value, string expected) public void ReagentUnitFloatTests(float value, string expected)
{ {
var result = ReagentUnit.New(value); var result = ReagentUnit.New(value);
Assert.AreEqual(expected, $"{result}"); Assert.That($"{result}", Is.EqualTo(expected));
} }
[Test] [Test]
@@ -32,7 +32,7 @@ namespace Content.Tests.Shared.Chemistry
public void ReagentUnitDoubleTests(double value, string expected) public void ReagentUnitDoubleTests(double value, string expected)
{ {
var result = ReagentUnit.New(value); var result = ReagentUnit.New(value);
Assert.AreEqual(expected, $"{result}"); Assert.That($"{result}", Is.EqualTo(expected));
} }
[Test] [Test]
@@ -41,7 +41,7 @@ namespace Content.Tests.Shared.Chemistry
public void ReagentUnitStringTests(string value, string expected) public void ReagentUnitStringTests(string value, string expected)
{ {
var result = ReagentUnit.New(value); var result = ReagentUnit.New(value);
Assert.AreEqual(expected, $"{result}"); Assert.That($"{result}", Is.EqualTo(expected));
} }
[Test] [Test]
@@ -56,7 +56,7 @@ namespace Content.Tests.Shared.Chemistry
var result = a + b; var result = a + b;
Assert.AreEqual(expected, $"{result}"); Assert.That($"{result}", Is.EqualTo(expected));
} }
[Test] [Test]
@@ -70,7 +70,7 @@ namespace Content.Tests.Shared.Chemistry
var result = a - b; var result = a - b;
Assert.AreEqual(expected, $"{result}"); Assert.That($"{result}", Is.EqualTo(expected));
} }
[Test] [Test]
@@ -84,7 +84,7 @@ namespace Content.Tests.Shared.Chemistry
var result = a / b; var result = a / b;
Assert.AreEqual(expected, $"{result}"); Assert.That($"{result}", Is.EqualTo(expected));
} }
[Test] [Test]
@@ -97,7 +97,7 @@ namespace Content.Tests.Shared.Chemistry
var result = a * b; var result = a * b;
Assert.AreEqual(expected, $"{result}"); Assert.That($"{result}", Is.EqualTo(expected));
} }
[Test] [Test]
@@ -107,7 +107,7 @@ namespace Content.Tests.Shared.Chemistry
public void FloatRoundingTest(float a, int expected) public void FloatRoundingTest(float a, int expected)
{ {
var result = (int) MathF.Round(a * (float) MathF.Pow(10, 2), MidpointRounding.AwayFromZero); var result = (int) MathF.Round(a * (float) MathF.Pow(10, 2), MidpointRounding.AwayFromZero);
Assert.AreEqual(expected, result); Assert.That(result, Is.EqualTo(expected));
} }
[Test] [Test]
@@ -122,7 +122,7 @@ namespace Content.Tests.Shared.Chemistry
ReagentUnit.New(4), ReagentUnit.New(4),
}; };
var min = ReagentUnit.Min(unorderedList); var min = ReagentUnit.Min(unorderedList);
Assert.AreEqual(ReagentUnit.New(1), min); Assert.That(min, Is.EqualTo(ReagentUnit.New(1)));
} }
[Test] [Test]
@@ -136,8 +136,8 @@ namespace Content.Tests.Shared.Chemistry
{ {
var parameter = ReagentUnit.New(a); var parameter = ReagentUnit.New(a);
var comparison = ReagentUnit.New(b); var comparison = ReagentUnit.New(b);
Assert.AreEqual(comparison.Equals(parameter), parameter.Equals(comparison)); Assert.That(parameter.Equals(comparison), Is.EqualTo(comparison.Equals(parameter)));
Assert.AreEqual(expected, comparison.Equals(parameter)); Assert.That(comparison.Equals(parameter), Is.EqualTo(expected));
} }
} }
} }