From 3aea6a06ed9bcee8c4b869dc6ce74ce80f9edc2b Mon Sep 17 00:00:00 2001 From: Josh Close Date: Fri, 26 Jan 2024 09:55:07 -0600 Subject: [PATCH] Changed name of CsvConfiguration.FromType to FromAttributes. --- .../Attributes/CultureInfoAttribute.cs | 2 +- .../Configuration/CsvConfiguration.cs | 24 +++++++++---------- .../Mappings/Attribute/AllowCommentsTests.cs | 4 ++-- .../Mappings/Attribute/BufferSizeTests.cs | 2 +- .../Mappings/Attribute/CacheFieldsTests.cs | 4 ++-- .../Mappings/Attribute/CommentTests.cs | 2 +- .../Mappings/Attribute/CountBytesTest.cs | 4 ++-- .../Mappings/Attribute/DelimiterTests.cs | 2 +- .../DetectColumnCountChangesTests.cs | 4 ++-- .../Attribute/DetectDelimiterTests.cs | 4 ++-- .../Attribute/DetectDelimiterValuesTests.cs | 2 +- .../Mappings/Attribute/EncodingTests.cs | 4 ++-- .../Mappings/Attribute/EscapeTests.cs | 2 +- .../ExceptionMessagesContainRawDataTests.cs | 4 ++-- .../Attribute/HasHeaderRecordTests.cs | 4 ++-- .../Attribute/IgnoreBlankLinesTests.cs | 4 ++-- .../Attribute/IgnoreReferencesTests.cs | 4 ++-- .../Attribute/IncludePrivateMembersTests.cs | 4 ++-- .../Attribute/InjectionCharactersTests.cs | 2 +- .../InjectionEscapeCharacterTests.cs | 2 +- .../Attribute/InjectionOptionsTests.cs | 2 +- .../LineBreakInQuotedFieldIsBadDataTests.cs | 4 ++-- .../Mappings/Attribute/MaxFieldSizeTests.cs | 2 +- .../Mappings/Attribute/MemberTypesTests.cs | 2 +- .../Mappings/Attribute/ModeTests.cs | 2 +- .../Mappings/Attribute/NewLineTests.cs | 2 +- .../Attribute/ProcessFieldBufferSizeTests.cs | 2 +- .../Mappings/Attribute/QuoteTests.cs | 2 +- .../Mappings/Attribute/TrimOptionsTests.cs | 2 +- ...seNewObjectForNullReferenceMembersTests.cs | 4 ++-- .../Attribute/WhiteSpaceCharsTests.cs | 2 +- .../CultureInfoAttributeTests.cs | 18 +++++++------- 32 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/CsvHelper/Configuration/Attributes/CultureInfoAttribute.cs b/src/CsvHelper/Configuration/Attributes/CultureInfoAttribute.cs index 9ebbffe2d..e91528a77 100644 --- a/src/CsvHelper/Configuration/Attributes/CultureInfoAttribute.cs +++ b/src/CsvHelper/Configuration/Attributes/CultureInfoAttribute.cs @@ -11,7 +11,7 @@ namespace CsvHelper.Configuration.Attributes /// When applied to a member, specifies the /// used when type converting the member. When applied to a type, the value of /// in the - /// returned by + /// returned by /// [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Class, AllowMultiple = false, Inherited = true)] public class CultureInfoAttribute : Attribute, IClassMapper, IMemberMapper, IParameterMapper diff --git a/src/CsvHelper/Configuration/CsvConfiguration.cs b/src/CsvHelper/Configuration/CsvConfiguration.cs index 3fe42e421..a0b83a2e3 100644 --- a/src/CsvHelper/Configuration/CsvConfiguration.cs +++ b/src/CsvHelper/Configuration/CsvConfiguration.cs @@ -264,9 +264,9 @@ public CsvConfiguration ApplyAttributes(Type type) /// If is not annotated with . /// If the argument to the is . /// If the argument to the does not specify a supported culture. - public static CsvConfiguration FromType() + public static CsvConfiguration FromAttributes() { - return FromType(typeof(T)); + return FromAttributes(typeof(T)); } /// @@ -274,13 +274,13 @@ public static CsvConfiguration FromType() /// and CsvHelper attributes applied to at the type-level. /// This method ignores any applied to . /// - /// + /// /// The to configure the returned with. /// A new instance configured with and attributes applied to . - /// - public static CsvConfiguration FromType(CultureInfo cultureInfo) + /// + public static CsvConfiguration FromAttributes(CultureInfo cultureInfo) { - return FromType(typeof(T), cultureInfo); + return FromAttributes(typeof(T), cultureInfo); } /// @@ -288,7 +288,7 @@ public static CsvConfiguration FromType(CultureInfo cultureInfo) /// to at the type-level. This method requires to /// be annotated with (or to sub-class a type which is). /// - /// + /// /// A new instance configured with attributes applied to . /// /// CsvHelper attributes applied to members and parameters do not influence the return value of this method. @@ -298,7 +298,7 @@ public static CsvConfiguration FromType(CultureInfo cultureInfo) /// If is not annotated with . /// If the argument to the is . /// If the argument to the does not specify a supported culture. - public static CsvConfiguration FromType(Type type) + public static CsvConfiguration FromAttributes(Type type) { var cultureInfoAttribute = (CultureInfoAttribute)Attribute.GetCustomAttribute(type, typeof(CultureInfoAttribute)); if (cultureInfoAttribute == null) @@ -317,11 +317,11 @@ public static CsvConfiguration FromType(Type type) /// and CsvHelper attributes applied to at the type-level. /// This method ignores any applied to . /// - /// - /// + /// + /// /// A new instance configured with and attributes applied to - /// - public static CsvConfiguration FromType(Type type, CultureInfo cultureInfo) + /// + public static CsvConfiguration FromAttributes(Type type, CultureInfo cultureInfo) { var config = new CsvConfiguration(cultureInfo); config.ApplyAttributes(type); diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/AllowCommentsTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/AllowCommentsTests.cs index 8d027c815..4a575f69e 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/AllowCommentsTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/AllowCommentsTests.cs @@ -14,8 +14,8 @@ public class AllowCommentsTests [Fact] public void AllowCommentsTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).AllowComments); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).AllowComments); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).AllowComments); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).AllowComments); } [AllowComments] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/BufferSizeTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/BufferSizeTests.cs index ab0c5b317..286935b89 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/BufferSizeTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/BufferSizeTests.cs @@ -19,7 +19,7 @@ public class BufferSizeTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(2, config.BufferSize); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/CacheFieldsTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/CacheFieldsTests.cs index 895b2ac3d..433e28c53 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/CacheFieldsTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/CacheFieldsTests.cs @@ -14,8 +14,8 @@ public class CacheFieldsTests [Fact] public void ConstructorAttributeTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).CacheFields); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).CacheFields); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).CacheFields); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).CacheFields); } [CacheFields] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/CommentTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/CommentTests.cs index 986db38fa..6ab479203 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/CommentTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/CommentTests.cs @@ -16,7 +16,7 @@ public class CommentTests [Fact] public void CommentTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal('x', config.Comment); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/CountBytesTest.cs b/tests/CsvHelper.Tests/Mappings/Attribute/CountBytesTest.cs index 1425116a3..fb1366657 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/CountBytesTest.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/CountBytesTest.cs @@ -14,8 +14,8 @@ public class CountBytesTest [Fact] public void ConstructorAttributeTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).CountBytes); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).CountBytes); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).CountBytes); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).CountBytes); } [CountBytes] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/DelimiterTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/DelimiterTests.cs index 2a81a72c7..75c6983c2 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/DelimiterTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/DelimiterTests.cs @@ -16,7 +16,7 @@ public class DelimiterTests [Fact] public void DelimiterReaderTest() { - var configuration = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var configuration = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal("ยง", configuration.Delimiter); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/DetectColumnCountChangesTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/DetectColumnCountChangesTests.cs index 104f1b2c8..a00949b2f 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/DetectColumnCountChangesTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/DetectColumnCountChangesTests.cs @@ -14,8 +14,8 @@ public class DetectColumnCountChangesTests [Fact] public void ConstructorAttributeTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).DetectColumnCountChanges); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).DetectColumnCountChanges); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).DetectColumnCountChanges); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).DetectColumnCountChanges); } [DetectColumnCountChanges] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/DetectDelimiterTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/DetectDelimiterTests.cs index 046d16ce7..e7cbfdce6 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/DetectDelimiterTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/DetectDelimiterTests.cs @@ -14,8 +14,8 @@ public class DetectDelimiterTests [Fact] public void ConstructorAttributeTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).DetectDelimiter); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).DetectDelimiter); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).DetectDelimiter); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).DetectDelimiter); } [DetectDelimiter] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/DetectDelimiterValuesTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/DetectDelimiterValuesTests.cs index 25a6de00a..0b870dd22 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/DetectDelimiterValuesTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/DetectDelimiterValuesTests.cs @@ -19,7 +19,7 @@ public class DetectDelimiterValuesTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(new[] { "a", "b" }, config.DetectDelimiterValues); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/EncodingTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/EncodingTests.cs index 3e1ac31bc..8619d33be 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/EncodingTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/EncodingTests.cs @@ -15,8 +15,8 @@ public class EncodingTests [Fact] public void EncodingTest() { - Assert.Equal(Encoding.ASCII, CsvConfiguration.FromType(CultureInfo.InvariantCulture).Encoding); - Assert.Equal(Encoding.ASCII, CsvConfiguration.FromType(CultureInfo.InvariantCulture).Encoding); + Assert.Equal(Encoding.ASCII, CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).Encoding); + Assert.Equal(Encoding.ASCII, CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).Encoding); } [Encoding("ASCII")] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/EscapeTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/EscapeTests.cs index 77f3c7440..1d9c41caf 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/EscapeTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/EscapeTests.cs @@ -16,7 +16,7 @@ public class EscapeTests [Fact] public void EscapeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal('x', config.Escape); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/ExceptionMessagesContainRawDataTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/ExceptionMessagesContainRawDataTests.cs index 26673bd98..c29318911 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/ExceptionMessagesContainRawDataTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/ExceptionMessagesContainRawDataTests.cs @@ -14,8 +14,8 @@ public class ExceptionMessagesContainRawDataTests [Fact] public void ConstructorAttributeTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).ExceptionMessagesContainRawData); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).ExceptionMessagesContainRawData); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).ExceptionMessagesContainRawData); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).ExceptionMessagesContainRawData); } [ExceptionMessagesContainRawData] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/HasHeaderRecordTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/HasHeaderRecordTests.cs index 4caebb8b5..c6e2fd4fc 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/HasHeaderRecordTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/HasHeaderRecordTests.cs @@ -14,8 +14,8 @@ public class HasHeaderRecordTests [Fact] public void HasHeaderRecordTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).HasHeaderRecord); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).HasHeaderRecord); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).HasHeaderRecord); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).HasHeaderRecord); } [HasHeaderRecord] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/IgnoreBlankLinesTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/IgnoreBlankLinesTests.cs index 11e687b47..4ae810a95 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/IgnoreBlankLinesTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/IgnoreBlankLinesTests.cs @@ -14,8 +14,8 @@ public class IgnoreBlankLinesTests [Fact] public void IgnoreBlankLinesTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).IgnoreBlankLines); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).IgnoreBlankLines); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).IgnoreBlankLines); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).IgnoreBlankLines); } [IgnoreBlankLines] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/IgnoreReferencesTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/IgnoreReferencesTests.cs index 3d274281c..84de98fb4 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/IgnoreReferencesTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/IgnoreReferencesTests.cs @@ -14,8 +14,8 @@ public class IgnoreReferencesTests [Fact] public void ConstructorAttributeTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).IgnoreReferences); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).IgnoreReferences); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).IgnoreReferences); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).IgnoreReferences); } [IgnoreReferences] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/IncludePrivateMembersTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/IncludePrivateMembersTests.cs index 9fe06fb4b..5cd8919b8 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/IncludePrivateMembersTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/IncludePrivateMembersTests.cs @@ -14,8 +14,8 @@ public class IncludePrivateMembersTests [Fact] public void IncludePrivateMembersTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).IncludePrivateMembers); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).IncludePrivateMembers); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).IncludePrivateMembers); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).IncludePrivateMembers); } [IncludePrivateMembers] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/InjectionCharactersTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/InjectionCharactersTests.cs index c82f16292..c16bf2e4d 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/InjectionCharactersTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/InjectionCharactersTests.cs @@ -19,7 +19,7 @@ public class InjectionCharactersTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(new[] { 'a', 'b' }, config.InjectionCharacters); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/InjectionEscapeCharacterTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/InjectionEscapeCharacterTests.cs index e8c1bbefa..fa1a73a4a 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/InjectionEscapeCharacterTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/InjectionEscapeCharacterTests.cs @@ -19,7 +19,7 @@ public class InjectionEscapeCharacterTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal('a', config.InjectionEscapeCharacter); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/InjectionOptionsTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/InjectionOptionsTests.cs index 7849afdf2..67717b484 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/InjectionOptionsTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/InjectionOptionsTests.cs @@ -19,7 +19,7 @@ public class InjectionOptionsTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(InjectionOptions.Escape, config.InjectionOptions); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/LineBreakInQuotedFieldIsBadDataTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/LineBreakInQuotedFieldIsBadDataTests.cs index 5f7fe2f83..97c691531 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/LineBreakInQuotedFieldIsBadDataTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/LineBreakInQuotedFieldIsBadDataTests.cs @@ -14,8 +14,8 @@ public class LineBreakInQuotedFieldIsBadDataTests [Fact] public void ConstructorAttributeTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).LineBreakInQuotedFieldIsBadData); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).LineBreakInQuotedFieldIsBadData); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).LineBreakInQuotedFieldIsBadData); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).LineBreakInQuotedFieldIsBadData); } [LineBreakInQuotedFieldIsBadData] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/MaxFieldSizeTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/MaxFieldSizeTests.cs index c02f98ddd..bf41b144b 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/MaxFieldSizeTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/MaxFieldSizeTests.cs @@ -14,7 +14,7 @@ public class MaxFieldSizeTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(2, config.MaxFieldSize); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/MemberTypesTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/MemberTypesTests.cs index e30373929..dae9ba6bb 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/MemberTypesTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/MemberTypesTests.cs @@ -14,7 +14,7 @@ public class MemberTypesTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(MemberTypes.Fields, config.MemberTypes); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/ModeTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/ModeTests.cs index 5ce6aecd7..def817673 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/ModeTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/ModeTests.cs @@ -14,7 +14,7 @@ public class ModeTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(CsvMode.Escape, config.Mode); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/NewLineTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/NewLineTests.cs index 46e2d4c53..e90584326 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/NewLineTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/NewLineTests.cs @@ -14,7 +14,7 @@ public class NewLineTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal("a", config.NewLine); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/ProcessFieldBufferSizeTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/ProcessFieldBufferSizeTests.cs index fa1aaa76f..696a70302 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/ProcessFieldBufferSizeTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/ProcessFieldBufferSizeTests.cs @@ -14,7 +14,7 @@ public class ProcessFieldBufferSizeTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(2, config.ProcessFieldBufferSize); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/QuoteTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/QuoteTests.cs index 14f202eca..25a2c222b 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/QuoteTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/QuoteTests.cs @@ -14,7 +14,7 @@ public class QuoteTests [Fact] public void QuoteTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal('x', config.Quote); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/TrimOptionsTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/TrimOptionsTests.cs index b19ff5091..15e6ac1e7 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/TrimOptionsTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/TrimOptionsTests.cs @@ -16,7 +16,7 @@ public class TrimOptionsTests [Fact] public void TrimOptionsTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(TrimOptions.InsideQuotes, config.TrimOptions); } diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/UseNewObjectForNullReferenceMembersTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/UseNewObjectForNullReferenceMembersTests.cs index 110f6ba7a..7ddb56a5b 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/UseNewObjectForNullReferenceMembersTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/UseNewObjectForNullReferenceMembersTests.cs @@ -14,8 +14,8 @@ public class UseNewObjectForNullReferenceMembersTests [Fact] public void ConstructorAttributeTest() { - Assert.True(CsvConfiguration.FromType(CultureInfo.InvariantCulture).UseNewObjectForNullReferenceMembers); - Assert.False(CsvConfiguration.FromType(CultureInfo.InvariantCulture).UseNewObjectForNullReferenceMembers); + Assert.True(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).UseNewObjectForNullReferenceMembers); + Assert.False(CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture).UseNewObjectForNullReferenceMembers); } [UseNewObjectForNullReferenceMembers] diff --git a/tests/CsvHelper.Tests/Mappings/Attribute/WhiteSpaceCharsTests.cs b/tests/CsvHelper.Tests/Mappings/Attribute/WhiteSpaceCharsTests.cs index aebae8b83..b6a165a80 100644 --- a/tests/CsvHelper.Tests/Mappings/Attribute/WhiteSpaceCharsTests.cs +++ b/tests/CsvHelper.Tests/Mappings/Attribute/WhiteSpaceCharsTests.cs @@ -14,7 +14,7 @@ public class WhiteSpaceCharsTests [Fact] public void ConstructorAttributeTest() { - var config = CsvConfiguration.FromType(CultureInfo.InvariantCulture); + var config = CsvConfiguration.FromAttributes(CultureInfo.InvariantCulture); Assert.Equal(new[] { 'a', 'b' }, config.WhiteSpaceChars); } diff --git a/tests/CsvHelper.Tests/Mappings/ConstructorParameter/CultureInfoAttributeTests.cs b/tests/CsvHelper.Tests/Mappings/ConstructorParameter/CultureInfoAttributeTests.cs index 873c35ebe..a32988fa8 100644 --- a/tests/CsvHelper.Tests/Mappings/ConstructorParameter/CultureInfoAttributeTests.cs +++ b/tests/CsvHelper.Tests/Mappings/ConstructorParameter/CultureInfoAttributeTests.cs @@ -21,7 +21,7 @@ public class CultureInfoAttributeTests [Fact] public void AutoMap_WithCultureInfoAttributes_ConfiguresParameterMaps() { - var config = CsvConfiguration.FromType(); + var config = CsvConfiguration.FromAttributes(); var context = new CsvContext(config); var map = context.AutoMap(); @@ -35,7 +35,7 @@ public void AutoMap_WithCultureInfoAttributes_ConfiguresParameterMaps() [Fact] public void AutoMap_WithCultureInfoAttributes_ConfiguresMemberMaps() { - var config = CsvConfiguration.FromType(); + var config = CsvConfiguration.FromAttributes(); var context = new CsvContext(config); var map = context.AutoMap(); @@ -102,7 +102,7 @@ public void WriteRecords_WithCultureInfoAttributes_DoesUseMemberMaps() }; using (var writer = new StringWriter()) - using (var csv = new CsvWriter(writer, CsvConfiguration.FromType())) + using (var csv = new CsvWriter(writer, CsvConfiguration.FromAttributes())) { csv.WriteRecords(records); @@ -154,37 +154,37 @@ public void CsvConfiguration_FromTypeWithParameter_IgnoresAttribute() // First just validate we have an attribute to ignore Assert.Equal(new CultureInfo("en-GB"), ((CultureInfoAttribute)System.Attribute.GetCustomAttribute(typeof(Foo2), typeof(CultureInfoAttribute))).CultureInfo); - Assert.Equal(new CultureInfo("es-ES"), CsvConfiguration.FromType(CultureInfo.GetCultureInfo("es-ES")).CultureInfo); + Assert.Equal(new CultureInfo("es-ES"), CsvConfiguration.FromAttributes(CultureInfo.GetCultureInfo("es-ES")).CultureInfo); } [Fact] public void CsvConfiguration_FromType_NoAttribute_ThrowsConfigurationException() { - Assert.Throws(CsvConfiguration.FromType); + Assert.Throws(CsvConfiguration.FromAttributes); } [Fact] public void CsvConfiguration_FromType_NullAttribute_ThrowsArgumentNullException() { - Assert.Throws(CsvConfiguration.FromType); + Assert.Throws(CsvConfiguration.FromAttributes); } [Fact] public void CsvConfiguration_FromType_InvalidAttribute_ThrowsCultureNotFoundException() { - Assert.Throws(CsvConfiguration.FromType); + Assert.Throws(CsvConfiguration.FromAttributes); } [Fact] public void CsvConfiguration_FromType_DerivedNoAttribute_TakesBaseClassValue() { - Assert.Equal(new CultureInfo("en-GB"), CsvConfiguration.FromType().CultureInfo); + Assert.Equal(new CultureInfo("en-GB"), CsvConfiguration.FromAttributes().CultureInfo); } [Fact] public void CsvConfiguration_FromType_DerivedWithAttribute_TakesDerviedClassValue() { - Assert.Equal(CultureInfo.CurrentCulture, CsvConfiguration.FromType().CultureInfo); + Assert.Equal(CultureInfo.CurrentCulture, CsvConfiguration.FromAttributes().CultureInfo); } private class NoAttribute