Skip to content

Commit

Permalink
#72 Fix up issues on the unit test project
Browse files Browse the repository at this point in the history
  • Loading branch information
@colinangusmackay
colinangusmackay committed Jan 9, 2021
1 parent 9aebbdd commit 350dafb
Show file tree
Hide file tree
Showing 20 changed files with 457 additions and 432 deletions.
5 changes: 2 additions & 3 deletions src/.idea/.idea.Gedcom/.idea/contentModel.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/Stravaig.FamilyTree.Standardiser.UnitTests/FileNamerTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Globalization;
using System.IO;
using NUnit.Framework;
using Shouldly;

Expand Down
1 change: 0 additions & 1 deletion src/Stravaig.FamilyTreeGenerator/Services/FileNamer.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using Stravaig.FamilyTree.Common.Extensions;
Expand Down
158 changes: 81 additions & 77 deletions src/Stravaig.Gedcom.UnitTests/Extensions/CharExtensions_Data.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,86 +2,90 @@

namespace Stravaig.Gedcom.UnitTests.Extensions
{
public class CharExtensions_Data
// ReSharper disable once InconsistentNaming
public partial class CharExtensionsTests
{
public static IEnumerable<char> ValidAnselCharacters()
public class Data
{
// A0 - AF range
yield return (char)0x0141; // Ł
yield return (char)0x00D8; // Ø
yield return (char)0x0110; // Đ
yield return (char)0x00DE; // Þ
yield return (char)0x00C6; // Æ
yield return (char)0x0152; // Œ
yield return (char)0x02B9; // ʹ
yield return (char)0x00B7; // ·
yield return (char)0x226D; // ♭
yield return (char)0x00AE; // ®
yield return (char)0x00B1; // ±
yield return (char)0x01A0; // Ơ
yield return (char)0x01AF; // Ư
yield return (char)0x02BC; // ʼ
public static IEnumerable<char> ValidAnselCharacters()
{
// A0 - AF range
yield return (char) 0x0141; // Ł
yield return (char) 0x00D8; // Ø
yield return (char) 0x0110; // Đ
yield return (char) 0x00DE; // Þ
yield return (char) 0x00C6; // Æ
yield return (char) 0x0152; // Œ
yield return (char) 0x02B9; // ʹ
yield return (char) 0x00B7; // ·
yield return (char) 0x226D; // ♭
yield return (char) 0x00AE; // ®
yield return (char) 0x00B1; // ±
yield return (char) 0x01A0; // Ơ
yield return (char) 0x01AF; // Ư
yield return (char) 0x02BC; // ʼ

yield return (char)0x02BB; // ʻ
yield return (char)0x0142; // ł
yield return (char)0x00F8; // ø
yield return (char)0x0111; // đ
yield return (char)0x00FE; // þ
yield return (char)0x00E6; // æ
yield return (char)0x0153; // œ
yield return (char)0x02BA; // ʺ
yield return (char)0x0131; // ı
yield return (char)0x00A3; // £
yield return (char)0x00F0; // ð
yield return (char)0x01A1; // ơ
yield return (char)0x01B0; // ư

yield return (char)0x00B0; // °
yield return (char)0x2113; // ℓ
yield return (char)0x2117; // ℗
yield return (char)0x00A9; // ©
yield return (char)0x266F; // ♯
yield return (char)0x00BF; // ¿
yield return (char)0x00A1; // ¡

yield return (char)0x0309; // ̉
yield return (char)0x0300; // ̀
yield return (char)0x0301; // ́
yield return (char)0x0302; // ̂
yield return (char)0x0303; // ̃
yield return (char)0x0304; // ̄
yield return (char)0x0306; // ̆
yield return (char)0x0307; // ̇
yield return (char)0x0308; // ̈
yield return (char)0x030C; // ̌
yield return (char)0x030A; // ̊
yield return (char)0xFE20; // ︠
yield return (char)0xFE21; // ︡
yield return (char)0x0315; // ̕
yield return (char)0x030B; // ̋
yield return (char)0x0310; // ̐

yield return (char)0x0327; // ̧
yield return (char)0x0328; // ̨
yield return (char)0x0323; // ̣
yield return (char)0x0324; // ̤
yield return (char)0x0325; // ̥
yield return (char)0x0333; // ̳
yield return (char)0x0332; // ̲
yield return (char)0x0326; // ̦
yield return (char)0x031C; // ̜
yield return (char)0x032E; // ̮
yield return (char)0xFE22; // ︢
yield return (char)0xFE23; // ︣
yield return (char)0x0313; // ̓

yield return (char)0x25A1; // □ empty box
yield return (char)0x25A0; // ■ black box
yield return (char)0x0065; // e midline e
yield return (char)0x006F; // o midline o
yield return (char)0x00Df; // ß es zet
yield return (char)0x0338; // ̸ diacritic slash through char
}
yield return (char) 0x02BB; // ʻ
yield return (char) 0x0142; // ł
yield return (char) 0x00F8; // ø
yield return (char) 0x0111; // đ
yield return (char) 0x00FE; // þ
yield return (char) 0x00E6; // æ
yield return (char) 0x0153; // œ
yield return (char) 0x02BA; // ʺ
yield return (char) 0x0131; // ı
yield return (char) 0x00A3; // £
yield return (char) 0x00F0; // ð
yield return (char) 0x01A1; // ơ
yield return (char) 0x01B0; // ư

yield return (char) 0x00B0; // °
yield return (char) 0x2113; // ℓ
yield return (char) 0x2117; // ℗
yield return (char) 0x00A9; // ©
yield return (char) 0x266F; // ♯
yield return (char) 0x00BF; // ¿
yield return (char) 0x00A1; // ¡

yield return (char) 0x0309; // ̉
yield return (char) 0x0300; // ̀
yield return (char) 0x0301; // ́
yield return (char) 0x0302; // ̂
yield return (char) 0x0303; // ̃
yield return (char) 0x0304; // ̄
yield return (char) 0x0306; // ̆
yield return (char) 0x0307; // ̇
yield return (char) 0x0308; // ̈
yield return (char) 0x030C; // ̌
yield return (char) 0x030A; // ̊
yield return (char) 0xFE20; // ︠
yield return (char) 0xFE21; // ︡
yield return (char) 0x0315; // ̕
yield return (char) 0x030B; // ̋
yield return (char) 0x0310; // ̐

yield return (char) 0x0327; // ̧
yield return (char) 0x0328; // ̨
yield return (char) 0x0323; // ̣
yield return (char) 0x0324; // ̤
yield return (char) 0x0325; // ̥
yield return (char) 0x0333; // ̳
yield return (char) 0x0332; // ̲
yield return (char) 0x0326; // ̦
yield return (char) 0x031C; // ̜
yield return (char) 0x032E; // ̮
yield return (char) 0xFE22; // ︢
yield return (char) 0xFE23; // ︣
yield return (char) 0x0313; // ̓

yield return (char) 0x25A1; // □ empty box
yield return (char) 0x25A0; // ■ black box
yield return (char) 0x0065; // e midline e
yield return (char) 0x006F; // o midline o
yield return (char) 0x00Df; // ß es zet
yield return (char) 0x0338; // ̸ diacritic slash through char
}

}
}
}
99 changes: 51 additions & 48 deletions src/Stravaig.Gedcom.UnitTests/Extensions/CharExtensions_IsGedcomAlphaTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,61 +6,64 @@
namespace Stravaig.Gedcom.UnitTests.Extensions
{
[TestFixture]
public class CharExtensions_IsGedcomAlphaTests
// ReSharper disable once InconsistentNaming
public partial class CharExtensionsTests
{
[Test]
[TestCaseSource(nameof(ValidAlphaCharacters))]
public void IsGedcomAlpha_ForValidCharacters_ReturnsTrue(char alphaChar)
public class IsGedcomAlphaTests
{
alphaChar.IsGedcomAlpha().ShouldBeTrue();
}
[Test]
[TestCaseSource(nameof(ValidAlphaCharacters))]
public void IsGedcomAlpha_ForValidCharacters_ReturnsTrue(char alphaChar)
{
alphaChar.IsGedcomAlpha().ShouldBeTrue();
}

[Test]
[TestCaseSource(nameof(Numbers))]
public void IsGedcomAlpha_ForNumbers_ReturnsFalse(char alphaChar)
{
alphaChar.IsGedcomAlpha().ShouldBeFalse();
}
[Test]
[TestCaseSource(nameof(Numbers))]
public void IsGedcomAlpha_ForNumbers_ReturnsFalse(char alphaChar)
{
alphaChar.IsGedcomAlpha().ShouldBeFalse();
}

[Test]
[TestCaseSource(nameof(Symbols))]
public void IsGedcomAlpha_ForSymbols_ReturnsFalse(char alphaChar)
{
alphaChar.IsGedcomAlpha().ShouldBeFalse();
}

[Test]
[TestCaseSource(nameof(AccentedLetters))]
public void IsGedcomAlpha_ForAccentedLetters_ReturnsFalse(char alphaChar)
{
alphaChar.IsGedcomAlpha().ShouldBeFalse();
}

private static IEnumerable<char> ValidAlphaCharacters()
{
for (char c = 'a'; c <= 'z'; c++)
yield return c;
for (char c = 'A'; c <= 'Z'; c++)
yield return c;
yield return '_';
}
[Test]
[TestCaseSource(nameof(Symbols))]
public void IsGedcomAlpha_ForSymbols_ReturnsFalse(char alphaChar)
{
alphaChar.IsGedcomAlpha().ShouldBeFalse();
}

private static IEnumerable<char> Numbers()
{
for (char c = '0'; c <= '9'; c++)
yield return c;
}
[Test]
[TestCaseSource(nameof(AccentedLetters))]
public void IsGedcomAlpha_ForAccentedLetters_ReturnsFalse(char alphaChar)
{
alphaChar.IsGedcomAlpha().ShouldBeFalse();
}

private static IEnumerable<char> Symbols()
{
return "!£$%^&*()-+={}[]:@~;'#<>?,./\\|\"`¬";
}
private static IEnumerable<char> ValidAlphaCharacters()
{
for (char c = 'a'; c <= 'z'; c++)
yield return c;
for (char c = 'A'; c <= 'Z'; c++)
yield return c;
yield return '_';
}

private static IEnumerable<char> AccentedLetters()
{
for (char c = (char) 0xC0; c <= (char) 0xFF; c++)
yield return c;
private static IEnumerable<char> Numbers()
{
for (char c = '0'; c <= '9'; c++)
yield return c;
}

private static IEnumerable<char> Symbols()
{
return "!£$%^&*()-+={}[]:@~;'#<>?,./\\|\"`¬";
}

private static IEnumerable<char> AccentedLetters()
{
for (char c = (char) 0xC0; c <= (char) 0xFF; c++)
yield return c;
}
}

}
}
Loading

0 comments on commit 350dafb

Please sign in to comment.