Skip to content

Commit

Permalink
Renamed property and field names to member.
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Close committed Sep 7, 2017
1 parent bca55ab commit 98f3b8b
Show file tree
Hide file tree
Showing 79 changed files with 822 additions and 822 deletions.
10 changes: 5 additions & 5 deletions src/CsvHelper.Tests/AutoMapping/AutoMappingTests.cs
View file
Expand Up @@ -214,7 +214,7 @@ public void AutoMapWithExistingMapTest()
var map = config.AutoMap( data.GetType() );

Assert.IsNotNull( map );
Assert.AreEqual( 0, map.PropertyMaps.Count );
Assert.AreEqual( 0, map.MemberMaps.Count );
Assert.AreEqual( 1, map.ReferenceMaps.Count );

// Since Simple is a reference on the anonymous object, the type won't
Expand All @@ -231,10 +231,10 @@ public void AutoMapWithNestedHeaders()
PrefixReferenceHeaders = true,
};
var map = config.AutoMap<Nested>();
Assert.AreEqual( "Simple1.Id", map.ReferenceMaps[0].Data.Mapping.PropertyMaps[0].Data.Names[0] );
Assert.AreEqual( "Simple1.Name", map.ReferenceMaps[0].Data.Mapping.PropertyMaps[1].Data.Names[0] );
Assert.AreEqual( "Simple2.Id", map.ReferenceMaps[1].Data.Mapping.PropertyMaps[0].Data.Names[0] );
Assert.AreEqual( "Simple2.Name", map.ReferenceMaps[1].Data.Mapping.PropertyMaps[1].Data.Names[0] );
Assert.AreEqual( "Simple1.Id", map.ReferenceMaps[0].Data.Mapping.MemberMaps[0].Data.Names[0] );
Assert.AreEqual( "Simple1.Name", map.ReferenceMaps[0].Data.Mapping.MemberMaps[1].Data.Names[0] );
Assert.AreEqual( "Simple2.Id", map.ReferenceMaps[1].Data.Mapping.MemberMaps[0].Data.Names[0] );
Assert.AreEqual( "Simple2.Name", map.ReferenceMaps[1].Data.Mapping.MemberMaps[1].Data.Names[0] );
}

private class Nested
Expand Down
6 changes: 3 additions & 3 deletions src/CsvHelper.Tests/AutoMapping/CircularReferenceTests.cs
View file
Expand Up @@ -12,9 +12,9 @@ public void CircularDependencyTest()
var config = new CsvHelper.Configuration.Configuration();
var map = config.AutoMap<ACircular>();
Assert.IsNotNull( map );
Assert.AreEqual( 1, map.PropertyMaps.Count );
Assert.AreEqual( 1, map.MemberMaps.Count );
Assert.AreEqual( 1, map.ReferenceMaps.Count );
Assert.AreEqual( 1, map.ReferenceMaps[0].Data.Mapping.PropertyMaps.Count );
Assert.AreEqual( 1, map.ReferenceMaps[0].Data.Mapping.MemberMaps.Count );
Assert.AreEqual( 0, map.ReferenceMaps[0].Data.Mapping.ReferenceMaps.Count );
}

Expand All @@ -23,7 +23,7 @@ public void CircularDependencyWithMultiplePropertiesTest()
{
var config = new CsvHelper.Configuration.Configuration();
var map = config.AutoMap<A>();
Assert.AreEqual( 1, map.PropertyMaps.Count );
Assert.AreEqual( 1, map.MemberMaps.Count );
Assert.AreEqual( 3, map.ReferenceMaps.Count );
}

Expand Down
18 changes: 9 additions & 9 deletions src/CsvHelper.Tests/Configuration/ClassMapBuilderTests.cs
View file
Expand Up @@ -60,47 +60,47 @@ public class ClassMapBuilderTests
[TestMethod]
public void ClassMapBuilderAddsPropertyMapsCorrectly()
{
Assert.AreEqual( 5, map.PropertyMaps.Count );//IMappable
Assert.AreEqual( 5, map.MemberMaps.Count );//IMappable
}

