|
-`testPluralizesAndSingularizesCommonWords`
+- [x] `testPluralizesAndSingularizesCommonWords` — Implemented in `Tests/QizhKitTests/PluralizeTests.swift`. Verifies regular and irregular word pluralization/singularization including common words, Latin/Greek endings, and the `count`/`with` parameters.
|
Check irregular and regular transformations for representative samples
@@ -468,7 +468,7 @@ Check irregular and regular transformations for representative samples
|
|
-`testHonorsUncountableAndUnchangingLists`
+- [x] `testHonorsUncountableAndUnchangingLists` — Implemented in `Tests/QizhKitTests/PluralizeTests.swift`. Validates that uncountable words (information, equipment, etc.) and unchanging words (sheep, deer, etc.) remain unchanged when pluralized/singularized.
|
Confirm words in those collections return unchanged results
@@ -476,7 +476,7 @@ Confirm words in those collections return unchanged results
|
|
-`testAddsRuntimeRules`
+- [x] `testAddsRuntimeRules` — Implemented in `Tests/QizhKitTests/PluralizeTests.swift`. Verifies that dynamically added plural/singular rules via `Pluralize.rule()`, `Pluralize.singularRule()`, `Pluralize.uncountable()`, and `Pluralize.unchanging()` are applied correctly.
|
Ensure dynamically added plural/singular rules apply ahead of defaults
diff --git a/Tests/QizhKitTests/PluralizeTests.swift b/Tests/QizhKitTests/PluralizeTests.swift
new file mode 100644
index 0000000..d71587d
--- /dev/null
+++ b/Tests/QizhKitTests/PluralizeTests.swift
@@ -0,0 +1,152 @@
+//
+// PluralizeTests.swift
+// QizhKit
+//
+// Created by GitHub Copilot on 06.12.2025.
+//
+
+import Testing
+@testable import QizhKit
+
+/// Tests for the Pluralize class and String pluralization extensions.
+/// Validates plural/singular transformations, uncountable/unchanging word handling,
+/// and dynamic rule additions.
+@Suite("Pluralize tests")
+struct PluralizeTests {
+
+ // MARK: - testPluralizesAndSingularizesCommonWords
+
+ /// Verifies that common words are correctly pluralized and singularized,
+ /// including both regular and irregular transformations.
+ @Test func testPluralizesAndSingularizesCommonWords() async throws {
+ // Regular pluralization rules
+ #expect("cat".pluralize() == "cats")
+ #expect("dog".pluralize() == "dogs")
+ #expect("house".pluralize() == "houses")
+
+ // Words ending in 'y' preceded by consonant -> 'ies'
+ #expect("city".pluralize() == "cities")
+ #expect("baby".pluralize() == "babies")
+ #expect("party".pluralize() == "parties")
+
+ // Words ending in 'x' -> 'xes'
+ #expect("box".pluralize() == "boxes")
+ #expect("tax".pluralize() == "taxes")
+
+ // Words ending in 'sh', 'ss', 'zz' -> 'es'
+ #expect("wish".pluralize() == "wishes")
+ #expect("class".pluralize() == "classes")
+ #expect("buzz".pluralize() == "buzzes")
+
+ // Words ending in 'ch' -> 'ches'
+ #expect("watch".pluralize() == "watches")
+ #expect("church".pluralize() == "churches")
+
+ // Irregular plurals
+ #expect("tooth".pluralize() == "teeth")
+ #expect("foot".pluralize() == "feet")
+ #expect("goose".pluralize() == "geese")
+ #expect("mouse".pluralize() == "mice")
+ #expect("child".pluralize() == "children")
+ #expect("person".pluralize() == "people")
+ #expect("man".pluralize() == "men")
+ #expect("woman".pluralize() == "women")
+ #expect("ox".pluralize() == "oxen")
+
+ // Words ending in 'f' or 'fe' -> 'ves'
+ #expect("knife".pluralize() == "knives")
+ #expect("wolf".pluralize() == "wolves")
+ #expect("leaf".pluralize() == "leaves")
+ #expect("thief".pluralize() == "thieves")
+
+ // Latin/Greek endings
+ #expect("cactus".pluralize() == "cacti")
+ #expect("nucleus".pluralize() == "nuclei")
+ #expect("fungus".pluralize() == "fungi")
+ #expect("criterion".pluralize() == "criteria")
+ #expect("phenomenon".pluralize() == "phenomena")
+
+ // Singularization tests
+ #expect("cats".singularize() == "cat")
+ #expect("dogs".singularize() == "dog")
+ #expect("cities".singularize() == "city")
+ #expect("boxes".singularize() == "box")
+ #expect("wishes".singularize() == "wish")
+ #expect("watches".singularize() == "watch")
+ #expect("analyses".singularize() == "analysis")
+ #expect("diagnoses".singularize() == "diagnosis")
+
+ // Count parameter tests
+ #expect("cat".pluralize(count: 1) == "cat")
+ #expect("cat".pluralize(count: 2) == "cats")
+ #expect("cat".pluralize(count: 0) == "cats")
+
+ // Custom plural with 'with' parameter
+ #expect("person".pluralize(count: 2, with: "persons") == "persons")
+ }
+
+ // MARK: - testHonorsUncountableAndUnchangingLists
+
+ /// Verifies that uncountable and unchanging words remain unchanged
+ /// when pluralized or singularized.
+ @Test func testHonorsUncountableAndUnchangingLists() async throws {
+ // Uncountable words should not change
+ #expect("information".pluralize() == "information")
+ #expect("equipment".pluralize() == "equipment")
+ #expect("news".pluralize() == "news")
+ #expect("money".pluralize() == "money")
+ #expect("rice".pluralize() == "rice")
+ #expect("music".pluralize() == "music")
+ #expect("furniture".pluralize() == "furniture")
+ #expect("luggage".pluralize() == "luggage")
+ #expect("advice".pluralize() == "advice")
+ #expect("traffic".pluralize() == "traffic")
+ #expect("software".pluralize() == "software")
+ #expect("research".pluralize() == "research")
+ #expect("knowledge".pluralize() == "knowledge")
+ #expect("education".pluralize() == "education")
+
+ // Unchanging words (same in singular and plural)
+ #expect("sheep".pluralize() == "sheep")
+ #expect("deer".pluralize() == "deer")
+ #expect("moose".pluralize() == "moose")
+ #expect("swine".pluralize() == "swine")
+ #expect("bison".pluralize() == "bison")
+ #expect("corps".pluralize() == "corps")
+ #expect("means".pluralize() == "means")
+ #expect("series".pluralize() == "series")
+ #expect("scissors".pluralize() == "scissors")
+ #expect("species".pluralize() == "species")
+
+ // Uncountable singularization should also return unchanged
+ #expect("information".singularize() == "information")
+ #expect("sheep".singularize() == "sheep")
+
+ // Empty string should return unchanged
+ #expect("".pluralize() == "")
+ #expect("".singularize() == "")
+ }
+
+ // MARK: - testAddsRuntimeRules
+
+ /// Verifies that dynamically added plural and singular rules
+ /// are applied ahead of default rules.
+ @Test func testAddsRuntimeRules() async throws {
+ // Add a custom plural rule for a made-up pattern
+ // Note: Rules are added to the front of the list, so they take precedence
+ Pluralize.rule(rule: "zoon$", with: "$1zoa")
+ #expect("protozoon".pluralize() == "protozoa")
+
+ // Add a custom singular rule
+ Pluralize.singularRule(rule: "zoa$", with: "zoon")
+ #expect("protozoa".singularize() == "protozoon")
+
+ // Add a custom uncountable word
+ Pluralize.uncountable(word: "customword")
+ #expect("customword".pluralize() == "customword")
+
+ // Add a custom unchanging word
+ Pluralize.unchanging(word: "unchangingtest")
+ #expect("unchangingtest".pluralize() == "unchangingtest")
+ }
+}
From e9cc624d7b5555d4b018d9543df904a6a2fc0e64 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 6 Dec 2025 01:13:38 +0000
Subject: [PATCH 3/3] Fix regex patterns in testAddsRuntimeRules to use proper
capturing groups
Co-authored-by: qizh <941415+qizh@users.noreply.github.com>
---
Tests/QizhKitTests/PluralizeTests.swift | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Tests/QizhKitTests/PluralizeTests.swift b/Tests/QizhKitTests/PluralizeTests.swift
index d71587d..540610f 100644
--- a/Tests/QizhKitTests/PluralizeTests.swift
+++ b/Tests/QizhKitTests/PluralizeTests.swift
@@ -134,11 +134,12 @@ struct PluralizeTests {
@Test func testAddsRuntimeRules() async throws {
// Add a custom plural rule for a made-up pattern
// Note: Rules are added to the front of the list, so they take precedence
- Pluralize.rule(rule: "zoon$", with: "$1zoa")
+ // The pattern uses a capturing group for the prefix
+ Pluralize.rule(rule: "(proto)zoon$", with: "$1zoa")
#expect("protozoon".pluralize() == "protozoa")
// Add a custom singular rule
- Pluralize.singularRule(rule: "zoa$", with: "zoon")
+ Pluralize.singularRule(rule: "(proto)zoa$", with: "$1zoon")
#expect("protozoa".singularize() == "protozoon")
// Add a custom uncountable word
|