Skip to content

Commit 4c18909

Browse files
hhvrchhvrc
committed
Fix naming of DomainUtilities
1 parent aeb82ac commit 4c18909

2 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎Common.Tests/Utils/DomainUtilsTests.cs‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
namespace OpenShock.Common.Tests.Utils;
44

5-
public class DomainValidatorTests
5+
public class DomainUtilsTests
66
{
77
[Test]
88
public async Task NullString_ReturnsFalse()
99
{
1010
// Act
11-
var result = DomainValidator.IsValidDomain(null);
11+
var result = DomainUtils.IsValidDomain(null);
1212

1313
// Assert
1414
await Assert.That(result).IsFalse();
@@ -18,7 +18,7 @@ public async Task NullString_ReturnsFalse()
1818
public async Task EmptyString_ReturnsFalse()
1919
{
2020
// Act
21-
var result = DomainValidator.IsValidDomain("");
21+
var result = DomainUtils.IsValidDomain("");
2222

2323
// Assert
2424
await Assert.That(result).IsFalse();
@@ -28,7 +28,7 @@ public async Task EmptyString_ReturnsFalse()
2828
public async Task NoDot_ReturnsFalse()
2929
{
3030
// Act
31-
var result = DomainValidator.IsValidDomain("example");
31+
var result = DomainUtils.IsValidDomain("example");
3232

3333
// Assert
3434
await Assert.That(result).IsFalse();
@@ -38,7 +38,7 @@ public async Task NoDot_ReturnsFalse()
3838
public async Task LeadingDot_ReturnsFalse()
3939
{
4040
// Act
41-
var result = DomainValidator.IsValidDomain(".example.com");
41+
var result = DomainUtils.IsValidDomain(".example.com");
4242

4343
// Assert
4444
await Assert.That(result).IsFalse();
@@ -48,7 +48,7 @@ public async Task LeadingDot_ReturnsFalse()
4848
public async Task TrailingDot_ReturnsFalse()
4949
{
5050
// Act
51-
var result = DomainValidator.IsValidDomain("example.com.");
51+
var result = DomainUtils.IsValidDomain("example.com.");
5252

5353
// Assert
5454
await Assert.That(result).IsFalse();
@@ -58,7 +58,7 @@ public async Task TrailingDot_ReturnsFalse()
5858
public async Task ConsecutiveDots_ReturnsFalse()
5959
{
6060
// Act
61-
var result = DomainValidator.IsValidDomain("a..b.com");
61+
var result = DomainUtils.IsValidDomain("a..b.com");
6262

6363
// Assert
6464
await Assert.That(result).IsFalse();
@@ -71,7 +71,7 @@ public async Task LabelTooLong_ReturnsFalse()
7171
var tooLong = new string('a', 64) + ".com";
7272

7373
// Act
74-
var result = DomainValidator.IsValidDomain(tooLong);
74+
var result = DomainUtils.IsValidDomain(tooLong);
7575

7676
// Assert
7777
await Assert.That(result).IsFalse();
@@ -81,7 +81,7 @@ public async Task LabelTooLong_ReturnsFalse()
8181
public async Task LabelStartingHyphen_ReturnsFalse()
8282
{
8383
// Act
84-
var result = DomainValidator.IsValidDomain("-abc.com");
84+
var result = DomainUtils.IsValidDomain("-abc.com");
8585

8686
// Assert
8787
await Assert.That(result).IsFalse();
@@ -91,7 +91,7 @@ public async Task LabelStartingHyphen_ReturnsFalse()
9191
public async Task LabelEndingHyphen_ReturnsFalse()
9292
{
9393
// Act
94-
var result = DomainValidator.IsValidDomain("abc-.com");
94+
var result = DomainUtils.IsValidDomain("abc-.com");
9595

9696
// Assert
9797
await Assert.That(result).IsFalse();
@@ -101,9 +101,9 @@ public async Task LabelEndingHyphen_ReturnsFalse()
101101
public async Task InvalidCharacters_ReturnsFalse()
102102
{
103103
// Act
104-
var r1 = DomainValidator.IsValidDomain("exa_mple.com");
105-
var r2 = DomainValidator.IsValidDomain("examp le.com");
106-
var r3 = DomainValidator.IsValidDomain("exam!ple.com");
104+
var r1 = DomainUtils.IsValidDomain("exa_mple.com");
105+
var r2 = DomainUtils.IsValidDomain("examp le.com");
106+
var r3 = DomainUtils.IsValidDomain("exam!ple.com");
107107

108108
// Assert
109109
await Assert.That(r1).IsFalse();
@@ -119,7 +119,7 @@ public async Task TotalLengthOver253_ReturnsFalse()
119119
var longHost = string.Join('.', Enumerable.Repeat("a", 130)); // 129 dots + 130 a's ~ 259 chars
120120

121121
// Act
122-
var result = DomainValidator.IsValidDomain(longHost);
122+
var result = DomainUtils.IsValidDomain(longHost);
123123

124124
// Assert
125125
await Assert.That(result).IsFalse();
@@ -129,10 +129,10 @@ public async Task TotalLengthOver253_ReturnsFalse()
129129
public async Task ValidAsciiLDH_ReturnsTrue()
130130
{
131131
// Act
132-
var r1 = DomainValidator.IsValidDomain("example.com");
133-
var r2 = DomainValidator.IsValidDomain("a.b");
134-
var r3 = DomainValidator.IsValidDomain("foo-bar.baz0");
135-
var r4 = DomainValidator.IsValidDomain("xn--d1acufc.xn--p1ai"); // Punycode
132+
var r1 = DomainUtils.IsValidDomain("example.com");
133+
var r2 = DomainUtils.IsValidDomain("a.b");
134+
var r3 = DomainUtils.IsValidDomain("foo-bar.baz0");
135+
var r4 = DomainUtils.IsValidDomain("xn--d1acufc.xn--p1ai"); // Punycode
136136

137137
// Assert
138138
await Assert.That(r1).IsTrue();
@@ -145,7 +145,7 @@ public async Task ValidAsciiLDH_ReturnsTrue()
145145
public async Task HostMatchesCookieDomain_ExactMatch_ReturnsTrue()
146146
{
147147
// Act
148-
var result = DomainValidator.HostMatchesCookieDomain("example.com", "example.com");
148+
var result = DomainUtils.HostMatchesCookieDomain("example.com", "example.com");
149149

150150
// Assert
151151
await Assert.That(result).IsTrue();
@@ -155,7 +155,7 @@ public async Task HostMatchesCookieDomain_ExactMatch_ReturnsTrue()
155155
public async Task HostMatchesCookieDomain_SuffixLabelMatch_ReturnsTrue()
156156
{
157157
// Act
158-
var result = DomainValidator.HostMatchesCookieDomain("shop.foo.example.com".AsSpan(), "example.com".AsSpan());
158+
var result = DomainUtils.HostMatchesCookieDomain("shop.foo.example.com".AsSpan(), "example.com".AsSpan());
159159

160160
// Assert
161161
await Assert.That(result).IsTrue();
@@ -165,7 +165,7 @@ public async Task HostMatchesCookieDomain_SuffixLabelMatch_ReturnsTrue()
165165
public async Task HostMatchesCookieDomain_PartialSuffixNoBoundary_ReturnsFalse()
166166
{
167167
// Act
168-
var result = DomainValidator.HostMatchesCookieDomain("badexample.com", "example.com");
168+
var result = DomainUtils.HostMatchesCookieDomain("badexample.com", "example.com");
169169

170170
// Assert
171171
await Assert.That(result).IsFalse();
@@ -175,7 +175,7 @@ public async Task HostMatchesCookieDomain_PartialSuffixNoBoundary_ReturnsFalse()
175175
public async Task HostMatchesCookieDomain_CookieLongerThanHost_ReturnsFalse()
176176
{
177177
// Act
178-
var result = DomainValidator.HostMatchesCookieDomain("example.com", "foo.example.com");
178+
var result = DomainUtils.HostMatchesCookieDomain("example.com", "foo.example.com");
179179

180180
// Assert
181181
await Assert.That(result).IsFalse();
@@ -185,7 +185,7 @@ public async Task HostMatchesCookieDomain_CookieLongerThanHost_ReturnsFalse()
185185
public async Task HostMatchesCookieDomain_InvalidHost_ReturnsFalse()
186186
{
187187
// Act
188-
var result = DomainValidator.HostMatchesCookieDomain("example", "example.com"); // host without dot is invalid
188+
var result = DomainUtils.HostMatchesCookieDomain("example", "example.com"); // host without dot is invalid
189189

190190
// Assert
191191
await Assert.That(result).IsFalse();
@@ -195,7 +195,7 @@ public async Task HostMatchesCookieDomain_InvalidHost_ReturnsFalse()
195195
public async Task HostMatchesCookieDomain_CaseInsensitive_ReturnsTrue()
196196
{
197197
// Act
198-
var result = DomainValidator.HostMatchesCookieDomain("SHOP.Foo.Example.COM", "example.com");
198+
var result = DomainUtils.HostMatchesCookieDomain("SHOP.Foo.Example.COM", "example.com");
199199

200200
// Assert
201201
await Assert.That(result).IsTrue();
@@ -210,7 +210,7 @@ public async Task GetBestMatchingCookieDomain_PicksMostSpecific()
210210
var list = "example.com,foo.example.com,bar.com";
211211

212212
// Act
213-
var best = DomainValidator.GetBestMatchingCookieDomain("shop.foo.example.com", list);
213+
var best = DomainUtils.GetBestMatchingCookieDomain("shop.foo.example.com", list);
214214

215215
// Assert
216216
await Assert.That(best).IsEqualTo("foo.example.com");
@@ -223,7 +223,7 @@ public async Task GetBestMatchingCookieDomain_ExactMatchBeatsShorterSuffix()
223223
var list = "example.com,shop.foo.example.com";
224224

225225
// Act
226-
var best = DomainValidator.GetBestMatchingCookieDomain("shop.foo.example.com", list);
226+
var best = DomainUtils.GetBestMatchingCookieDomain("shop.foo.example.com", list);
227227

228228
// Assert
229229
await Assert.That(best).IsEqualTo("shop.foo.example.com");
@@ -236,7 +236,7 @@ public async Task GetBestMatchingCookieDomain_EmptySegmentsIgnored()
236236
var list = ",,example.com,,foo.example.com,,";
237237

238238
// Act
239-
var best = DomainValidator.GetBestMatchingCookieDomain("shop.foo.example.com", list);
239+
var best = DomainUtils.GetBestMatchingCookieDomain("shop.foo.example.com", list);
240240

241241
// Assert
242242
await Assert.That(best).IsEqualTo("foo.example.com");
@@ -249,7 +249,7 @@ public async Task GetBestMatchingCookieDomain_InvalidDomainsIgnored()
249249
var list = ".example.com,exa_mple.com,example.com";
250250

251251
// Act
252-
var best = DomainValidator.GetBestMatchingCookieDomain("shop.example.com", list);
252+
var best = DomainUtils.GetBestMatchingCookieDomain("shop.example.com", list);
253253

254254
// Assert
255255
await Assert.That(best).IsEqualTo("example.com");
@@ -262,7 +262,7 @@ public async Task GetBestMatchingCookieDomain_NoMatch_ReturnsNull()
262262
var list = "foo.com,bar.net";
263263

264264
// Act
265-
var best = DomainValidator.GetBestMatchingCookieDomain("example.com", list);
265+
var best = DomainUtils.GetBestMatchingCookieDomain("example.com", list);
266266

267267
// Assert
268268
await Assert.That(best).IsNull();
@@ -275,7 +275,7 @@ public async Task GetBestMatchingCookieDomain_HostInvalid_ReturnsNull()
275275
var list = "example.com,foo.example.com";
276276

277277
// Act
278-
var best = DomainValidator.GetBestMatchingCookieDomain("example", list);
278+
var best = DomainUtils.GetBestMatchingCookieDomain("example", list);
279279

280280
// Assert
281281
await Assert.That(best).IsNull();
@@ -288,7 +288,7 @@ public async Task GetBestMatchingCookieDomain_WhitespaceNotTrimmedInCurrentImple
288288
var list = " example.com ,foo.example.com";
289289

290290
// Use a host that matches *both* example.com and foo.example.com
291-
var best = DomainValidator.GetBestMatchingCookieDomain("shop.foo.example.com", list);
291+
var best = DomainUtils.GetBestMatchingCookieDomain("shop.foo.example.com", list);
292292

293293
// Assert: because the first is invalid (whitespace not trimmed), the best is foo.example.com
294294
await Assert.That(best).IsEqualTo("foo.example.com");
@@ -300,9 +300,9 @@ public async Task GetBestMatchingCookieDomain_WhitespaceNotTrimmedInCurrentImple
300300
public async Task HostBoundary_ChecksLabelBoundary()
301301
{
302302
// "ample.com" is substring but not a label-suffix of "example.com"
303-
var r1 = DomainValidator.HostMatchesCookieDomain("example.com", "ample.com");
304-
var r2 = DomainValidator.HostMatchesCookieDomain("xample.com", "ample.com");
305-
var r3 = DomainValidator.HostMatchesCookieDomain("fooample.com", "ample.com");
303+
var r1 = DomainUtils.HostMatchesCookieDomain("example.com", "ample.com");
304+
var r2 = DomainUtils.HostMatchesCookieDomain("xample.com", "ample.com");
305+
var r3 = DomainUtils.HostMatchesCookieDomain("fooample.com", "ample.com");
306306

307307
await Assert.That(r1).IsFalse();
308308
await Assert.That(r2).IsFalse();

‎Common/Utils/DomainUtils.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace OpenShock.Common.Utils;
66

7-
public static class DomainValidator
7+
public static class DomainUtils
88
{
99
private static readonly SearchValues<char> ValidLabelChars =
1010
SearchValues.Create("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-");

0 commit comments

Comments
 (0)