[TestMethod]
public void ClassMapBuilderAddsTypeConvertersCorrectly()
{
Assert.AreEqual( typeof( DateTimeConverter ), map.PropertyMaps[2].Data.TypeConverter.GetType() );//2
Assert.AreEqual( typeof( DoubleConverter ), map.PropertyMaps[3].Data.TypeConverter.GetType() );//2
Assert.AreEqual( typeof( DateTimeConverter ), map.MemberMaps[2].Data.TypeConverter.GetType() );//2
Assert.AreEqual( typeof( DoubleConverter ), map.MemberMaps[3].Data.TypeConverter.GetType() );//2
}

[TestMethod]
public void ClassMapBuilderAddsIndexesCorrectly()
{
Assert.AreEqual( 2, map.PropertyMaps[2].Data.Index ); //3
Assert.AreEqual( 2, map.MemberMaps[2].Data.Index ); //3
}

[TestMethod]
public void ClassMapBuilderAddsNamesCorrectly()
{
Assert.AreEqual( "D4", map.PropertyMaps[3].Data.Names.Single() ); //4
Assert.AreEqual( "D4", map.MemberMaps[3].Data.Names.Single() ); //4
}

[TestMethod]
public void ClassMapBuilderAddsNameIndexesCorrectly()
{
Assert.AreEqual( 2, map.PropertyMaps[0].Data.NameIndex ); //5
Assert.AreEqual( 2, map.MemberMaps[0].Data.NameIndex ); //5
}

//this one is kind of hacky, but i'm not sure how else to test it more robustly since the function gets converted to an expression inside the CsvClassMap
[TestMethod]
public void ClassMapBuilderAddsConvertUsingFunctionCorectly()
{
var fakeRow = new BuilderRowFake();
Assert.AreEqual( ConvertExpression( fakeRow ).E, ( map.PropertyMaps[4].Data.ReadingConvertExpression as Expression<Func<IReaderRow, FakeInnerClass>> ).Compile()( fakeRow ).E ); //6
Assert.AreEqual( ConvertExpression( fakeRow ).E, ( map.MemberMaps[4].Data.ReadingConvertExpression as Expression<Func<IReaderRow, FakeInnerClass>> ).Compile()( fakeRow ).E ); //6
}

[TestMethod]
public void ClassMapBuilderAddsDefaultsCorrectly()
{
Assert.AreEqual( "WEW", map.PropertyMaps[0].Data.Default );//7
Assert.AreEqual( 4d, map.PropertyMaps[3].Data.Default );//7
Assert.AreEqual( "WEW", map.MemberMaps[0].Data.Default );//7
Assert.AreEqual( 4d, map.MemberMaps[3].Data.Default );//7
}

private class BuilderRowFake : IReaderRow
Expand Down
10 changes: 5 additions & 5 deletions src/CsvHelper.Tests/CsvClassMappingAutoMapTests.cs
View file
Expand Up @@ -19,11 +19,11 @@ public void Test()
{
var aMap = new AMap();

Assert.AreEqual( 3, aMap.PropertyMaps.Count );
Assert.AreEqual( 0, aMap.PropertyMaps[0].Data.Index );
Assert.AreEqual( 1, aMap.PropertyMaps[1].Data.Index );
Assert.AreEqual( 2, aMap.PropertyMaps[2].Data.Index );
Assert.AreEqual( true, aMap.PropertyMaps[2].Data.Ignore );
Assert.AreEqual( 3, aMap.MemberMaps.Count );
Assert.AreEqual( 0, aMap.MemberMaps[0].Data.Index );
Assert.AreEqual( 1, aMap.MemberMaps[1].Data.Index );
Assert.AreEqual( 2, aMap.MemberMaps[2].Data.Index );
Assert.AreEqual( true, aMap.MemberMaps[2].Data.Ignore );

Assert.AreEqual( 1, aMap.ReferenceMaps.Count );
}
Expand Down
8 changes: 4 additions & 4 deletions src/CsvHelper.Tests/CsvConfigurationTests.cs
View file
Expand Up @@ -36,7 +36,7 @@ public void AddingMappingsWithGenericMethod1Test()
var config = new CsvHelper.Configuration.Configuration();
config.RegisterClassMap<TestClassMappings>();

