Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/Dns.Tests/DigestRegistryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ namespace DnsTests;
public class DigestRegistryTest
{
[Test]
public async Task Exists() => await Assert.That(DigestRegistry.Digests).HasCount().NotEqualTo(0);
public async Task Exists() => await Assert.That(DigestRegistry.Digests).Count().IsNotEqualTo(0);
}
2 changes: 1 addition & 1 deletion tests/Dns.Tests/Dns.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" PrivateAssets="all" />
<PackageReference Include="SimpleBase" Version="5.6.0" />
<PackageReference Include="TUnit" Version="1.2.11" />
<PackageReference Include="TUnit" Version="1.3.15" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions tests/Dns.Tests/DomainNameTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public async Task Standard()
{
var name = new DomainName("my.example.org");

await Assert.That(name.Labels).HasCount(3);
await Assert.That(name.Labels).Count().IsEqualTo(3);
await Assert.That(name.Labels[0]).IsEqualTo("my");
await Assert.That(name.Labels[1]).IsEqualTo("example");
await Assert.That(name.Labels[2]).IsEqualTo("org");
Expand All @@ -23,7 +23,7 @@ public async Task TopLevelDomain()
{
var name = new DomainName("org");

await Assert.That(name.Labels).HasCount(1);
await Assert.That(name.Labels).Count().IsEqualTo(1);
await Assert.That(name.Labels[0]).IsEqualTo("org");

await Assert.That(name).IsEquatableOrEqualTo("org");
Expand All @@ -34,7 +34,7 @@ public async Task Root()
{
var name = new DomainName("");

await Assert.That(name.Labels).HasCount().Zero();
await Assert.That(name.Labels).Count().IsEqualTo(0);
await Assert.That(name).IsEquatableOrEqualTo("");
}

Expand All @@ -43,7 +43,7 @@ public async Task EscapedDotCharacter()
{
var name = new DomainName(@"my\.example.org");

await Assert.That(name.Labels).HasCount(2);
await Assert.That(name.Labels).Count().IsEqualTo(2);
await Assert.That(name.Labels[0]).IsEqualTo("my.example");
await Assert.That(name.Labels[1]).IsEqualTo("org");
await Assert.That(name).IsEquatableOrEqualTo(@"my\.example.org");
Expand All @@ -54,7 +54,7 @@ public async Task EscapedDotDigits()
{
var name = new DomainName(@"my\046example.org");

await Assert.That(name.Labels).HasCount(2);
await Assert.That(name.Labels).Count().IsEqualTo(2);
await Assert.That(name.Labels[0]).IsEqualTo("my.example");
await Assert.That(name.Labels[1]).IsEqualTo("org");
await Assert.That(name).IsEquatableOrEqualTo(@"my\.example.org");
Expand All @@ -64,17 +64,17 @@ public async Task EscapedDotDigits()
public async Task ImplicitParsingOfString()
{
DomainName name = @"my\046example.org";
await Assert.That(name.Labels).HasCount(2);
await Assert.That(name.Labels).Count().IsEqualTo(2);
await Assert.That(name.Labels[0]).IsEqualTo("my.example");
await Assert.That(name.Labels[1]).IsEqualTo("org");

name = @"my\.example.org";
await Assert.That(name.Labels).HasCount(2);
await Assert.That(name.Labels).Count().IsEqualTo(2);
await Assert.That(name.Labels[0]).IsEqualTo("my.example");
await Assert.That(name.Labels[1]).IsEqualTo("org");

name = "my.example.org";
await Assert.That(name.Labels).HasCount(3);
await Assert.That(name.Labels).Count().IsEqualTo(3);
await Assert.That(name.Labels[0]).IsEqualTo("my");
await Assert.That(name.Labels[1]).IsEqualTo("example");
await Assert.That(name.Labels[2]).IsEqualTo("org");
Expand All @@ -85,7 +85,7 @@ public async Task FromLabels()
{
var name = new DomainName("my.example", "org");

await Assert.That(name.Labels).HasCount(2);
await Assert.That(name.Labels).Count().IsEqualTo(2);
await Assert.That(name.Labels[0]).IsEqualTo("my.example");
await Assert.That(name.Labels[1]).IsEqualTo("org");
await Assert.That(name).IsEquatableOrEqualTo(@"my\.example.org");
Expand Down
42 changes: 21 additions & 21 deletions tests/Dns.Tests/MessageTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ public async Task DecodeQuery()
msg.Read(bytes, 0, bytes.Length);

await Assert.That(msg.Id).IsEqualTo((ushort)0);
await Assert.That(msg.Questions).HasCount(1);
await Assert.That(msg.Answers).HasCount().Zero();
await Assert.That(msg.AuthorityRecords).HasCount().Zero();
await Assert.That(msg.AdditionalRecords).HasCount().Zero();
await Assert.That(msg.Questions).Count().IsEqualTo(1);
await Assert.That(msg.Answers).Count().IsEqualTo(0);
await Assert.That(msg.AuthorityRecords).Count().IsEqualTo(0);
await Assert.That(msg.AdditionalRecords).Count().IsEqualTo(0);

var question = msg.Questions[0];
await Assert.That(question.Name).IsEquatableOrEqualTo("appletv.local");
Expand Down Expand Up @@ -64,10 +64,10 @@ public async Task DecodeResponse()

await Assert.That(msg.IsResponse).IsTrue();
await Assert.That(msg.AA).IsTrue();
await Assert.That(msg.Questions).HasCount().Zero();
await Assert.That(msg.Answers).HasCount(1);
await Assert.That(msg.AuthorityRecords).HasCount().Zero();
await Assert.That(msg.AdditionalRecords).HasCount(2);
await Assert.That(msg.Questions).Count().IsEqualTo(0);
await Assert.That(msg.Answers).Count().IsEqualTo(1);
await Assert.That(msg.AuthorityRecords).Count().IsEqualTo(0);
await Assert.That(msg.AdditionalRecords).Count().IsEqualTo(2);

await Assert.That(msg.Answers[0].Name).IsEquatableOrEqualTo("appletv.local");
await Assert.That(msg.Answers[0].Type).IsEqualTo(DnsType.A);
Expand Down Expand Up @@ -133,7 +133,7 @@ public async Task Response()
await Assert.That(response.IsResponse).IsTrue();
await Assert.That(response.Id).IsEqualTo(query.Id);
await Assert.That(response.Opcode).IsEqualTo(query.Opcode);
await Assert.That(response.Questions).HasCount(1);
await Assert.That(response.Questions).Count().IsEqualTo(1);
await Assert.That(response.Questions[0]).IsEqualTo(query.Questions[0]);
}

Expand Down Expand Up @@ -163,18 +163,18 @@ public async Task Roundtrip()
await Assert.That(actual.Id).IsEqualTo(expected.Id);
await Assert.That(actual.IsQuery).IsEqualTo(expected.IsQuery);
await Assert.That(actual.IsResponse).IsEqualTo(expected.IsResponse);
await Assert.That(actual.Questions).HasCount(1);
await Assert.That(actual.Answers).HasCount(1);
await Assert.That(actual.AuthorityRecords).HasCount(1);
await Assert.That(actual.AdditionalRecords).HasCount(1);
await Assert.That(actual.Questions).Count().IsEqualTo(1);
await Assert.That(actual.Answers).Count().IsEqualTo(1);
await Assert.That(actual.AuthorityRecords).Count().IsEqualTo(1);
await Assert.That(actual.AdditionalRecords).Count().IsEqualTo(1);
}

[Test]
public async Task ExtendedOpcode()
{
var expected = new Message { Opcode = (MessageOperation)0xfff };
await Assert.That(expected.Opcode).IsEqualTo((MessageOperation)0xfff);
await Assert.That(expected.AdditionalRecords.OfType<OPTRecord>()).HasCount(1);
await Assert.That(expected.AdditionalRecords.OfType<OPTRecord>()).Count().IsEqualTo(1);

var actual = (Message)new Message().Read(expected.ToByteArray());
await Assert.That(actual.Opcode).IsEqualTo(expected.Opcode);
Expand Down Expand Up @@ -230,8 +230,8 @@ public async Task Truncation_AdditionalRecords()
msg.Truncate(originalLength);

await Assert.That(originalLength).IsEqualTo(msg.Length());
await Assert.That(msg.AdditionalRecords).HasCount(1);
await Assert.That(msg.AuthorityRecords).HasCount(1);
await Assert.That(msg.AdditionalRecords).Count().IsEqualTo(1);
await Assert.That(msg.AuthorityRecords).Count().IsEqualTo(1);
await Assert.That(msg.TC).IsFalse();
}

Expand All @@ -248,8 +248,8 @@ public async Task AuthorityRecords()
msg.Truncate(originalLength);

await Assert.That(originalLength).IsEqualTo(msg.Length());
await Assert.That(msg.AdditionalRecords).HasCount().Zero();
await Assert.That(msg.AuthorityRecords).HasCount(1);
await Assert.That(msg.AdditionalRecords).Count().IsEqualTo(0);
await Assert.That(msg.AuthorityRecords).Count().IsEqualTo(1);
await Assert.That(msg.TC).IsFalse();
}

Expand Down Expand Up @@ -278,15 +278,15 @@ public async Task Dnssec_Bit()
{
var message = new Message();
await Assert.That(message.DO).IsFalse();
await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).HasCount().Zero();
await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).Count().IsEqualTo(0);

message.DO = false;
await Assert.That(message.DO).IsFalse();
await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).HasCount(1);
await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).Count().IsEqualTo(1);

