codex-storage/cs-codex-dist-tests
1
0
Fork 0
mirror of https://github.com/codex-storage/cs-codex-dist-tests.git synced 2025-02-13 12:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct checking of upload and download log statements

Browse Source
This commit is contained in:
benbierens 2023-08-16 11:39:24 +02:00
parent 6486dba289
commit 30364abf21
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Tests/BasicTests/ContinuousSubstitute.cs
View File

@ -1,6 +1,5 @@
using DistTestCore; using DistTestCore;
using NUnit.Framework; using NUnit.Framework;
using NUnit.Framework.Constraints;
using Utils; using Utils;
namespace Tests.BasicTests namespace Tests.BasicTests
@ -88,21 +87,15 @@ namespace Tests.BasicTests
var file = GenerateTestFile(filesize); var file = GenerateTestFile(filesize);
var cid = node.UploadFile(file); var cid = node.UploadFile(file);
var cidTag = cid.Id.Substring(cid.Id.Length - (1 + 6)); var cidTag = cid.Id.Substring(cid.Id.Length - 6);
var uploadLog = node.DownloadLog(); var uploadLog = node.DownloadLog();
var storeLines = uploadLog.FindLinesThatContain("Stored data", "topics=\"codex node\""); var storeLines = uploadLog.FindLinesThatContain("Stored data", "topics=\"codex node\"");
uploadLog.DeleteFile(); uploadLog.DeleteFile();
var storeLine = GetLineForCidTag(storeLines, cidTag); var storeLine = GetLineForCidTag(storeLines, cidTag);
if (storeLine == null)
{
Assert.Fail("Storeline not found for cid" + cidTag);
return;
}
AssertStoreLineContains(storeLine, numberOfBlocks, sizeInBytes); AssertStoreLineContains(storeLine, numberOfBlocks, sizeInBytes);
var dl = node.DownloadContent(cid); var dl = node.DownloadContent(cid);
file.AssertIsEqual(dl); file.AssertIsEqual(dl);
var downloadLog = node.DownloadLog(); var downloadLog = node.DownloadLog();
@ -111,13 +104,7 @@ namespace Tests.BasicTests
downloadLog.DeleteFile(); downloadLog.DeleteFile();
var sentLine = GetLineForCidTag(sentLines, cidTag); var sentLine = GetLineForCidTag(sentLines, cidTag);
if (sentLine == null)
{
Assert.Fail("Sentline not found for cid" + cidTag);
return;
}
AssertSentLineContains(sentLine, sizeInBytes); AssertSentLineContains(sentLine, sizeInBytes);
} }
catch catch
{ {
@ -136,7 +123,7 @@ namespace Tests.BasicTests
var tag = "bytes="; var tag = "bytes=";
var token = sentLine.Substring(sentLine.IndexOf(tag) + tag.Length); var token = sentLine.Substring(sentLine.IndexOf(tag) + tag.Length);
var bytes = Convert.ToInt64(token); var bytes = Convert.ToInt64(token);
Assert.AreEqual(sizeInBytes, bytes, "Sent bytes: Number of bytes incorrect"); Assert.AreEqual(sizeInBytes, bytes, $"Sent bytes: Number of bytes incorrect. Line: '{sentLine}'");
} }
private void AssertStoreLineContains(string storeLine, long numberOfBlocks, long sizeInBytes) private void AssertStoreLineContains(string storeLine, long numberOfBlocks, long sizeInBytes)
@ -149,15 +136,23 @@ namespace Tests.BasicTests
if (sizeToken == null) Assert.Fail("sizeToken not found in " + storeLine); if (sizeToken == null) Assert.Fail("sizeToken not found in " + storeLine);
var blocks = Convert.ToInt64(blocksToken); var blocks = Convert.ToInt64(blocksToken);
var size = Convert.ToInt64(sizeToken); var size = Convert.ToInt64(sizeToken?.Replace("'NByte", ""));
Assert.AreEqual(numberOfBlocks, blocks, "Stored data: Number of blocks incorrect"); var lineLog = $" Line: '{storeLine}'";
Assert.AreEqual(sizeInBytes, size, "Stored data: Number of blocks incorrect"); Assert.AreEqual(numberOfBlocks, blocks, "Stored data: Number of blocks incorrect." + lineLog);
Assert.AreEqual(sizeInBytes, size, "Stored data: Number of blocks incorrect." + lineLog);
} }
private string? GetLineForCidTag(string[] lines, string cidTag) private string GetLineForCidTag(string[] lines, string cidTag)
{ {
return lines.SingleOrDefault(l => l.Contains(cidTag)); var result = lines.SingleOrDefault(l => l.Contains(cidTag));
if (result == null)
{
Assert.Fail($"Failed to find '{cidTag}' in lines: '{string.Join(",", lines)}'");
throw new Exception();
}
return result;
} }
private string? GetToken(string[] tokens, string tag) private string? GetToken(string[] tokens, string tag)