Assert.AreEqual( 2, config.Maps[typeof( TestClass )].PropertyMaps.Count );
Assert.AreEqual( 2, config.Maps[typeof( TestClass )].MemberMaps.Count );
}

[TestMethod]
Expand All @@ -45,7 +45,7 @@ public void AddingMappingsWithGenericMethod2Test()
var config = new CsvHelper.Configuration.Configuration();
config.RegisterClassMap<TestClassMappings>();

Assert.AreEqual( 2, config.Maps[typeof( TestClass )].PropertyMaps.Count );
Assert.AreEqual( 2, config.Maps[typeof( TestClass )].MemberMaps.Count );
}

[TestMethod]
Expand All @@ -54,7 +54,7 @@ public void AddingMappingsWithNonGenericMethodTest()
var config = new CsvHelper.Configuration.Configuration();
config.RegisterClassMap( typeof( TestClassMappings ) );

Assert.AreEqual( 2, config.Maps[typeof( TestClass )].PropertyMaps.Count );
Assert.AreEqual( 2, config.Maps[typeof( TestClass )].MemberMaps.Count );
}

[TestMethod]
Expand All @@ -63,7 +63,7 @@ public void AddingMappingsWithInstanceMethodTest()
var config = new CsvHelper.Configuration.Configuration();
config.RegisterClassMap( new TestClassMappings() );

Assert.AreEqual( 2, config.Maps[typeof( TestClass )].PropertyMaps.Count );
Assert.AreEqual( 2, config.Maps[typeof( TestClass )].MemberMaps.Count );
}

[TestMethod]
Expand Down
2 changes: 1 addition & 1 deletion src/CsvHelper.Tests/CsvReaderTests.cs
View file
Expand Up @@ -1094,7 +1094,7 @@ public TestRecordDuplicateHeaderNamesMap()

