Skip to content

Commit 646866e

Browse files
caguiclajmgcaguiclajmg
committed
test: use correct converter implementations
1 parent 069c9f4 commit 646866e

File tree

5 files changed

+58
-55
lines changed

5 files changed

+58
-55
lines changed

‎src/WanaKanaSharp.Test/KunreiConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace WanaKanaSharp.Test;
77
[TestFixture]
88
public class KunreiConverterTests
99
{
10-
private readonly HepburnConverter _converter = new();
10+
private readonly KunreiConverter _converter = new();
1111

1212
[TestCase(null, ExpectedResult = "")]
1313
[TestCase("", ExpectedResult = "")]

‎src/WanaKanaSharp.Test/NihonConverterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace WanaKanaSharp.Test;
77
[TestFixture]
88
public class NihonConverterTests
99
{
10-
private readonly HepburnConverter _converter = new();
10+
private readonly NihonConverter _converter = new();
1111

1212
[TestCase(null, ExpectedResult = "")]
1313
[TestCase("", ExpectedResult = "")]
@@ -38,7 +38,7 @@ public class NihonConverterTests
3838
[TestCase("ぉ", ExpectedResult = "o")]
3939
[TestCase("おんよみ", ExpectedResult = "on'yomi")]
4040
[TestCase("んよ んあ んゆ", ExpectedResult = "n'yo n'a n'yu")]
41-
[TestCase("シンヨ", ExpectedResult = "shin'yo")]
41+
[TestCase("シンヨ", ExpectedResult = "sin'yo")]
4242
[TestCase("ふフ", ExpectedResult = "huhu")]
4343
[TestCase("ふとん", ExpectedResult = "huton")]
4444
[TestCase("フリー", ExpectedResult = "hurii")]

‎src/WanaKanaSharp.Test/WapuroConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace WanaKanaSharp.Test;
3434
[TestFixture]
3535
public class WapuroConverterTests
3636
{
37-
private readonly HepburnConverter _converter = new();
37+
private readonly WapuroConverter _converter = new();
3838

3939
[TestCase(null, ExpectedResult = "")]
4040
[TestCase("", ExpectedResult = "")]

‎src/WanaKanaSharp/Converters/NihonConverter.cs

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,26 @@ private void BuildHiraganaTree(MyTrie trie)
1111
var romajiTrie = new MyInMemoryTrie();
1212
var root = romajiTrie.Root;
1313

14-
root.Insert(('あ', "a"), ('い', "i"), ('う', "u"), ('え', "e"), ('お', "o"),
15-
('か', "ka"), ('き', "ki"), ('く', "ku"), ('け', "ke"), ('こ', "ko"),
16-
('さ', "sa"), ('し', "si"), ('す', "su"), ('せ', "se"), ('そ', "so"),
17-
('た', "ta"), ('ち', "ti"), ('つ', "tu"), ('て', "te"), ('と', "to"),
18-
('な', "na"), ('に', "ni"), ('ぬ', "nu"), ('ね', "ne"), ('の', "no"),
19-
('は', "ha"), ('ひ', "hi"), ('ふ', "hu"), ('へ', "he"), ('ほ', "ho"),
20-
('ま', "ma"), ('み', "mi"), ('む', "mu"), ('め', "me"), ('も', "mo"),
21-
('や', "ya"), ('ゆ', "yu"), ('よ', "yo"),
22-
('ら', "ra"), ('り', "ri"), ('る', "ru"), ('れ', "re"), ('ろ', "ro"),
23-
('わ', "wa"), ('を', "wo"),
24-
('ん', "n"),
25-
('が', "ga"), ('ぎ', "gi"), ('ぐ', "gu"), ('げ', "ge"), ('ご', "go"),
26-
('ざ', "za"), ('じ', "zy"), ('ず', "zu"), ('ぜ', "ze"), ('ぞ', "zo"),
27-
('だ', "da"), ('ぢ', "ji"), ('づ', "zu"), ('で', "de"), ('ど', "do"),
28-
('ば', "ba"), ('び', "bi"), ('ぶ', "bu"), ('べ', "be"), ('ぼ', "bo"),
29-
('ぱ', "pa"), ('ぴ', "pi"), ('ぷ', "pu"), ('ぺ', "pe"), ('ぽ', "po"),
30-
('ぁ', "a"), ('ぃ', "i"), ('ぅ', "u"), ('ぇ', "e"), ('ぉ', "o"),
31-
('ゃ', "ya"), ('ゅ', "yu"), ('ょ', "yo"));
14+
root.Insert(
15+
('あ', "a"), ('い', "i"), ('う', "u"), ('え', "e"), ('お', "o"),
16+
('か', "ka"), ('き', "ki"), ('く', "ku"), ('け', "ke"), ('こ', "ko"),
17+
('さ', "sa"), ('し', "si"), ('す', "su"), ('せ', "se"), ('そ', "so"),
18+
('た', "ta"), ('ち', "ti"), ('つ', "tu"), ('て', "te"), ('と', "to"),
19+
('な', "na"), ('に', "ni"), ('ぬ', "nu"), ('ね', "ne"), ('の', "no"),
20+
('は', "ha"), ('ひ', "hi"), ('ふ', "hu"), ('へ', "he"), ('ほ', "ho"),
21+
('ま', "ma"), ('み', "mi"), ('む', "mu"), ('め', "me"), ('も', "mo"),
22+
('や', "ya"), ('ゆ', "yu"), ('よ', "yo"),
23+
('ら', "ra"), ('り', "ri"), ('る', "ru"), ('れ', "re"), ('ろ', "ro"),
24+
('わ', "wa"), ('を', "wo"),
25+
('ん', "n"),
26+
('が', "ga"), ('ぎ', "gi"), ('ぐ', "gu"), ('げ', "ge"), ('ご', "go"),
27+
('ざ', "za"), ('じ', "zy"), ('ず', "zu"), ('ぜ', "ze"), ('ぞ', "zo"),
28+
('だ', "da"), ('ぢ', "ji"), ('づ', "zu"), ('で', "de"), ('ど', "do"),
29+
('ば', "ba"), ('び', "bi"), ('ぶ', "bu"), ('べ', "be"), ('ぼ', "bo"),
30+
('ぱ', "pa"), ('ぴ', "pi"), ('ぷ', "pu"), ('ぺ', "pe"), ('ぽ', "po"),
31+
('ぁ', "a"), ('ぃ', "i"), ('ぅ', "u"), ('ぇ', "e"), ('ぉ', "o"),
32+
('ゃ', "ya"), ('ゅ', "yu"), ('ょ', "yo")
33+
);
3234

3335
{
3436
var whitelist = new[] { 'き', 'に', 'ひ', 'み', 'り', 'ぎ', 'び', 'ぴ' };
@@ -84,13 +86,13 @@ private void BuildHiraganaTree(MyTrie trie)
8486
var sokuon = root.Insert(('っ', ""));
8587
var exceptions = new[]
8688
{
87-
'あ', 'い', 'う', 'え', 'お',
88-
'や', 'ゆ', 'よ',
89-
'ん',
90-
'ぁ', 'ぃ', 'ぅ', 'ぇ', 'ぉ',
91-
'ゃ', 'ゅ', 'ょ',
92-
'っ'
93-
};
89+
'あ', 'い', 'う', 'え', 'お',
90+
'や', 'ゆ', 'よ',
91+
'ん',
92+
'ぁ', 'ぃ', 'ぅ', 'ぇ', 'ぉ',
93+
'ゃ', 'ゅ', 'ょ',
94+
'っ'
95+
};
9496

9597
foreach (var child in root.Where((node) => !exceptions.Contains(node.Key)))
9698
{
@@ -120,24 +122,26 @@ private void BuildKatakanaTree(MyTrie trie)
120122
var romajiTrie = new MyInMemoryTrie();
121123
var root = romajiTrie.Root;
122124

123-
root.Insert(('ア', "a"), ('イ', "i"), ('ウ', "u"), ('エ', "e"), ('オ', "o"),
124-
('カ', "ka"), ('キ', "ki"), ('ク', "ku"), ('ケ', "ke"), ('コ', "ko"),
125-
('サ', "sa"), ('シ', "shi"), ('ス', "su"), ('セ', "se"), ('ソ', "so"),
126-
('タ', "ta"), ('チ', "chi"), ('ツ', "tsu"), ('テ', "te"), ('ト', "to"),
127-
('ナ', "na"), ('ニ', "ni"), ('ヌ', "nu"), ('ネ', "ne"), ('ノ', "no"),
128-
('ハ', "ha"), ('ヒ', "hi"), ('フ', "hu"), ('ヘ', "he"), ('ホ', "ho"),
129-
('マ', "ma"), ('ミ', "mi"), ('ム', "mu"), ('メ', "me"), ('モ', "mo"),
130-
('ヤ', "ya"), ('ユ', "yu"), ('ヨ', "yo"),
131-
('ラ', "ra"), ('リ', "ri"), ('ル', "ru"), ('レ', "re"), ('ロ', "ro"),
132-
('ワ', "wa"), ('ヲ', "wo"),
133-
('ン', "n"),
134-
('ガ', "ga"), ('ギ', "gi"), ('グ', "gu"), ('ゲ', "ge"), ('ゴ', "go"),
135-
('ザ', "za"), ('ジ', "ji"), ('ズ', "zu"), ('ゼ', "ze"), ('ゾ', "zo"),
136-
('ダ', "da"), ('ヂ', "ji"), ('ヅ', "zu"), ('デ', "de"), ('ド', "do"),
137-
('バ', "ba"), ('ビ', "bi"), ('ブ', "bu"), ('ベ', "be"), ('ボ', "bo"),
138-
('パ', "pa"), ('ピ', "pi"), ('プ', "pu"), ('ペ', "pe"), ('ポ', "po"),
139-
('ァ', "a"), ('ィ', "i"), ('ゥ', "u"), ('ェ', "e"), ('ォ', "o"),
140-
('ャ', "ya"), ('ュ', "yu"), ('ョ', "yo"));
125+
root.Insert(
126+
('ア', "a"), ('イ', "i"), ('ウ', "u"), ('エ', "e"), ('オ', "o"),
127+
('カ', "ka"), ('キ', "ki"), ('ク', "ku"), ('ケ', "ke"), ('コ', "ko"),
128+
('サ', "sa"), ('シ', "si"), ('ス', "su"), ('セ', "se"), ('ソ', "so"),
129+
('タ', "ta"), ('チ', "ti"), ('ツ', "tu"), ('テ', "te"), ('ト', "to"),
130+
('ナ', "na"), ('ニ', "ni"), ('ヌ', "nu"), ('ネ', "ne"), ('ノ', "no"),
131+
('ハ', "ha"), ('ヒ', "hi"), ('フ', "hu"), ('ヘ', "he"), ('ホ', "ho"),
132+
('マ', "ma"), ('ミ', "mi"), ('ム', "mu"), ('メ', "me"), ('モ', "mo"),
133+
('ヤ', "ya"), ('ユ', "yu"), ('ヨ', "yo"),
134+
('ラ', "ra"), ('リ', "ri"), ('ル', "ru"), ('レ', "re"), ('ロ', "ro"),
135+
('ワ', "wa"), ('ヲ', "wo"),
136+
('ン', "n"),
137+
('ガ', "ga"), ('ギ', "gi"), ('グ', "gu"), ('ゲ', "ge"), ('ゴ', "go"),
138+
('ザ', "za"), ('ジ', "ji"), ('ズ', "zu"), ('ゼ', "ze"), ('ゾ', "zo"),
139+
('ダ', "da"), ('ヂ', "ji"), ('ヅ', "zu"), ('デ', "de"), ('ド', "do"),
140+
('バ', "ba"), ('ビ', "bi"), ('ブ', "bu"), ('ベ', "be"), ('ボ', "bo"),
141+
('パ', "pa"), ('ピ', "pi"), ('プ', "pu"), ('ペ', "pe"), ('ポ', "po"),
142+
('ァ', "a"), ('ィ', "i"), ('ゥ', "u"), ('ェ', "e"), ('ォ', "o"),
143+
('ャ', "ya"), ('ュ', "yu"), ('ョ', "yo")
144+
);
141145

142146
{
143147
var whitelist = new[] { 'キ', 'ニ', 'ヒ', 'ミ', 'リ', 'ギ', 'ビ', 'ピ' };
@@ -193,13 +197,13 @@ private void BuildKatakanaTree(MyTrie trie)
193197
var sokuon = root.Insert(('ッ', ""));
194198
var exceptions = new[]
195199
{
196-
'ア', 'イ', 'ウ', 'エ', 'オ',
197-
'ヤ', 'ユ', 'ヨ',
198-
'ン',
199-
'ァ', 'ィ', 'ゥ', 'ェ', 'ォ',
200-
'ャ', 'ュ', 'ョ',
201-
'ッ'
202-
};
200+
'ア', 'イ', 'ウ', 'エ', 'オ',
201+
'ヤ', 'ユ', 'ヨ',
202+
'ン',
203+
'ァ', 'ィ', 'ゥ', 'ェ', 'ォ',
204+
'ャ', 'ュ', 'ョ',
205+
'ッ'
206+
};
203207

204208
foreach (var child in root.Where((node) => !exceptions.Contains(node.Key)))
205209
{

‎src/WanaKanaSharp/WanaKanaSharp.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,5 @@
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>
38-
<PackageReference Include="System.Text.Json" Version="9.0.3" />
3938
</ItemGroup>
4039
</Project>

0 commit comments

Comments
 (0)