message.DO = true;
await Assert.That(message.DO).IsTrue();
await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).HasCount(1);
await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).Count().IsEqualTo(1);
}

[Test]
Expand Down
2 changes: 1 addition & 1 deletion tests/Dns.Tests/OPTRecordTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public async Task Defaults()
await Assert.That(opt.Opcode8).IsEqualTo((byte)0);
await Assert.That(opt.Version).IsEqualTo((byte)0);
await Assert.That(opt.DO).IsFalse();
await Assert.That(opt.Options).HasCount().Zero();
await Assert.That(opt.Options).Count().IsEqualTo(0);
}

[Test]
Expand Down
12 changes: 6 additions & 6 deletions tests/Dns.Tests/PresentationReaderTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ @ PTR localhost
await Assert.That(resource.TTL).IsEqualTo(ResourceRecord.DefaultTTL);
await Assert.That(resource).IsTypeOf<PTRRecord>();
await Assert.That(resource.Name).IsNotNull();
await Assert.That(resource.Name!.Labels).HasCount(1);
await Assert.That(resource.Name!.Labels).Count().IsEqualTo(1);
}

[Test]
Expand Down Expand Up @@ -254,7 +254,7 @@ public async Task ReadResourceWithPreviousEscapedDomain()
await Assert.That(a.TTL).IsEqualTo(ResourceRecord.DefaultTTL);
await Assert.That(a).IsTypeOf<ARecord>();
await Assert.That(a.Name).IsNotNull();
await Assert.That(a.Name!.Labels).HasCount(2);
await Assert.That(a.Name!.Labels).Count().IsEqualTo(2);

