Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Mapster.Tests/WhenForkingConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void Fork_Setting()
dto.Name1.ShouldBe(poco.Name1);
dto.Name2.ShouldBe("Bar");

var str = poco.Name2.Adapt(dto.Name2, config);
var str = poco.Name2.AdaptToTarget(dto.Name2, config);
str.ShouldBe(poco.Name2);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Tests/WhenIgnoreMapping.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void WhenClassIgnoreCtorParamGetDefaultValue()
var dest = new B707(123, "Hello");

var docKind = source.Adapt<B707>(config);
var mapTotarget = source.Adapt(dest,config);
var mapTotarget = source.AdaptToTarget(dest,config);

docKind.Id.ShouldBe(0);
mapTotarget.Id.ShouldBe(123);
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Tests/WhenMappingIgnoreNullValues.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void Map_To_Target()
.Compile();

var source = new SourceClass();
var dest = source.Adapt(new DestClass());
var dest = source.AdaptToTarget(new DestClass());

Assert.AreEqual("Hello", dest.Title);
Assert.IsNotNull(dest.Sub);
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.Tests/WhenMappingInitProperty.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public void WhenMappingToHiddenandNewInitFieldDestination()
{
var source = new Source672() { Id = 156};
var c = source.Adapt<BDestination>();
var s = source.Adapt(new BDestination());
var s = source.AdaptToTarget(new BDestination());

((ADestination)c).Id.ShouldBe(default); // Hidden Base member is not mapping
s.Id.ShouldBe(156);
Expand All @@ -31,7 +31,7 @@ public void WhenMappingToHiddenandNewInitFieldWithConstructUsing()

var source = new Source672() { Id = 256 };
var c = source.Adapt<BDestination>();
var s = source.Adapt(new BDestination());
var s = source.AdaptToTarget(new BDestination());

((ADestination)c).Id.ShouldBe(default); // Hidden Base member is not mapping
s.Id.ShouldBe(256);
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Tests/WhenMappingNullableEnumRegression.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void UpdateNullEnumToClass()
var mDest2 = new MyDestination() { TypeEmployer = new KeyValueData("Admin", null) };

var _MyDestination = myClass?.Adapt<MyDestination?>(); // Work
var _result = _MyDestination.Adapt(mDest2);
var _result = _MyDestination.AdaptToTarget(mDest2);

_result.TypeEmployer.Key.ShouldBe(MyEnum.User.ToString());
}
Expand Down
14 changes: 7 additions & 7 deletions src/Mapster.Tests/WhenMappingObjectRegression.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void UpdateToRealObject()
var source = new Source524 { X1 = 123 };
var RealObject = new Object();

var _result = source.Adapt(RealObject);
var _result = source.AdaptToTarget(RealObject);

_result.ShouldBeOfType<Source524>();
((Source524)_result).X1.ShouldBe(source.X1);
Expand All @@ -60,7 +60,7 @@ public void RealObjectCastToDestination() /// Warning potential Infinity Loop in
var source = new Source524 { X1 = 123 };
var RealObject = new Object();

var _result = RealObject.Adapt(source);
var _result = RealObject.AdaptToTarget(source);

_result.ShouldBeOfType<Source524>();
((Source524)_result).X1.ShouldBe(source.X1);
Expand All @@ -72,7 +72,7 @@ public void UpdateObjectInsaider()
var _source = new InsaderObject() { X1 = 1 };
var _Destination = new InsaderObject() { X1 = 2 };

var _result = _source.Adapt(_Destination);
var _result = _source.AdaptToTarget(_Destination);

_result.X1.ShouldBe(_source.X1);
}
Expand All @@ -83,7 +83,7 @@ public void UpdateObjectInsaiderToObject()
var _source = new InsaderObject() { X1 = 1 };
var _Destination = new InsaderObject() { X1 = new Object() };

var _result = _source.Adapt(_Destination);
var _result = _source.AdaptToTarget(_Destination);

