Some formatting cleanup

This commit is contained in:
Shay Rojansky
2022-05-17 14:50:02 +02:00
parent d876e7e4ca
commit 512cd9d0a7
8 changed files with 37 additions and 38 deletions

View File

@@ -1,6 +1,3 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;

View File

@@ -7,27 +7,22 @@ namespace EFCore.NamingConventions.Test;
public class RewriterTest public class RewriterTest
{ {
[Fact] [Fact]
public void SnakeCase() public void Snake_case()
=> Assert.Equal("full_name", => Assert.Equal("full_name", new SnakeCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
new SnakeCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
[Fact] [Fact]
public void UpperSnakeCase() public void Upper_snake_case()
=> Assert.Equal("FULL_NAME", => Assert.Equal("FULL_NAME", new UpperSnakeCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
new UpperSnakeCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
[Fact] [Fact]
public void LowerCase() public void Lower_case()
=> Assert.Equal("fullname", => Assert.Equal("fullname", new LowerCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
new LowerCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
[Fact] [Fact]
public void CamelCase() public void Camel_case()
=> Assert.Equal("fullName", => Assert.Equal("fullName", new CamelCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
new CamelCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
[Fact] [Fact]
public void UpperCase() public void Upper_case()
=> Assert.Equal("FULLNAME", => Assert.Equal("FULLNAME", new UpperCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
new UpperCaseNameRewriter(CultureInfo.InvariantCulture).RewriteName("FullName"));
} }

View File

@@ -1,6 +1,3 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.Data.Sqlite; using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Diagnostics;
using Microsoft.EntityFrameworkCore.Sqlite.Diagnostics.Internal; using Microsoft.EntityFrameworkCore.Sqlite.Diagnostics.Internal;

View File

@@ -6,8 +6,9 @@ public class CamelCaseNameRewriter : INameRewriter
{ {
private readonly CultureInfo _culture; private readonly CultureInfo _culture;
public CamelCaseNameRewriter(CultureInfo culture) => _culture = culture; public CamelCaseNameRewriter(CultureInfo culture)
=> _culture = culture;
public string RewriteName(string name) => public string RewriteName(string name)
string.IsNullOrEmpty(name) ? name: char.ToLower(name[0], _culture) + name.Substring(1); => string.IsNullOrEmpty(name) ? name: char.ToLower(name[0], _culture) + name.Substring(1);
} }

View File

@@ -6,6 +6,9 @@ public class LowerCaseNameRewriter : INameRewriter
{ {
private readonly CultureInfo _culture; private readonly CultureInfo _culture;
public LowerCaseNameRewriter(CultureInfo culture) => _culture = culture; public LowerCaseNameRewriter(CultureInfo culture)
public string RewriteName(string name) => name.ToLower(_culture); => _culture = culture;
public string RewriteName(string name)
=> name.ToLower(_culture);
} }

View File

@@ -8,7 +8,8 @@ public class SnakeCaseNameRewriter : INameRewriter
{ {
private readonly CultureInfo _culture; private readonly CultureInfo _culture;
public SnakeCaseNameRewriter(CultureInfo culture) => _culture = culture; public SnakeCaseNameRewriter(CultureInfo culture)
=> _culture = culture;
public virtual string RewriteName(string name) public virtual string RewriteName(string name)
{ {

View File

@@ -6,6 +6,9 @@ public class UpperCaseNameRewriter : INameRewriter
{ {
private readonly CultureInfo _culture; private readonly CultureInfo _culture;
public UpperCaseNameRewriter(CultureInfo culture) => _culture = culture; public UpperCaseNameRewriter(CultureInfo culture)
public string RewriteName(string name) => name.ToUpper(_culture); => _culture = culture;
public string RewriteName(string name)
=> name.ToUpper(_culture);
} }

View File

@@ -6,7 +6,9 @@ public class UpperSnakeCaseNameRewriter : SnakeCaseNameRewriter
{ {
private readonly CultureInfo _culture; private readonly CultureInfo _culture;
public UpperSnakeCaseNameRewriter(CultureInfo culture) : base(culture) => _culture = culture; public UpperSnakeCaseNameRewriter(CultureInfo culture) : base(culture)
=> _culture = culture;
public override string RewriteName(string name) => base.RewriteName(name).ToUpper(_culture); public override string RewriteName(string name)
=> base.RewriteName(name).ToUpper(_culture);
} }