Skip to content
This repository has been archived by the owner on Dec 29, 2020. It is now read-only.

6.2.6 #420

Merged
merged 11 commits into from
Nov 5, 2015
Merged

6.2.6 #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a651800
Merge pull request #387 from TrevorPilley/6.1.4
TrevorPilley Mar 25, 2015
8f003b8
Merge pull request #390 from TrevorPilley/develop
TrevorPilley Apr 18, 2015
2387c8e
Merge pull request #392 from TrevorPilley/develop
TrevorPilley Apr 21, 2015
bb49126
Merge pull request #394 from TrevorPilley/develop
TrevorPilley Jun 6, 2015
7c6cb04
Merge pull request #398 from TrevorPilley/develop
TrevorPilley Jul 2, 2015
ae6709b
Merge pull request #402 from TrevorPilley/develop
TrevorPilley Jul 26, 2015
6a1ca4b
Merge pull request #414 from TrevorPilley/develop
TrevorPilley Sep 27, 2015
311037c
Merge pull request #418 from turbonaitis/develop
TrevorPilley Nov 5, 2015
4b8cf0d
Corrected typos in the unit tests
TrevorPilley Nov 5, 2015
a3a2327
Added additional tests to inflection service
TrevorPilley Nov 5, 2015
546c630
Fix for Man to Men inflection
TrevorPilley Nov 5, 2015
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
7 changes: 6 additions & 1 deletion MicroLite.Tests/Mapping/Inflection/EnglishInflectionServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,24 @@ public void ChangesWordEndingLfToEndVes()
{
var inflectionService = new EnglishInflectionService();
Assert.Equal("Elves", inflectionService.ToPlural("Elf"));
Assert.Equal("Wolves", inflectionService.ToPlural("Wolf"));
}

[Fact]
public void ChangesWordEndingManToEndMen()
{
var inflectionService = new EnglishInflectionService();
Assert.Equal("Men", inflectionService.ToPlural("Man"));
Assert.Equal("Women", inflectionService.ToPlural("Woman"));
}

[Fact]
public void ShouldNotMutilateWordsHavingFInTheMiddle()
public void ContainsFButShouldStillEndS()
{
var inflectionService = new EnglishInflectionService();
Assert.Equal("Affiliates", inflectionService.ToPlural("Affiliate"));
Assert.Equal("Identifiers", inflectionService.ToPlural("Identifier"));
Assert.Equal("Notifications", inflectionService.ToPlural("Notification"));
Assert.Equal("Refunds", inflectionService.ToPlural("Refund"));
}

Expand Down
10 changes: 5 additions & 5 deletions MicroLite.Tests/Mapping/PocoObjectInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public void GetIdentifierValueThrowsMicroLiteException_WhenNoIdentifierMapped()

var exception = Assert.Throws<MicroLiteException>(() => objectInfo.GetIdentifierValue(customer));

Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentivesier"), exception.Message);
Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentifiers"), exception.Message);
}

[Fact]
Expand Down Expand Up @@ -335,7 +335,7 @@ public void GetInsertValuesThrowsMicroLiteException_WhenNoIdentifierMapped()

var exception = Assert.Throws<MicroLiteException>(() => objectInfo.GetInsertValues(customer));

Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentivesier"), exception.Message);
Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentifiers"), exception.Message);
}

[Fact]
Expand Down Expand Up @@ -455,7 +455,7 @@ public void GetUpdateValuesThrowsMicroLiteException_WhenNoIdentifierMapped()

var exception = Assert.Throws<MicroLiteException>(() => objectInfo.GetUpdateValues(customer));

Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentivesier"), exception.Message);
Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentifiers"), exception.Message);
}

[Fact]
Expand Down Expand Up @@ -538,7 +538,7 @@ public void HasDefaultIdentifierValueThrowsMicroLiteException_WhenNoIdentifierMa

var exception = Assert.Throws<MicroLiteException>(() => objectInfo.HasDefaultIdentifierValue(customer));

Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentivesier"), exception.Message);
Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentifiers"), exception.Message);
}

[Fact]
Expand Down Expand Up @@ -697,7 +697,7 @@ public void VerifyInstanceForInsertThrowsMicroLiteException_WhenNoIdentifierMapp

var exception = Assert.Throws<MicroLiteException>(() => objectInfo.VerifyInstanceForInsert(customer));

Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentivesier"), exception.Message);
Assert.Equal(ExceptionMessages.PocoObjectInfo_NoIdentifierColumn.FormatWith("Sales", "CustomerWithNoIdentifiers"), exception.Message);
}

public class CustomerWithGuidIdentifier
Expand Down
2 changes: 1 addition & 1 deletion MicroLite/Mapping/Inflection/EnglishInflectionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ internal sealed class EnglishInflectionService : IInflectionService
{ "Person", "People" },
{ "Child", "Children" },
{ "(.*)fe?$", "$1ves" },
{ "(.*)man$", "$1men" },
{ "(M|(.*)m)an$", "$1en" },
{ "(.+[aeiou]y)$", "$1s" },
{ "(.+[^aeiou])y$", "$1ies" },
{ "(.+z)$", "$1zes" },
Expand Down