private class TestTypeConverter : DefaultTypeConverter
{
public override object ConvertFromString( string text, IReaderRow row, PropertyMapData propertyMapData )
public override object ConvertFromString( string text, IReaderRow row, MemberMapData propertyMapData )
{
return "test";
}
Expand Down
4 changes: 2 additions & 2 deletions src/CsvHelper.Tests/CsvWriterTests.cs
View file
Expand Up @@ -924,12 +924,12 @@ public TestRecordNoIndexesMap()

private class TestTypeConverter : ITypeConverter
{
public string ConvertToString( object value, IWriterRow row, PropertyMapData propertyMapData )
public string ConvertToString( object value, IWriterRow row, MemberMapData propertyMapData )
{
return "test";
}

public object ConvertFromString( string text, IReaderRow row, PropertyMapData propertyMapData )
public object ConvertFromString( string text, IReaderRow row, MemberMapData propertyMapData )
{
throw new NotImplementedException();
}
Expand Down
2 changes: 1 addition & 1 deletion src/CsvHelper.Tests/MappingInheritedClassTests.cs
View file
Expand Up @@ -18,7 +18,7 @@ public class MappingInheritedClassTests
public void Test()
{
var map = new AMap<A>();
Assert.AreEqual( 2, map.PropertyMaps.Count );
Assert.AreEqual( 2, map.MemberMaps.Count );
}

private interface IA
Expand Down
80 changes: 40 additions & 40 deletions src/CsvHelper.Tests/Mappings/CsvClassMappingTests.cs
View file
Expand Up @@ -19,19 +19,19 @@ public void MapTest()
var map = new TestMappingDefaultClass();
//map.CreateMap();

Assert.AreEqual( 3, map.PropertyMaps.Count );
Assert.AreEqual( 3, map.MemberMaps.Count );

Assert.AreEqual( "GuidColumn", map.PropertyMaps[0].Data.Names.FirstOrDefault() );
Assert.AreEqual( 0, map.PropertyMaps[0].Data.Index );
Assert.AreEqual( typeof( GuidConverter ), map.PropertyMaps[0].Data.TypeConverter.GetType() );
Assert.AreEqual( "GuidColumn", map.MemberMaps[0].Data.Names.FirstOrDefault() );
Assert.AreEqual( 0, map.MemberMaps[0].Data.Index );
Assert.AreEqual( typeof( GuidConverter ), map.MemberMaps[0].Data.TypeConverter.GetType() );

Assert.AreEqual( "IntColumn", map.PropertyMaps[1].Data.Names.FirstOrDefault() );
Assert.AreEqual( 1, map.PropertyMaps[1].Data.Index );
Assert.AreEqual( typeof( Int32Converter ), map.PropertyMaps[1].Data.TypeConverter.GetType() );
Assert.AreEqual( "IntColumn", map.MemberMaps[1].Data.Names.FirstOrDefault() );
Assert.AreEqual( 1, map.MemberMaps[1].Data.Index );
Assert.AreEqual( typeof( Int32Converter ), map.MemberMaps[1].Data.TypeConverter.GetType() );

Assert.AreEqual( "StringColumn", map.PropertyMaps[2].Data.Names.FirstOrDefault() );
Assert.AreEqual( 2, map.PropertyMaps[2].Data.Index );
Assert.AreEqual( typeof( StringConverter ), map.PropertyMaps[2].Data.TypeConverter.GetType() );
Assert.AreEqual( "StringColumn", map.MemberMaps[2].Data.Names.FirstOrDefault() );
Assert.AreEqual( 2, map.MemberMaps[2].Data.Index );
Assert.AreEqual( typeof( StringConverter ), map.MemberMaps[2].Data.TypeConverter.GetType() );
}

[TestMethod]
Expand All @@ -40,11 +40,11 @@ public void MapNameTest()
var map = new TestMappingNameClass();
//map.CreateMap();

Assert.AreEqual( 3, map.PropertyMaps.Count );
Assert.AreEqual( 3, map.MemberMaps.Count );

Assert.AreEqual( "Guid Column", map.PropertyMaps[0].Data.Names.FirstOrDefault() );
Assert.AreEqual( "Int Column", map.PropertyMaps[1].Data.Names.FirstOrDefault() );
Assert.AreEqual( "String Column", map.PropertyMaps[2].Data.Names.FirstOrDefault() );
Assert.AreEqual( "Guid Column", map.MemberMaps[0].Data.Names.FirstOrDefault() );
Assert.AreEqual( "Int Column", map.MemberMaps[1].Data.Names.FirstOrDefault() );
Assert.AreEqual( "String Column", map.MemberMaps[2].Data.Names.FirstOrDefault() );
}

[TestMethod]
Expand All @@ -53,11 +53,11 @@ public void MapIndexTest()
var map = new TestMappingIndexClass();
//map.CreateMap();

Assert.AreEqual( 3, map.PropertyMaps.Count );
Assert.AreEqual( 3, map.MemberMaps.Count );

Assert.AreEqual( 2, map.PropertyMaps[0].Data.Index );
Assert.AreEqual( 3, map.PropertyMaps[1].Data.Index );
Assert.AreEqual( 1, map.PropertyMaps[2].Data.Index );
Assert.AreEqual( 2, map.MemberMaps[0].Data.Index );
Assert.AreEqual( 3, map.MemberMaps[1].Data.Index );
Assert.AreEqual( 1, map.MemberMaps[2].Data.Index );
}

[TestMethod]
Expand All @@ -66,11 +66,11 @@ public void MapIgnoreTest()
var map = new TestMappingIngoreClass();
//map.CreateMap();

Assert.AreEqual( 3, map.PropertyMaps.Count );
Assert.AreEqual( 3, map.MemberMaps.Count );

Assert.IsTrue( map.PropertyMaps[0].Data.Ignore );
Assert.IsFalse( map.PropertyMaps[1].Data.Ignore );
Assert.IsTrue( map.PropertyMaps[2].Data.Ignore );
Assert.IsTrue( map.MemberMaps[0].Data.Ignore );
Assert.IsFalse( map.MemberMaps[1].Data.Ignore );
Assert.IsTrue( map.MemberMaps[2].Data.Ignore );
}

