Skip to content

Commit b64913c

Browse files
author
Martijn Hoekstra
committed
fix mocks to set success status
1 parent d3b6771 commit b64913c

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

Hotsapi.Uploader.Common.Test/ManagerTests.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Hotsapi.Uploader.Common.Test
88
[TestClass]
99
public partial class ManagerTests
1010
{
11-
private Task ShortRandomDelay()
11+
public static Task ShortRandomDelay()
1212
{
1313
var r = new Random();
1414
var delay = r.Next(100, 200);
@@ -132,8 +132,9 @@ public async Task AllInitialFilesProcessed()
132132
});
133133

134134
manager.Start(new NoNewFilesMonitor(), new MockAnalizer(), uploadTester);
135-
var finished = await Task.WhenAny(Task.Delay(4000), done.Task);
136-
await finished;
135+
var num = await done.Task;
136+
//var finished = await Task.WhenAny(Task.Delay(4000), done.Task);
137+
//await finished;
137138
Assert.AreEqual(3, uploadsSeen);
138139
}
139140
}

Hotsapi.Uploader.Common.Test/MockAnalizer.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ public partial class ManagerTests
77
private class MockAnalizer : IAnalyzer
88
{
99
public int MinimumBuild { get; set; }
10-
public Replay Analyze(ReplayFile file) => new Replay();
10+
public Replay Analyze(ReplayFile file) {
11+
file.UploadStatus = UploadStatus.Preprocessed;
12+
return new Replay();
13+
}
1114
public string GetFingerprint(Replay replay) => "dummy fingerprint";
1215
}
1316
}

Hotsapi.Uploader.Common.Test/MockUploader.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ public void SetUploadCallback(Func<ReplayFile, Task> onUpload)
2121
};
2222
}
2323

24-
public Task CheckDuplicate(IEnumerable<ReplayFile> replays) => Task.CompletedTask;
24+
public async Task CheckDuplicate(IEnumerable<ReplayFile> replays)
25+
{
26+
foreach (var replay in replays) {
27+
replay.UploadStatus = UploadStatus.ReadyForUpload;
28+
}
29+
await ShortRandomDelay(); //todo: put this elsewhere
30+
}
2531
public Task<int> GetMinimumBuild() => Task.FromResult(1);
2632
public Task Upload(ReplayFile file)
2733
{

Hotsapi.Uploader.Common/Manager.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ public async void Start(IMonitor monitor, IAnalyzer analyzer, IUploader uploader
106106

107107
var replays = ScanReplays();
108108
Files.AddRange(replays);
109-
replays.Where(x => x.UploadStatus == UploadStatus.None).Reverse().Map(x => processingQueue.Add(x));
109+
replays.Where(x => x.UploadStatus == UploadStatus.None)
110+
.Reverse()
111+
.Map(processingQueue.Add);
110112

111113
_monitor.ReplayAdded += async (_, e) => {
112114
await EnsureFileAvailable(e.Data, 3000);

0 commit comments

Comments
 (0)