fix unit test

Yoshka · Aug 22, 2017 · cc2fe61 · cc2fe61
1 parent 2e07857
commit cc2fe61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/Mapster.Tests/WhenMappingWithDictionary.cs b/src/Mapster.Tests/WhenMappingWithDictionary.cs
@@ -60,7 +60,7 @@ public void Object_To_Dictionary_CamelCase()
  Name = "test",
  };
 
- var dict = TypeAdapter.Adapt<Dictionary<string, object>>(poco);
+ var dict = TypeAdapter.Adapt<SimplePoco, Dictionary<string, object>>(poco);
 
  dict.Count.ShouldBe(2);
  dict["id"].ShouldBe(poco.Id);
@@ -142,7 +142,6 @@ public void Dictionary_To_Object_Map()
  [TestMethod]
  public void Dictionary_To_Object_CamelCase()
  {
- TypeAdapterConfig.GlobalSettings.EnableDebugging();
  TypeAdapterConfig.GlobalSettings.Default.NameMatchingStrategy(NameMatchingStrategy.FromCamelCase);
  var dict = new Dictionary<string, object>
  {
@@ -208,7 +207,7 @@ public void Dictionary_Of_String_Mix()
  ["d"] = 4,
  ["e"] = null,
  };
- var result = dict.Adapt<Dictionary<string, int>>();
+ var result = dict.Adapt<Dictionary<string, int?>, Dictionary<string, int>>();
  result.Count.ShouldBe(2);
  result["A"].ShouldBe(1);
  result["_b"].ShouldBe(2);

diff --git a/src/Mapster/Adapters/DictionaryAdapter.cs b/src/Mapster/Adapters/DictionaryAdapter.cs
@@ -198,8 +198,7 @@ protected override ClassModel GetClassModel(Type destinationType, CompileArgumen
  private static Func<Expression, Expression, Expression> GetFunction(CompileArgument arg, Type dictType)
  {
  var strategy = arg.Settings.NameMatchingStrategy;
- if (arg.MapType == MapType.MapToTarget &&
- strategy.DestinationMemberNameConverter != NameMatchingStrategy.Identity)
+ if (strategy.DestinationMemberNameConverter != NameMatchingStrategy.Identity)
  {
  var args = dictType.GetGenericArguments();
  var getMethod = typeof(CoreExtensions).GetMethods()

diff --git a/src/Mapster/Mapster.NetCore.csproj b/src/Mapster/Mapster.NetCore.csproj
@@ -22,7 +22,7 @@
  <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
  <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
- <Version>3.1.2</Version>
+ <Version>3.1.3</Version>
  <RootNamespace>Mapster</RootNamespace>
  </PropertyGroup>