[TestMethod]
Expand All @@ -79,11 +79,11 @@ public void MapTypeConverterTest()
var map = new TestMappingTypeConverterClass();
//map.CreateMap();

Assert.AreEqual( 3, map.PropertyMaps.Count );
Assert.AreEqual( 3, map.MemberMaps.Count );

Assert.IsInstanceOfType( map.PropertyMaps[0].Data.TypeConverter, typeof( Int16Converter ) );
Assert.IsInstanceOfType( map.PropertyMaps[1].Data.TypeConverter, typeof( StringConverter ) );
Assert.IsInstanceOfType( map.PropertyMaps[2].Data.TypeConverter, typeof( Int64Converter ) );
Assert.IsInstanceOfType( map.MemberMaps[0].Data.TypeConverter, typeof( Int16Converter ) );
Assert.IsInstanceOfType( map.MemberMaps[1].Data.TypeConverter, typeof( StringConverter ) );
Assert.IsInstanceOfType( map.MemberMaps[2].Data.TypeConverter, typeof( Int64Converter ) );
}

[TestMethod]
Expand All @@ -92,23 +92,23 @@ public void MapMultipleNamesTest()
var map = new TestMappingMultipleNamesClass();
//map.CreateMap();

Assert.AreEqual( 3, map.PropertyMaps.Count );
Assert.AreEqual( 3, map.MemberMaps.Count );

Assert.AreEqual( 3, map.PropertyMaps[0].Data.Names.Count );
Assert.AreEqual( 3, map.PropertyMaps[1].Data.Names.Count );
Assert.AreEqual( 3, map.PropertyMaps[2].Data.Names.Count );
Assert.AreEqual( 3, map.MemberMaps[0].Data.Names.Count );
Assert.AreEqual( 3, map.MemberMaps[1].Data.Names.Count );
Assert.AreEqual( 3, map.MemberMaps[2].Data.Names.Count );

Assert.AreEqual("guid1", map.PropertyMaps[0].Data.Names[0]);
Assert.AreEqual("guid2", map.PropertyMaps[0].Data.Names[1]);
Assert.AreEqual("guid3", map.PropertyMaps[0].Data.Names[2]);
Assert.AreEqual("guid1", map.MemberMaps[0].Data.Names[0]);
Assert.AreEqual("guid2", map.MemberMaps[0].Data.Names[1]);
Assert.AreEqual("guid3", map.MemberMaps[0].Data.Names[2]);

Assert.AreEqual("int1", map.PropertyMaps[1].Data.Names[0]);
Assert.AreEqual("int2", map.PropertyMaps[1].Data.Names[1]);
Assert.AreEqual("int3", map.PropertyMaps[1].Data.Names[2]);
Assert.AreEqual("int1", map.MemberMaps[1].Data.Names[0]);
Assert.AreEqual("int2", map.MemberMaps[1].Data.Names[1]);
Assert.AreEqual("int3", map.MemberMaps[1].Data.Names[2]);

Assert.AreEqual("string1", map.PropertyMaps[2].Data.Names[0]);
Assert.AreEqual("string2", map.PropertyMaps[2].Data.Names[1]);
Assert.AreEqual("string3", map.PropertyMaps[2].Data.Names[2]);
Assert.AreEqual("string1", map.MemberMaps[2].Data.Names[0]);
Assert.AreEqual("string2", map.MemberMaps[2].Data.Names[1]);
Assert.AreEqual("string3", map.MemberMaps[2].Data.Names[2]);
}

[TestMethod]
Expand Down Expand Up @@ -138,7 +138,7 @@ public void PropertyMapAccessTest()
config.RegisterClassMap<AMap>();
config.Maps.Find<A>().Map( m => m.AId ).Ignore();