_result.X1.ShouldBe(_source.X1);
}
Expand All @@ -94,7 +94,7 @@ public void UpdateObjectInsaiderWhenObjectinTSource()
var _source = new InsaderObject() { X1 = new Object() };
var _Destination = new InsaderObject() { X1 = 3 };

var _result = _source.Adapt(_Destination);
var _result = _source.AdaptToTarget(_Destination);

_result.X1.ShouldBe(_source.X1);
}
Expand All @@ -105,15 +105,15 @@ public void UpdateObjectInsaiderWhenObjectinTSource()
Dest524 Somemap(object source)
{
var dest = new Dest524 { X1 = 321 };
var dest1 = source.Adapt(dest);
var dest1 = source.AdaptToTarget(dest);

return dest;
}

ManyDest524 SomemapManyDest(object source)
{
var dest = new ManyDest524 { X1 = 321, X2 = 127 };
var dest1 = source.Adapt(dest);
var dest1 = source.AdaptToTarget(dest);

return dest;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public void MappingToPrimitiveInsiderWithCustomMapping()
var target = new Source561 { Name = new Optional561<string>("John") }.Adapt<Target561>();

var TargetDestinationFromNull = new Target561() { Name = "Me" };
var NullToupdateoptional = sourceNull.Adapt(TargetDestinationFromNull);
var _result = sourceNull.Adapt(target);
var NullToupdateoptional = sourceNull.AdaptToTarget(TargetDestinationFromNull);
var _result = sourceNull.AdaptToTarget(target);

target.Name.ShouldBe("John");
NullToupdateoptional.Name.ShouldBe("Me");
Expand Down
53 changes: 26 additions & 27 deletions src/Mapster.Tests/WhenMappingRecordRegression.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ public void AdaptRecordToRecord()

var _source = new TestRecord() { X = 700 };
var _destination = new TestRecordY() { X = 500 , Y = 200 };

var _destination2 = new TestRecordY() { X = 300, Y = 400 };
var _result = _source.Adapt(_destination);

var result2 = _destination.Adapt(_destination2);

var _result = _source.AdaptToTarget(_destination);
var result2 = _destination.AdaptToTarget(_destination2);

_result.X.ShouldBe(700);
_result.Y.ShouldBe(200);
Expand All @@ -37,7 +36,7 @@ public void AdaptPositionalRecordToPositionalRecord()
{
var _sourcePositional = new TestRecordPositional(600);
var _destinationPositional = new TestRecordPositional(900);
var _positionalResult = _sourcePositional.Adapt(_destinationPositional);
var _positionalResult = _sourcePositional.AdaptToTarget(_destinationPositional);

_positionalResult.X.ShouldBe(600);
object.ReferenceEquals(_destinationPositional, _positionalResult).ShouldBeFalse();
Expand All @@ -48,7 +47,7 @@ public void AdaptRecordStructToRecordStruct()
{
var _sourceStruct = new TestRecordStruct() { X = 1000 };
var _destinationStruct = new TestRecordStruct() { X = 800 };
var _structResult = _sourceStruct.Adapt(_destinationStruct);
var _structResult = _sourceStruct.AdaptToTarget(_destinationStruct);

_structResult.X.ShouldBe(1000);
_destinationStruct.X.Equals(_structResult.X).ShouldBeFalse();
Expand All @@ -59,7 +58,7 @@ public void AdaptRecordToClass()
{
var _sourсe = new TestRecordPositional(200);
var _destination = new TestClassProtectedCtr(400);
var _result = _sourсe.Adapt(_destination);
var _result = _sourсe.AdaptToTarget(_destination);

_destination.ShouldBeOfType<TestClassProtectedCtr>();
_destination.X.ShouldBe(200);
Expand All @@ -71,7 +70,7 @@ public void AdaptClassToRecord()
{
var _sourсe = new TestClassProtectedCtr(200);
var _destination = new TestRecordPositional(400);
var _result = _sourсe.Adapt(_destination);
var _result = _sourсe.AdaptToTarget(_destination);

_destination.ShouldBeOfType<TestRecordPositional>();
_result.X.ShouldBe(200);
Expand All @@ -83,7 +82,7 @@ public void AdaptToSealtedRecord()
{
var _sourceRecord = new TestRecord() { X = 2000 };
var _destinationSealtedRecord = new TestSealedRecord() { X = 3000 };
var _RecordResult = _sourceRecord.Adapt(_destinationSealtedRecord);
var _RecordResult = _sourceRecord.AdaptToTarget(_destinationSealtedRecord);

_RecordResult.X.ShouldBe(2000);
object.ReferenceEquals(_destinationSealtedRecord, _RecordResult).ShouldBeFalse();
Expand All @@ -94,7 +93,7 @@ public void AdaptToSealtedPositionalRecord()
{
var _sourceRecord = new TestRecord() { X = 2000 };
var _destinationSealtedPositionalRecord = new TestSealedRecordPositional(4000);
var _RecordResult = _sourceRecord.Adapt(_destinationSealtedPositionalRecord);
var _RecordResult = _sourceRecord.AdaptToTarget(_destinationSealtedPositionalRecord);

_RecordResult.X.ShouldBe(2000);
object.ReferenceEquals(_destinationSealtedPositionalRecord, _RecordResult).ShouldBeFalse();
Expand All @@ -105,7 +104,7 @@ public void AdaptClassToClassPublicCtrIsNotInstanse()
{
var _source = new TestClassPublicCtr(200);
var _destination = new TestClassPublicCtr(400);
var _result = _source.Adapt(_destination);
var _result = _source.AdaptToTarget(_destination);

_destination.ShouldBeOfType<TestClassPublicCtr>();
_destination.X.ShouldBe(200);
Expand All @@ -117,7 +116,7 @@ public void AdaptClassToClassProtectdCtrIsNotInstanse()
{
var _source = new TestClassPublicCtr(200);
var _destination = new TestClassProtectedCtr(400);
var _result = _source.Adapt(_destination);
var _result = _source.AdaptToTarget(_destination);

_destination.ShouldBeOfType<TestClassProtectedCtr>();
_destination.X.ShouldBe(200);
Expand Down Expand Up @@ -154,7 +153,7 @@ public void AdaptClassToClassFromPrivatePropertyIsNotInstanse()
{
var _source = new TestClassPublicCtr(200);
var _destination = new TestClassProtectedCtrPrivateProperty(400, "Me");
var _result = _source.Adapt(_destination);
var _result = _source.AdaptToTarget(_destination);

_destination.ShouldBeOfType<TestClassProtectedCtrPrivateProperty>();
_destination.X.ShouldBe(200);
Expand Down Expand Up @@ -191,7 +190,7 @@ public void UpdateNullable()
config.ForType<UpdateUser, UserAccount>()
.IgnoreNullValues(true);

var _resultEmail = _updateEmail.Adapt(_sourceEmailUpdate, config);
var _resultEmail = _updateEmail.AdaptToTarget(_sourceEmailUpdate, config);

_source.Id.ShouldBe("123");
_source.Created.ShouldBe(new DateTime(2023, 9, 24));
Expand Down Expand Up @@ -220,7 +219,7 @@ public void ImplicitOperatorCurrentWorkFromClass()
pocoWithId1.Id.ToString().Equals(guid.ToString()).ShouldBeTrue();
pocoWithGuid2.Id.Equals(guid).ShouldBeTrue();

var _result = pocoWithId1.Adapt(pocoWithGuid2);
var _result = pocoWithId1.AdaptToTarget(pocoWithGuid2);

_result.Id.ToString().Equals(guid.ToString()).ShouldBeTrue(); // Guid value transmitted
object.ReferenceEquals(_result, pocoWithGuid2).ShouldBeTrue(); // Not created new instanse from class pocoWithGuid2
Expand All @@ -233,7 +232,7 @@ public void DetectFakeRecord()
{
var _source = new TestClassPublicCtr(200);
var _destination = new FakeRecord { X = 300 };
var _result = _source.Adapt(_destination);
var _result = _source.AdaptToTarget(_destination);
_destination.X.ShouldBe(200);
object.ReferenceEquals(_destination, _result).ShouldBeTrue();
}
Expand All @@ -245,7 +244,7 @@ public void OnlyInlineRecordWorked()
var _sourceOnlyInitRecord = new OnlyInitRecord501 { MyInt = 2, MyString = "Hello World" };

var _resultOnlyinitRecord = _sourcePoco.Adapt<OnlyInitRecord501>();
var _updateResult = _sourceOnlyInitRecord.Adapt(_resultOnlyinitRecord);
var _updateResult = _sourceOnlyInitRecord.AdaptToTarget(_resultOnlyinitRecord);

_resultOnlyinitRecord.MyInt.ShouldBe(1);
_resultOnlyinitRecord.MyString.ShouldBe("Hello");
Expand All @@ -260,7 +259,7 @@ public void MultyCtorRecordWorked()
var _sourceMultyCtorRecord = new MultiCtorRecord (2, "Hello World");

var _resultMultyCtorRecord = _sourcePoco.Adapt<MultiCtorRecord>();
var _updateResult = _sourceMultyCtorRecord.Adapt(_resultMultyCtorRecord);
var _updateResult = _sourceMultyCtorRecord.AdaptToTarget(_resultMultyCtorRecord);

_resultMultyCtorRecord.MyInt.ShouldBe(1);
_resultMultyCtorRecord.MyString.ShouldBe("Hello");
Expand All @@ -275,7 +274,7 @@ public void MultiCtorAndInlineRecordWorked()
var _sourceMultiCtorAndInline = new MultiCtorAndInlineRecord(2, "Hello World") { InitData = "Worked", MyEmail = "[email protected]" };

var _resultMultiCtorAndInline = _sourcePoco.Adapt<MultiCtorAndInlineRecord>();
var _updateResult = _sourceMultiCtorAndInline.Adapt(_resultMultiCtorAndInline);
var _updateResult = _sourceMultiCtorAndInline.AdaptToTarget(_resultMultiCtorAndInline);

_resultMultiCtorAndInline.MyInt.ShouldBe(1);
_resultMultiCtorAndInline.MyString.ShouldBe("Hello");
Expand Down Expand Up @@ -340,12 +339,12 @@ public void MappingInterfaceToInterface()

var TargetBase = sourceBase.Adapt<SampleInterfaceClsBase>();
var targetDerived = sourceDerived.Adapt<SampleInterfaceClsDerived>();
var update = targetDerived.Adapt(TargetBase);
var update = targetDerived.AdaptToTarget(TargetBase);

var targetExtention = sourceExt.Adapt<SampleInterfaceClsExtentions>();


var updExt = targetDerived.Adapt(targetExtention);
var updExt = targetDerived.AdaptToTarget(targetExtention);

targetDerived.ShouldNotBeNull();
targetDerived.ShouldSatisfyAllConditions(
Expand Down Expand Up @@ -381,9 +380,9 @@ public void WhenRecordReceivedIgnoreCtorParamProcessing()
var UserInsider = new UserInside(user, new UserRecord456("Skot"));

var map = userDto.Adapt<UserRecord456>();
var maptoTarget = userDto.Adapt(user);
var maptoTarget = userDto.AdaptToTarget(user);

var MapToTargetInsider = DtoInsider.Adapt(UserInsider);
var MapToTargetInsider = DtoInsider.AdaptToTarget(UserInsider);

map.Name.ShouldBeNullOrEmpty(); // Ignore is work set default value
maptoTarget.Name.ShouldBe("John"); // Ignore is work ignored member save value from Destination
Expand All @@ -409,7 +408,7 @@ public void WhenRecordTypeWorksWithUseDestinationValueAndIgnoreNullValues()

var txt = _sourceFromMapToTarget.BuildAdapter().CreateMapToTargetExpression<TestRecordUseDestValue>();

var _resultMapToTarget = _sourceFromMapToTarget.Adapt(result);
var _resultMapToTarget = _sourceFromMapToTarget.AdaptToTarget(result);

result.A.ShouldBe(0); // default Value - not match
result.S.ShouldBe("Inside Data"); // is not AutoProperty not mod by source
Expand All @@ -436,7 +435,7 @@ public void FixCtorParamMapping()


var result = new CreateOrderRequest771(sourceRequestOrderDto).Adapt<CreateOrderCommand771>();
var resultID = db.Adapt(new Database746());
var resultID = db.AdaptToTarget(new Database746());


result.Order.Payment.CVV.ShouldBe("234");
Expand All @@ -455,7 +454,7 @@ public void RequiredProperty()

var s = source.BuildAdapter().CreateMapToTargetExpression<Person554>();

var result = source.Adapt(destination);
var result = source.AdaptToTarget(destination);

result.ID.ShouldBe(245);
result.FirstMidName.ShouldBe(source.FirstMidName);
Expand All @@ -477,7 +476,7 @@ public void CollectionUpdate()
new(234)
};
var destination = new List<TestClassPublicCtr>();
var _result = sources.Adapt(destination);
var _result = sources.AdaptToTarget(destination);

destination.Count.ShouldBe(_result.Count);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.Tests/WhenMappingStructRegression.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void TestMapStructToExistingStruct()
{
Ignore = "Ignored property",
};
dest = source.Adapt(dest);
dest = source.AdaptToTarget(dest);

dest.Ignore.ShouldBe("Ignored property");
dest.Name.ShouldBe("Some Name");
Expand All @@ -71,7 +71,7 @@ public void TestMapClassToExistingStruct()
{
Ignore = "Ignored property",
};
dest = source.Adapt(dest);
dest = source.AdaptToTarget(dest);

dest.Ignore.ShouldBe("Ignored property");
dest.Name.ShouldBe("Some Name");
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Tests/WhenMappingWithAdaptIgnoreRegression.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void TestMapStructToExistingStruct()

var destination = new Poco() { Name = "Destination", State = 2 };
var source = new Dto() { Name = "Source" };
var result = source.Adapt(destination);
var result = source.AdaptToTarget(destination);
result.State.ShouldBe(2);
result.Name.ShouldBe("Source");
}
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Tests/WhenMappingWithSecondSourceObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void TestMapFromSecondSourceObject()
generatedType.Name.ShouldBe("Name 1");
generatedType.Address.ShouldBe("Address 1");

generatedType = c2.Adapt(generatedType);
generatedType = c2.AdaptToTarget(generatedType);

generatedType.Id.ShouldBe(2);
generatedType.Name.ShouldBe("Name 2");
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Tests/WhenPerformingAfterMapping.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void MapToTarget_Support_Destination_Parameter()
Name = "test",
};
var oldDto = new SimpleDto { Name = "zzz", };
var result = poco.Adapt(oldDto);
var result = poco.AdaptToTarget(oldDto);

result.ShouldNotBeSameAs(oldDto);
result.Id.ShouldBe(poco.Id);
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Tests/WhenPerformingBeforeMapping.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void MapToTarget_Support_Destination_Parameter()
IEnumerable<int> source = new List<int> { 1, 2, 3, };
IEnumerable<int> destination = new List<int> { 0, };

var result = source.Adapt(destination);
var result = source.AdaptToTarget(destination);

destination.ShouldBe(new List<int> { 0, });
source.ShouldBe(new List<int> { 1, 2, 3, });
Expand Down
Loading
Loading