Skip to content
Merged
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
12 changes: 10 additions & 2 deletions LanguageTags/Iso6392Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-2 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>());

Expand All@@ -116,7 +120,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Iso6393Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-3 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>());

Expand All@@ -142,7 +146,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Rfc5646Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// Loads RFC 5646 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>());

Expand All@@ -98,7 +102,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>(options));

Expand Down
8 changes: 8 additions & 0 deletions LanguageTagsTests/Fixture.cs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
namespace ptr727.LanguageTags.Tests;

[CollectionDefinition("DisableParallelDefinition", DisableParallelization = true)]
[System.Diagnostics.CodeAnalysis.SuppressMessage(
"Maintainability",
"CA1515:Consider making public types internal",
Justification = "https://xunit.net/docs/running-tests-in-parallel"
)]
public sealed class DisableParallelDefinition { }

internal static class Fixture // : IDisposable
{
// public void Dispose() => GC.SuppressFinalize(this);
Expand Down
19 changes: 19 additions & 0 deletions LanguageTagsTests/LanguageTagBuilderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,25 @@ public void Normalize_Pass()
_ = languageTag.ToString().Should().Be("en-a-aaa-bbb-b-ccc-x-a-ccc");
}

[Fact]
public void Normalize_WithOptions_Pass()
{
Options options = new();

// en-Latn-GB-boont-r-extended-sequence-x-private
LanguageTag? languageTag = new LanguageTagBuilder()
.Language("en")
.Script("latn")
.Region("gb")
.VariantAdd("boont")
.ExtensionAdd('r', ["extended", "sequence"])
.PrivateUseAdd("private")
.Normalize(options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be("en-GB-boont-r-extended-sequence-x-private");
}

[Fact]
public void Build_Fail()
{
Expand Down
82 changes: 82 additions & 0 deletions LanguageTagsTests/LanguageTagTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,20 @@ public void Parse_Static_Pass(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
[InlineData("x-all-private")]
public void Parse_WithOptions_Pass(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -31,6 +45,21 @@ public void Parse_Static_ReturnsNull(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
public void Parse_WithOptions_ReturnsNull(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
Expand All@@ -44,6 +73,20 @@ public void TryParse_Success(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
public void TryParse_WithOptions_Success(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeTrue();
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -60,6 +103,23 @@ public void TryParse_Failure(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
[InlineData("x")] // Private missing
public void TryParse_WithOptions_Failure(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeFalse();
_ = languageTag.Should().BeNull();
}

[Fact]
public void CreateBuilder_Pass()
{
Expand DownExpand Up@@ -162,6 +222,28 @@ public void ParseAndNormalize_InvalidTag_ReturnsNull()
_ = result.Should().BeNull();
}

[Theory]
[InlineData("en-latn-us", "en-US")]
[InlineData("zh-cmn-Hans-CN", "cmn-Hans-CN")]
public void ParseAndNormalize_WithOptions_ValidTag_ReturnsNormalized(
string tag,
string expected
)
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize(tag, options);
_ = result.Should().NotBeNull();
_ = result!.ToString().Should().Be(expected);
}

[Fact]
public void ParseAndNormalize_WithOptions_InvalidTag_ReturnsNull()
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize("invalid-tag", options);
_ = result.Should().BeNull();
}

[Fact]
public void IsValid_Property_ValidTag_ReturnsTrue()
{
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Enhance documentation for JSON loading methods and add exception handling in Iso6392Data, Iso6393Data, and Rfc5646Data classes; add tests for LanguageTag parsing and normalization with options; implement logging options tests. by ptr727 · Pull Request #71 · ptr727/LanguageTags · GitHub
Skip to content
Merged
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
12 changes: 10 additions & 2 deletions LanguageTags/Iso6392Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-2 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>());

Expand All@@ -116,7 +120,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Iso6393Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-3 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>());

Expand All@@ -142,7 +146,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Rfc5646Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// Loads RFC 5646 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>());

Expand All@@ -98,7 +102,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>(options));

Expand Down
8 changes: 8 additions & 0 deletions LanguageTagsTests/Fixture.cs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
namespace ptr727.LanguageTags.Tests;

[CollectionDefinition("DisableParallelDefinition", DisableParallelization = true)]
[System.Diagnostics.CodeAnalysis.SuppressMessage(
"Maintainability",
"CA1515:Consider making public types internal",
Justification = "https://xunit.net/docs/running-tests-in-parallel"
)]
public sealed class DisableParallelDefinition { }

internal static class Fixture // : IDisposable
{
// public void Dispose() => GC.SuppressFinalize(this);
Expand Down
19 changes: 19 additions & 0 deletions LanguageTagsTests/LanguageTagBuilderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,25 @@ public void Normalize_Pass()
_ = languageTag.ToString().Should().Be("en-a-aaa-bbb-b-ccc-x-a-ccc");
}

[Fact]
public void Normalize_WithOptions_Pass()
{
Options options = new();

// en-Latn-GB-boont-r-extended-sequence-x-private
LanguageTag? languageTag = new LanguageTagBuilder()
.Language("en")
.Script("latn")
.Region("gb")
.VariantAdd("boont")
.ExtensionAdd('r', ["extended", "sequence"])
.PrivateUseAdd("private")
.Normalize(options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be("en-GB-boont-r-extended-sequence-x-private");
}

[Fact]
public void Build_Fail()
{
Expand Down
82 changes: 82 additions & 0 deletions LanguageTagsTests/LanguageTagTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,20 @@ public void Parse_Static_Pass(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
[InlineData("x-all-private")]
public void Parse_WithOptions_Pass(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -31,6 +45,21 @@ public void Parse_Static_ReturnsNull(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
public void Parse_WithOptions_ReturnsNull(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
Expand All@@ -44,6 +73,20 @@ public void TryParse_Success(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
public void TryParse_WithOptions_Success(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeTrue();
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -60,6 +103,23 @@ public void TryParse_Failure(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
[InlineData("x")] // Private missing
public void TryParse_WithOptions_Failure(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeFalse();
_ = languageTag.Should().BeNull();
}

[Fact]
public void CreateBuilder_Pass()
{
Expand DownExpand Up@@ -162,6 +222,28 @@ public void ParseAndNormalize_InvalidTag_ReturnsNull()
_ = result.Should().BeNull();
}

[Theory]
[InlineData("en-latn-us", "en-US")]
[InlineData("zh-cmn-Hans-CN", "cmn-Hans-CN")]
public void ParseAndNormalize_WithOptions_ValidTag_ReturnsNormalized(
string tag,
string expected
)
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize(tag, options);
_ = result.Should().NotBeNull();
_ = result!.ToString().Should().Be(expected);
}

[Fact]
public void ParseAndNormalize_WithOptions_InvalidTag_ReturnsNull()
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize("invalid-tag", options);
_ = result.Should().BeNull();
}

[Fact]
public void IsValid_Property_ValidTag_ReturnsTrue()
{
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Enhance documentation for JSON loading methods and add exception handling in Iso6392Data, Iso6393Data, and Rfc5646Data classes; add tests for LanguageTag parsing and normalization with options; implement logging options tests. by ptr727 · Pull Request #71 · ptr727/LanguageTags · GitHub
Skip to content
Merged
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
12 changes: 10 additions & 2 deletions LanguageTags/Iso6392Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-2 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>());

Expand All@@ -116,7 +120,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Iso6393Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-3 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>());

Expand All@@ -142,7 +146,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Rfc5646Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// Loads RFC 5646 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>());

Expand All@@ -98,7 +102,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>(options));

Expand Down
8 changes: 8 additions & 0 deletions LanguageTagsTests/Fixture.cs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
namespace ptr727.LanguageTags.Tests;

[CollectionDefinition("DisableParallelDefinition", DisableParallelization = true)]
[System.Diagnostics.CodeAnalysis.SuppressMessage(
"Maintainability",
"CA1515:Consider making public types internal",
Justification = "https://xunit.net/docs/running-tests-in-parallel"
)]
public sealed class DisableParallelDefinition { }

internal static class Fixture // : IDisposable
{
// public void Dispose() => GC.SuppressFinalize(this);
Expand Down
19 changes: 19 additions & 0 deletions LanguageTagsTests/LanguageTagBuilderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,25 @@ public void Normalize_Pass()
_ = languageTag.ToString().Should().Be("en-a-aaa-bbb-b-ccc-x-a-ccc");
}

[Fact]
public void Normalize_WithOptions_Pass()
{
Options options = new();

// en-Latn-GB-boont-r-extended-sequence-x-private
LanguageTag? languageTag = new LanguageTagBuilder()
.Language("en")
.Script("latn")
.Region("gb")
.VariantAdd("boont")
.ExtensionAdd('r', ["extended", "sequence"])
.PrivateUseAdd("private")
.Normalize(options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be("en-GB-boont-r-extended-sequence-x-private");
}

[Fact]
public void Build_Fail()
{
Expand Down
82 changes: 82 additions & 0 deletions LanguageTagsTests/LanguageTagTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,20 @@ public void Parse_Static_Pass(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
[InlineData("x-all-private")]
public void Parse_WithOptions_Pass(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -31,6 +45,21 @@ public void Parse_Static_ReturnsNull(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
public void Parse_WithOptions_ReturnsNull(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
Expand All@@ -44,6 +73,20 @@ public void TryParse_Success(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
public void TryParse_WithOptions_Success(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeTrue();
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -60,6 +103,23 @@ public void TryParse_Failure(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
[InlineData("x")] // Private missing
public void TryParse_WithOptions_Failure(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeFalse();
_ = languageTag.Should().BeNull();
}

[Fact]
public void CreateBuilder_Pass()
{
Expand DownExpand Up@@ -162,6 +222,28 @@ public void ParseAndNormalize_InvalidTag_ReturnsNull()
_ = result.Should().BeNull();
}

[Theory]
[InlineData("en-latn-us", "en-US")]
[InlineData("zh-cmn-Hans-CN", "cmn-Hans-CN")]
public void ParseAndNormalize_WithOptions_ValidTag_ReturnsNormalized(
string tag,
string expected
)
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize(tag, options);
_ = result.Should().NotBeNull();
_ = result!.ToString().Should().Be(expected);
}

[Fact]
public void ParseAndNormalize_WithOptions_InvalidTag_ReturnsNull()
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize("invalid-tag", options);
_ = result.Should().BeNull();
}

[Fact]
public void IsValid_Property_ValidTag_ReturnsTrue()
{
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Enhance documentation for JSON loading methods and add exception handling in Iso6392Data, Iso6393Data, and Rfc5646Data classes; add tests for LanguageTag parsing and normalization with options; implement logging options tests. by ptr727 · Pull Request #71 · ptr727/LanguageTags · GitHub
Skip to content
Merged
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
12 changes: 10 additions & 2 deletions LanguageTags/Iso6392Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-2 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>());

Expand All@@ -116,7 +120,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Iso6393Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-3 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>());

Expand All@@ -142,7 +146,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Rfc5646Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// Loads RFC 5646 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>());

Expand All@@ -98,7 +102,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>(options));

Expand Down
8 changes: 8 additions & 0 deletions LanguageTagsTests/Fixture.cs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
namespace ptr727.LanguageTags.Tests;

[CollectionDefinition("DisableParallelDefinition", DisableParallelization = true)]
[System.Diagnostics.CodeAnalysis.SuppressMessage(
"Maintainability",
"CA1515:Consider making public types internal",
Justification = "https://xunit.net/docs/running-tests-in-parallel"
)]
public sealed class DisableParallelDefinition { }

internal static class Fixture // : IDisposable
{
// public void Dispose() => GC.SuppressFinalize(this);
Expand Down
19 changes: 19 additions & 0 deletions LanguageTagsTests/LanguageTagBuilderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,25 @@ public void Normalize_Pass()
_ = languageTag.ToString().Should().Be("en-a-aaa-bbb-b-ccc-x-a-ccc");
}

[Fact]
public void Normalize_WithOptions_Pass()
{
Options options = new();

// en-Latn-GB-boont-r-extended-sequence-x-private
LanguageTag? languageTag = new LanguageTagBuilder()
.Language("en")
.Script("latn")
.Region("gb")
.VariantAdd("boont")
.ExtensionAdd('r', ["extended", "sequence"])
.PrivateUseAdd("private")
.Normalize(options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be("en-GB-boont-r-extended-sequence-x-private");
}

[Fact]
public void Build_Fail()
{
Expand Down
82 changes: 82 additions & 0 deletions LanguageTagsTests/LanguageTagTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,20 @@ public void Parse_Static_Pass(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
[InlineData("x-all-private")]
public void Parse_WithOptions_Pass(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -31,6 +45,21 @@ public void Parse_Static_ReturnsNull(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
public void Parse_WithOptions_ReturnsNull(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
Expand All@@ -44,6 +73,20 @@ public void TryParse_Success(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
public void TryParse_WithOptions_Success(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeTrue();
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -60,6 +103,23 @@ public void TryParse_Failure(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
[InlineData("x")] // Private missing
public void TryParse_WithOptions_Failure(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeFalse();
_ = languageTag.Should().BeNull();
}

[Fact]
public void CreateBuilder_Pass()
{
Expand DownExpand Up@@ -162,6 +222,28 @@ public void ParseAndNormalize_InvalidTag_ReturnsNull()
_ = result.Should().BeNull();
}

[Theory]
[InlineData("en-latn-us", "en-US")]
[InlineData("zh-cmn-Hans-CN", "cmn-Hans-CN")]
public void ParseAndNormalize_WithOptions_ValidTag_ReturnsNormalized(
string tag,
string expected
)
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize(tag, options);
_ = result.Should().NotBeNull();
_ = result!.ToString().Should().Be(expected);
}

[Fact]
public void ParseAndNormalize_WithOptions_InvalidTag_ReturnsNull()
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize("invalid-tag", options);
_ = result.Should().BeNull();
}

[Fact]
public void IsValid_Property_ValidTag_ReturnsTrue()
{
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Enhance documentation for JSON loading methods and add exception handling in Iso6392Data, Iso6393Data, and Rfc5646Data classes; add tests for LanguageTag parsing and normalization with options; implement logging options tests. by ptr727 · Pull Request #71 · ptr727/LanguageTags · GitHub
Skip to content
Merged
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
12 changes: 10 additions & 2 deletions LanguageTags/Iso6392Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-2 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>());

Expand All@@ -116,7 +120,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Iso6393Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-3 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>());

Expand All@@ -142,7 +146,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Rfc5646Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// Loads RFC 5646 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>());

Expand All@@ -98,7 +102,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>(options));

Expand Down
8 changes: 8 additions & 0 deletions LanguageTagsTests/Fixture.cs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
namespace ptr727.LanguageTags.Tests;

[CollectionDefinition("DisableParallelDefinition", DisableParallelization = true)]
[System.Diagnostics.CodeAnalysis.SuppressMessage(
"Maintainability",
"CA1515:Consider making public types internal",
Justification = "https://xunit.net/docs/running-tests-in-parallel"
)]
public sealed class DisableParallelDefinition { }

internal static class Fixture // : IDisposable
{
// public void Dispose() => GC.SuppressFinalize(this);
Expand Down
19 changes: 19 additions & 0 deletions LanguageTagsTests/LanguageTagBuilderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,25 @@ public void Normalize_Pass()
_ = languageTag.ToString().Should().Be("en-a-aaa-bbb-b-ccc-x-a-ccc");
}

[Fact]
public void Normalize_WithOptions_Pass()
{
Options options = new();

// en-Latn-GB-boont-r-extended-sequence-x-private
LanguageTag? languageTag = new LanguageTagBuilder()
.Language("en")
.Script("latn")
.Region("gb")
.VariantAdd("boont")
.ExtensionAdd('r', ["extended", "sequence"])
.PrivateUseAdd("private")
.Normalize(options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be("en-GB-boont-r-extended-sequence-x-private");
}

[Fact]
public void Build_Fail()
{
Expand Down
82 changes: 82 additions & 0 deletions LanguageTagsTests/LanguageTagTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,20 @@ public void Parse_Static_Pass(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
[InlineData("x-all-private")]
public void Parse_WithOptions_Pass(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -31,6 +45,21 @@ public void Parse_Static_ReturnsNull(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
public void Parse_WithOptions_ReturnsNull(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
Expand All@@ -44,6 +73,20 @@ public void TryParse_Success(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
public void TryParse_WithOptions_Success(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeTrue();
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -60,6 +103,23 @@ public void TryParse_Failure(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
[InlineData("x")] // Private missing
public void TryParse_WithOptions_Failure(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeFalse();
_ = languageTag.Should().BeNull();
}

[Fact]
public void CreateBuilder_Pass()
{
Expand DownExpand Up@@ -162,6 +222,28 @@ public void ParseAndNormalize_InvalidTag_ReturnsNull()
_ = result.Should().BeNull();
}

[Theory]
[InlineData("en-latn-us", "en-US")]
[InlineData("zh-cmn-Hans-CN", "cmn-Hans-CN")]
public void ParseAndNormalize_WithOptions_ValidTag_ReturnsNormalized(
string tag,
string expected
)
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize(tag, options);
_ = result.Should().NotBeNull();
_ = result!.ToString().Should().Be(expected);
}

[Fact]
public void ParseAndNormalize_WithOptions_InvalidTag_ReturnsNull()
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize("invalid-tag", options);
_ = result.Should().BeNull();
}

[Fact]
public void IsValid_Property_ValidTag_ReturnsTrue()
{
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Enhance documentation for JSON loading methods and add exception handling in Iso6392Data, Iso6393Data, and Rfc5646Data classes; add tests for LanguageTag parsing and normalization with options; implement logging options tests. by ptr727 · Pull Request #71 · ptr727/LanguageTags · GitHub
Skip to content
Merged
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
12 changes: 10 additions & 2 deletions LanguageTags/Iso6392Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-2 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>());

Expand All@@ -116,7 +120,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Iso6393Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-3 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>());

Expand All@@ -142,7 +146,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Rfc5646Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// Loads RFC 5646 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>());

Expand All@@ -98,7 +102,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>(options));

Expand Down
8 changes: 8 additions & 0 deletions LanguageTagsTests/Fixture.cs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
namespace ptr727.LanguageTags.Tests;

[CollectionDefinition("DisableParallelDefinition", DisableParallelization = true)]
[System.Diagnostics.CodeAnalysis.SuppressMessage(
"Maintainability",
"CA1515:Consider making public types internal",
Justification = "https://xunit.net/docs/running-tests-in-parallel"
)]
public sealed class DisableParallelDefinition { }

internal static class Fixture // : IDisposable
{
// public void Dispose() => GC.SuppressFinalize(this);
Expand Down
19 changes: 19 additions & 0 deletions LanguageTagsTests/LanguageTagBuilderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,25 @@ public void Normalize_Pass()
_ = languageTag.ToString().Should().Be("en-a-aaa-bbb-b-ccc-x-a-ccc");
}

[Fact]
public void Normalize_WithOptions_Pass()
{
Options options = new();

// en-Latn-GB-boont-r-extended-sequence-x-private
LanguageTag? languageTag = new LanguageTagBuilder()
.Language("en")
.Script("latn")
.Region("gb")
.VariantAdd("boont")
.ExtensionAdd('r', ["extended", "sequence"])
.PrivateUseAdd("private")
.Normalize(options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be("en-GB-boont-r-extended-sequence-x-private");
}

[Fact]
public void Build_Fail()
{
Expand Down
82 changes: 82 additions & 0 deletions LanguageTagsTests/LanguageTagTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,20 @@ public void Parse_Static_Pass(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
[InlineData("x-all-private")]
public void Parse_WithOptions_Pass(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -31,6 +45,21 @@ public void Parse_Static_ReturnsNull(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
public void Parse_WithOptions_ReturnsNull(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
Expand All@@ -44,6 +73,20 @@ public void TryParse_Success(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
public void TryParse_WithOptions_Success(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeTrue();
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -60,6 +103,23 @@ public void TryParse_Failure(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
[InlineData("x")] // Private missing
public void TryParse_WithOptions_Failure(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeFalse();
_ = languageTag.Should().BeNull();
}

[Fact]
public void CreateBuilder_Pass()
{
Expand DownExpand Up@@ -162,6 +222,28 @@ public void ParseAndNormalize_InvalidTag_ReturnsNull()
_ = result.Should().BeNull();
}

[Theory]
[InlineData("en-latn-us", "en-US")]
[InlineData("zh-cmn-Hans-CN", "cmn-Hans-CN")]
public void ParseAndNormalize_WithOptions_ValidTag_ReturnsNormalized(
string tag,
string expected
)
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize(tag, options);
_ = result.Should().NotBeNull();
_ = result!.ToString().Should().Be(expected);
}

[Fact]
public void ParseAndNormalize_WithOptions_InvalidTag_ReturnsNull()
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize("invalid-tag", options);
_ = result.Should().BeNull();
}

[Fact]
public void IsValid_Property_ValidTag_ReturnsTrue()
{
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Enhance documentation for JSON loading methods and add exception handling in Iso6392Data, Iso6393Data, and Rfc5646Data classes; add tests for LanguageTag parsing and normalization with options; implement logging options tests. by ptr727 · Pull Request #71 · ptr727/LanguageTags · GitHub
Skip to content
Merged
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
12 changes: 10 additions & 2 deletions LanguageTags/Iso6392Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,7 +107,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-2 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>());

Expand All@@ -116,7 +120,11 @@ private static async Task<Iso6392Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6392Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6392Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6392Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6392Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Iso6393Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// Loads ISO 639-3 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>());

Expand All@@ -142,7 +146,11 @@ private static async Task<Iso6393Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Iso6393Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Iso6393Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Iso6393Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Iso6393Data>(options));

Expand Down
12 changes: 10 additions & 2 deletions LanguageTags/Rfc5646Data.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// Loads RFC 5646 data from a JSON file asynchronously.
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>());

Expand All@@ -98,7 +102,11 @@ private static async Task<Rfc5646Data> LoadDataAsync(string fileName, ILogger lo
/// </summary>
/// <param name="fileName">The path to the JSON file.</param>
/// <param name="options">The options used to configure logging.</param>
/// <returns>The loaded <see cref="Rfc5646Data"/> or null if deserialization fails.</returns>
/// <returns>
/// The loaded <see cref="Rfc5646Data"/>, or null when deserialization yields no data.
/// </returns>
/// <exception cref="IOException">Thrown when the file cannot be read.</exception>
/// <exception cref="JsonException">Thrown when the JSON is invalid.</exception>
public static Task<Rfc5646Data?> LoadJsonAsync(string fileName, Options? options) =>
LoadJsonAsync(fileName, LogOptions.CreateLogger<Rfc5646Data>(options));

Expand Down
8 changes: 8 additions & 0 deletions LanguageTagsTests/Fixture.cs
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
namespace ptr727.LanguageTags.Tests;

[CollectionDefinition("DisableParallelDefinition", DisableParallelization = true)]
[System.Diagnostics.CodeAnalysis.SuppressMessage(
"Maintainability",
"CA1515:Consider making public types internal",
Justification = "https://xunit.net/docs/running-tests-in-parallel"
)]
public sealed class DisableParallelDefinition { }

internal static class Fixture // : IDisposable
{
// public void Dispose() => GC.SuppressFinalize(this);
Expand Down
19 changes: 19 additions & 0 deletions LanguageTagsTests/LanguageTagBuilderTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,25 @@ public void Normalize_Pass()
_ = languageTag.ToString().Should().Be("en-a-aaa-bbb-b-ccc-x-a-ccc");
}

[Fact]
public void Normalize_WithOptions_Pass()
{
Options options = new();

// en-Latn-GB-boont-r-extended-sequence-x-private
LanguageTag? languageTag = new LanguageTagBuilder()
.Language("en")
.Script("latn")
.Region("gb")
.VariantAdd("boont")
.ExtensionAdd('r', ["extended", "sequence"])
.PrivateUseAdd("private")
.Normalize(options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be("en-GB-boont-r-extended-sequence-x-private");
}

[Fact]
public void Build_Fail()
{
Expand Down
82 changes: 82 additions & 0 deletions LanguageTagsTests/LanguageTagTests.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,20 @@ public void Parse_Static_Pass(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
[InlineData("x-all-private")]
public void Parse_WithOptions_Pass(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -31,6 +45,21 @@ public void Parse_Static_ReturnsNull(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
public void Parse_WithOptions_ReturnsNull(string tag)
{
Options options = new();
LanguageTag? languageTag = LanguageTag.Parse(tag, options);
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
Expand All@@ -44,6 +73,20 @@ public void TryParse_Success(string tag)
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("en-US")]
[InlineData("zh-Hans-CN")]
[InlineData("en-latn-gb-boont-r-extended-sequence-x-private")]
public void TryParse_WithOptions_Success(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeTrue();
_ = languageTag.Should().NotBeNull();
_ = languageTag!.Validate().Should().BeTrue();
_ = languageTag.ToString().Should().Be(tag);
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
Expand All@@ -60,6 +103,23 @@ public void TryParse_Failure(string tag)
_ = languageTag.Should().BeNull();
}

[Theory]
[InlineData("")] // Empty string
[InlineData("i")] // Too short
[InlineData("abcdefghi")] // Too long
[InlineData("en--gb")] // Empty tag
[InlineData("en-€-extension")] // Non-ASCII
[InlineData("a-extension")] // Only start with x or grandfathered
[InlineData("en-gb-x")] // Private must have parts
[InlineData("x")] // Private missing
public void TryParse_WithOptions_Failure(string tag)
{
Options options = new();
bool result = LanguageTag.TryParse(tag, out LanguageTag? languageTag, options);
_ = result.Should().BeFalse();
_ = languageTag.Should().BeNull();
}

[Fact]
public void CreateBuilder_Pass()
{
Expand DownExpand Up@@ -162,6 +222,28 @@ public void ParseAndNormalize_InvalidTag_ReturnsNull()
_ = result.Should().BeNull();
}

[Theory]
[InlineData("en-latn-us", "en-US")]
[InlineData("zh-cmn-Hans-CN", "cmn-Hans-CN")]
public void ParseAndNormalize_WithOptions_ValidTag_ReturnsNormalized(
string tag,
string expected
)
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize(tag, options);
_ = result.Should().NotBeNull();
_ = result!.ToString().Should().Be(expected);
}

[Fact]
public void ParseAndNormalize_WithOptions_InvalidTag_ReturnsNull()
{
Options options = new();
LanguageTag? result = LanguageTag.ParseAndNormalize("invalid-tag", options);
_ = result.Should().BeNull();
}

[Fact]
public void IsValid_Property_ValidTag_ReturnsTrue()
{
Expand Down
Loading
Loading