Skip to content

Releases/1.4 preview #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 3, 2019
Merged

Releases/1.4 preview #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cb4b289
v1.4-preview branch
SteveWilkes Apr 11, 2019
d5312c7
Bugs/issue129 (#131)
SteveWilkes Apr 11, 2019
023e056
Updating release notes
SteveWilkes Apr 11, 2019
333576a
Adding v1.4-preview NuGet package
SteveWilkes Apr 11, 2019
e0cd639
Bugs/issue130 (#132)
SteveWilkes Apr 18, 2019
391cdf3
Updating to v1.4-preview2
SteveWilkes Apr 22, 2019
e7794d5
Features/configured source member validation (#134)
SteveWilkes Apr 24, 2019
8fcb716
Fixing ToTarget complex type entry dictionary mapping, re: #133
SteveWilkes Apr 25, 2019
84e1821
Skipping existing dictionary value checks when target is definitely u…
SteveWilkes Apr 26, 2019
ee9ce1f
Code coverage changes / Tidying
SteveWilkes Apr 29, 2019
2b56ce4
Updating to v1.4-preview3
SteveWilkes Apr 29, 2019
7af4594
Fixing build
SteveWilkes May 1, 2019
9c42cca
Fixing complex type dictionary merging
SteveWilkes May 2, 2019
118f58a
Updating release notes
SteveWilkes May 2, 2019
812c5fc
Updating to v1.4
SteveWilkes May 3, 2019
d0b0e30
v1.4 NuGet package
SteveWilkes May 3, 2019
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
3 changes: 0 additions & 3 deletions AgileMapper.UnitTests.Orms.EfCore2/AgileMapper.UnitTests.Orms.EfCore2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll</HintPath>
</Reference>
Expand Down
105 changes: 102 additions & 3 deletions AgileMapper.UnitTests/Configuration/WhenConfiguringDataSourcesIncorrectly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,48 @@ public void ShouldErrorIfDuplicateDataSourceIsConfigured()
[Fact]
public void ShouldErrorIfRedundantDataSourceIsConfigured()
{
Should.Throw<MappingConfigurationException>(() =>
var configEx = Should.Throw<MappingConfigurationException>(() =>
{
using (var mapper = Mapper.CreateNew())
{
mapper.WhenMapping
.From<PublicProperty<int>>()
.To<PublicField<string>>()
.Map(pp => pp.Value, pf => pf.Value);
}
});

configEx.Message.ShouldContain("PublicProperty<int>.Value");
configEx.Message.ShouldContain("PublicField<string>.Value");
configEx.Message.ShouldContain("does not need to be configured");
}

[Fact]
public void ShouldErrorIfRedundantConstructorParameterDataSourceIsConfigured()
{
var configEx = Should.Throw<MappingConfigurationException>(() =>
{
using (var mapper = Mapper.CreateNew())
{
mapper.WhenMapping
.From<PublicProperty<int>>()
.To<PublicCtor<string>>()
.Map(ctx => ctx.Source.Value)
.ToCtor<string>();
}
});

configEx.Message.ShouldContain("PublicProperty<int>.Value");
configEx.Message.ShouldContain("will automatically be mapped");
configEx.Message.ShouldContain("target constructor parameter");
configEx.Message.ShouldContain("PublicCtor<string>.value");
configEx.Message.ShouldContain("does not need to be configured");
}

[Fact]
public void ShouldErrorIfRedundantDerivedTypeDataSourceIsConfigured()
{
var configEx = Should.Throw<MappingConfigurationException>(() =>
{
using (var mapper = Mapper.CreateNew())
{
Expand All @@ -129,6 +170,8 @@ public void ShouldErrorIfRedundantDataSourceIsConfigured()
.To(x => x.Value);
}
});

configEx.Message.ShouldContain("already has configured data source");
}

[Fact]
Expand Down Expand Up @@ -262,6 +305,24 @@ public void ShouldErrorIfUnconvertibleConstructorValueConstantSpecified()
configurationException.Message.ShouldContain("Unable to convert");
}

[Fact]
public void ShouldErrorIfUnconvertibleConstructorSourceValueSpecified()
{
var configurationException = Should.Throw<MappingConfigurationException>(() =>
{
using (var mapper = Mapper.CreateNew())
{
mapper.WhenMapping
.From<PublicProperty<int>>()
.To<PublicCtor<Guid>>()
.Map(ctx => ctx.Source.Value)
.ToCtor<Guid>();
}
});

configurationException.Message.ShouldContain("Unable to convert");
}

[Fact]
public void ShouldErrorIfSimpleTypeConfiguredForComplexTarget()
{
Expand All @@ -281,6 +342,25 @@ public void ShouldErrorIfSimpleTypeConfiguredForComplexTarget()
"Person.Id of type 'Guid' cannot be mapped to target type 'Address'");
}

[Fact]
public void ShouldErrorIfSimpleTypeConfiguredForComplexConstructorParameter()
{
var configurationException = Should.Throw<MappingConfigurationException>(() =>
{
using (var mapper = Mapper.CreateNew())
{
mapper.WhenMapping
.From<PublicField<int>>()
.To<PublicCtor<Address>>()
.Map(ctx => ctx.Source.Value)
.ToCtor<Address>();
}
});

configurationException.Message.ShouldContain(
"PublicField<int>.Value of type 'int' cannot be mapped to target type 'Address'");
}

[Fact]
public void ShouldErrorIfSimpleTypeConfiguredForEnumerableTarget()
{
Expand All @@ -300,6 +380,25 @@ public void ShouldErrorIfSimpleTypeConfiguredForEnumerableTarget()
"PublicField<int>.Value of type 'int' cannot be mapped to target type 'int[]'");
}

[Fact]
public void ShouldErrorIfSimpleTypeConfiguredForEnumerableConstructorParameter()
{
var configurationException = Should.Throw<MappingConfigurationException>(() =>
{
using (var mapper = Mapper.CreateNew())
{
mapper.WhenMapping
.From<PublicField<string>>()
.To<PublicCtor<int[]>>()
.Map(ctx => ctx.Source.Value)
.ToCtor("value");
}
});

configurationException.Message.ShouldContain(
"PublicField<string>.Value of type 'string' cannot be mapped to target type 'int[]'");
}

[Fact]
public void ShouldErrorIfUnconvertibleEnumerableElementTypeConfigured()
{
Expand All @@ -308,9 +407,9 @@ public void ShouldErrorIfUnconvertibleEnumerableElementTypeConfigured()
using (var mapper = Mapper.CreateNew())
{
mapper.WhenMapping
.From<PublicField<PublicField<int>[]>>()
.From<PublicTwoFields<PublicField<int>[], int[]>>()
.To<PublicField<int[]>>()
.Map(s => s.Value, t => t.Value);
.Map(s => s.Value1, t => t.Value);
}
});

Expand Down
Loading