var aaaa = reader.ReadResourceRecord();
await Assert.That(aaaa).IsNotNull();
Expand All @@ -264,7 +264,7 @@ public async Task ReadResourceWithPreviousEscapedDomain()
await Assert.That(aaaa.TTL).IsEqualTo(ResourceRecord.DefaultTTL);
await Assert.That(aaaa).IsTypeOf<AAAARecord>();
await Assert.That(aaaa.Name).IsNotNull();
await Assert.That(aaaa.Name!.Labels).HasCount(2);
await Assert.That(aaaa.Name!.Labels).Count().IsEqualTo(2);
}

[Test]
Expand All @@ -281,7 +281,7 @@ public async Task ReadResourceWithLeadingEscapedDomainName()
await Assert.That(a.TTL).IsEqualTo(ResourceRecord.DefaultTTL);
await Assert.That(a).IsTypeOf<ARecord>();
await Assert.That(a.Name).IsNotNull();
await Assert.That(a.Name!.Labels).HasCount(2);
await Assert.That(a.Name!.Labels).Count().IsEqualTo(2);
}

[Test]
Expand Down Expand Up @@ -319,15 +319,15 @@ example.com. IN SOA ns.example.com. username.example.com. ( 2007120710 1 2 4
resources.Add(r);
}

await Assert.That(resources).HasCount(15);
await Assert.That(resources).Count().IsEqualTo(15);
}

