Apply batch fixing of built-in types using var

This commit is contained in:
Dean Herbert
2021-10-27 13:04:41 +09:00
parent 1d7e97625a
commit 6944151486
263 changed files with 572 additions and 572 deletions

View File

@ -49,7 +49,7 @@ namespace osu.Game.Tests.NonVisual
for (int i = 0; i * beat_length_denominator < barLines.Count; i++)
{
var barLine = barLines[i * beat_length_denominator];
var expectedTime = beat_length_numerator * (int)signature * i;
int expectedTime = beat_length_numerator * (int)signature * i;
// every seventh bar's start time should be at least greater than the whole number we expect.
// It cannot be less, as that can affect overlapping scroll algorithms

View File

@ -87,7 +87,7 @@ namespace osu.Game.Tests.NonVisual
File.WriteAllText(actualTestFile, "test");
var rulesetStorage = storage.GetStorageForDirectory("rulesets");
var lookupPath = rulesetStorage.GetFiles(".").Single();
string lookupPath = rulesetStorage.GetFiles(".").Single();
Assert.That(lookupPath, Is.EqualTo("test"));
}
@ -140,7 +140,7 @@ namespace osu.Game.Tests.NonVisual
Assert.That(osuStorage, Is.Not.Null);
foreach (var file in osuStorage.IgnoreFiles)
foreach (string file in osuStorage.IgnoreFiles)
{
// avoid touching realm files which may be a pipe and break everything.
// this is also done locally inside OsuStorage via the IgnoreFiles list.
@ -149,7 +149,7 @@ namespace osu.Game.Tests.NonVisual
Assert.That(storage.Exists(file), Is.False);
}
foreach (var dir in osuStorage.IgnoreDirectories)
foreach (string dir in osuStorage.IgnoreDirectories)
{
Assert.That(Directory.Exists(Path.Combine(originalDirectory, dir)));
Assert.That(storage.ExistsDirectory(dir), Is.False);

View File

@ -347,7 +347,7 @@ namespace osu.Game.Tests.NonVisual
{
for (int i = 0; i < 1000; i++)
{
var time = handler.SetFrameFromTime(destination);
double? time = handler.SetFrameFromTime(destination);
if (time == null || time == destination)
return;
}

View File

@ -30,7 +30,7 @@ namespace osu.Game.Tests.NonVisual
Assert.Throws<InvalidOperationException>(() => _ = queue.Dequeue());
int count = 0;
foreach (var _ in queue)
foreach (int _ in queue)
count++;
Assert.AreEqual(0, count);
@ -50,7 +50,7 @@ namespace osu.Game.Tests.NonVisual
Assert.AreEqual(i, queue[i]);
int j = 0;
foreach (var item in queue)
foreach (int item in queue)
Assert.AreEqual(j++, item);
for (int i = queue.Count; i < queue.Count + capacity; i++)
@ -71,7 +71,7 @@ namespace osu.Game.Tests.NonVisual
Assert.AreEqual(count - capacity + i, queue[i]);
int j = count - capacity;
foreach (var item in queue)
foreach (int item in queue)
Assert.AreEqual(j++, item);
for (int i = queue.Count; i < queue.Count + capacity; i++)

View File

@ -84,7 +84,7 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
{
for (int i = 0; i < userCount; ++i)
{
var userId = Client.Room?.Users[i].UserID ?? throw new AssertionException("Room cannot be null!");
int userId = Client.Room?.Users[i].UserID ?? throw new AssertionException("Room cannot be null!");
Client.ChangeUserState(userId, state);
}
});

View File

@ -29,7 +29,7 @@ namespace osu.Game.Tests.NonVisual
});
int count = 0;
foreach (var unused in queue)
foreach (char unused in queue)
count++;
Assert.AreEqual(0, count);
@ -72,7 +72,7 @@ namespace osu.Game.Tests.NonVisual
// Assert correct item return and no longer in queue after dequeueing
Assert.AreEqual('a', queue[5]);
var dequeuedItem = queue.Dequeue();
char dequeuedItem = queue.Dequeue();
Assert.AreEqual('a', dequeuedItem);
Assert.AreEqual(5, queue.Count);
@ -133,7 +133,7 @@ namespace osu.Game.Tests.NonVisual
int expectedValueIndex = 0;
// Assert items are enumerated in correct order
foreach (var item in queue)
foreach (char item in queue)
{
Assert.AreEqual(expectedValues[expectedValueIndex], item);
expectedValueIndex++;