Assert.AreEqual( true, config.Maps[typeof( A )].PropertyMaps[0].Data.Ignore );
Assert.AreEqual( true, config.Maps[typeof( A )].MemberMaps[0].Data.Ignore );
}

private class A
Expand Down
2 changes: 1 addition & 1 deletion src/CsvHelper.Tests/Mappings/FieldMappingTests.cs
View file
Expand Up @@ -370,7 +370,7 @@ public APrivateMap()
{
var options = new AutoMapOptions
{
IncludePrivateProperties = true,
IncludePrivateMembers = true,
MemberTypes = MemberTypes.Fields
};
AutoMap( options );
Expand Down
2 changes: 1 addition & 1 deletion src/CsvHelper.Tests/Mappings/ReferenceConstructorArgsTests.cs
View file
Expand Up @@ -18,7 +18,7 @@ public class ReferenceConstructorArgsTests
public void Test()
{
var map = new AMap( "A Field" );
var name = map.ReferenceMaps[0].Data.Mapping.PropertyMaps.Find<B>( m => m.Name ).Data.Names[0];
var name = map.ReferenceMaps[0].Data.Mapping.MemberMaps.Find<B>( m => m.Name ).Data.Names[0];
Assert.AreEqual( "B Field", name );
}

Expand Down
6 changes: 3 additions & 3 deletions src/CsvHelper.Tests/TypeConversion/ArrayConverterTests.cs
View file
Expand Up @@ -31,7 +31,7 @@ public void ReadConvertNoIndexEndTest()
rowMock.Setup( m => m.Configuration ).Returns( config );
rowMock.Setup( m => m.Context ).Returns( context );
rowMock.Setup( m => m.GetField( It.IsAny<Type>(), It.IsAny<int>() ) ).Returns<Type, int>( ( type, index ) => Convert.ToInt32( currentRecord[index] ) );
var data = new PropertyMapData( typeof( Test ).GetTypeInfo().GetProperty( "List" ) )
var data = new MemberMapData( typeof( Test ).GetTypeInfo().GetProperty( "List" ) )
{
Index = 2,
TypeConverterOptions = { CultureInfo = CultureInfo.CurrentCulture }
Expand Down Expand Up @@ -60,7 +60,7 @@ public void ReadConvertWithIndexEndTest()
rowMock.Setup( m => m.Configuration ).Returns( config );
rowMock.Setup( m => m.Context ).Returns( context );
rowMock.Setup( m => m.GetField( It.IsAny<Type>(), It.IsAny<int>() ) ).Returns<Type, int>( ( type, index ) => Convert.ToInt32( currentRecord[index] ) );
var data = new PropertyMapData( typeof( Test ).GetProperty( "List" ) )
var data = new MemberMapData( typeof( Test ).GetProperty( "List" ) )
{
Index = 2,
IndexEnd = 3,
Expand All @@ -85,7 +85,7 @@ public void WriteConvertTest()

var array = new[] { 1, 2, 3 };

var data = new PropertyMapData( typeof( Test ).GetProperty( "List" ) )
var data = new MemberMapData( typeof( Test ).GetProperty( "List" ) )
{
Index = 2,
IndexEnd = 3,
Expand Down
4 changes: 2 additions & 2 deletions src/CsvHelper.Tests/TypeConversion/BooleanConverterTests.cs
View file
Expand Up @@ -19,7 +19,7 @@ public void ConvertToStringTest()
{
var converter = new BooleanConverter();

var propertyMapData = new PropertyMapData( null )
var propertyMapData = new MemberMapData( null )
{
TypeConverter = converter,
TypeConverterOptions = { CultureInfo = CultureInfo.CurrentCulture }
Expand All @@ -38,7 +38,7 @@ public void ConvertFromStringTest()
{
var converter = new BooleanConverter();

var propertyMapData = new PropertyMapData( null );
var propertyMapData = new MemberMapData( null );
propertyMapData.TypeConverterOptions.CultureInfo = CultureInfo.CurrentCulture;

var mockRow = new Mock<IReaderRow>();
Expand Down

0 comments on commit 98f3b8b

Please sign in to comment.