[Test]
public async Task ReadResourceData()
{
var reader = new PresentationReader(new StringReader("\\# 0"));
var rdata = reader.ReadResourceData();
await Assert.That(rdata).HasCount().Zero();
await Assert.That(rdata).Count().IsEqualTo(0);

reader = new PresentationReader(new StringReader("\\# 3 abcdef"));
rdata = reader.ReadResourceData();
Expand Down
4 changes: 2 additions & 2 deletions tests/Dns.Tests/Resolving/CachedNameServerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ public async Task Pruning_Background()
};

var res = await cache.ResolveAsync(query, TestContext.Current!.Execution.CancellationToken);
await Assert.That(res.Answers).HasCount(1);
await Assert.That(res.Answers).Count().IsEqualTo(1);

var cts = cache.PruneContinuously(TimeSpan.FromMilliseconds(200));
await Task.Delay(TimeSpan.FromSeconds(1), TestContext.Current.Execution.CancellationToken);
await cts.CancelAsync();
await Task.Delay(TimeSpan.FromMilliseconds(40), TestContext.Current.Execution.CancellationToken);
res = await cache.ResolveAsync(query, TestContext.Current.Execution.CancellationToken);
await Assert.That(res.Answers).HasCount().Zero();
await Assert.That(res.Answers).Count().IsEqualTo(0);
}
}
16 changes: 8 additions & 8 deletions tests/Dns.Tests/Resolving/CatalogTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,19 @@ public async Task RemoveZone()
var reader = new PresentationReader(stringReader);
var zone = catalog.IncludeZone(reader);
await Assert.That(zone.Name).IsEquatableOrEqualTo("example.com");
await Assert.That(catalog).HasCount(7);
await Assert.That(catalog).Count().IsEqualTo(7);

using var textReader = new StringReader(ExampleDotOrgZoneText);
reader = new PresentationReader(textReader);
zone = catalog.IncludeZone(reader);
await Assert.That(zone.Name).IsEquatableOrEqualTo("example.org");
await Assert.That(catalog).HasCount(14);
await Assert.That(catalog).Count().IsEqualTo(14);

catalog.RemoveZone("example.org");
await Assert.That(catalog).HasCount(7);
await Assert.That(catalog).Count().IsEqualTo(7);

catalog.RemoveZone("example.com");
await Assert.That(catalog).HasCount().Zero();
await Assert.That(catalog).Count().IsEqualTo(0);
}

[Test]
Expand Down Expand Up @@ -199,7 +199,7 @@ public async Task AddResource_Same()
var n2 = catalog.Add(a);
await Assert.That(n1).IsSameReferenceAs(n2);
await Assert.That(n1.Resources).Contains(a);
await Assert.That(n1.Resources).HasCount(1);
await Assert.That(n1.Resources).Count().IsEqualTo(1);
}

[Test]
Expand All @@ -217,7 +217,7 @@ public async Task AddResource_Duplicate()
await Assert.That(n1).IsSameReferenceAs(n2);
await Assert.That(n1.Resources).Contains(a);
await Assert.That(n1.Resources).Contains(b);
await Assert.That(n1.Resources).HasCount(1);
await Assert.That(n1.Resources).Count().IsEqualTo(1);
}

[Test]
Expand All @@ -238,7 +238,7 @@ public async Task AddResource_Latest()
await Assert.That(n1).IsSameReferenceAs(n2);
await Assert.That(n1.Resources).Contains(a);
await Assert.That(n1.Resources).Contains(b);
await Assert.That(n1.Resources).HasCount(1);
await Assert.That(n1.Resources).Count().IsEqualTo(1);
await Assert.That(n1.Resources.First().CreationTime).IsEqualTo(b.CreationTime);
await Assert.That(n1.Resources.First().TTL).IsEqualTo(b.TTL);
}
Expand Down Expand Up @@ -316,7 +316,7 @@ public async Task Include()
await Assert.That(catalog).ContainsKey("com");

var node = catalog["COM"];
await Assert.That(node.Resources).HasCount(3);
await Assert.That(node.Resources).Count().IsEqualTo(3);
}

[Test]
Expand Down
Loading
Loading