diff --git a/README.md b/README.md index 573f0b1ce0b..844ff27d042 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ InMemory (for testing) | `Microsoft.EntityFrameworkCore.InMemory` | [![NuGet](h ## Project Wiki -More details about our project, like our release [roadmap](https://docs.microsoft.com/ef/core/what-is-new/roadmap), or [how to get and build our code](https://github.com/aspnet/EntityFrameworkCore/wiki/getting-and-building-the-code), are located in our our [project wiki](https://github.com/aspnet/EntityFrameworkCore/wiki/). +More details about our project, like our release [roadmap](https://docs.microsoft.com/ef/core/what-is-new/roadmap), or [how to get and build our code](https://github.com/aspnet/EntityFrameworkCore/wiki/getting-and-building-the-code), are located in our [project wiki](https://github.com/aspnet/EntityFrameworkCore/wiki/). ## Building from source diff --git a/benchmark/EFCore.SqlServer.EF6.Benchmarks/Initialization/InitializationTests.cs b/benchmark/EFCore.SqlServer.EF6.Benchmarks/Initialization/InitializationTests.cs index 607ff27bf6d..dfab8c9c3a7 100644 --- a/benchmark/EFCore.SqlServer.EF6.Benchmarks/Initialization/InitializationTests.cs +++ b/benchmark/EFCore.SqlServer.EF6.Benchmarks/Initialization/InitializationTests.cs @@ -108,7 +108,7 @@ public virtual void InitializeAndSaveChanges_AdventureWorks(int count) { context.SaveChanges(); - // TODO: Don't mesure transaction rollback + // TODO: Don't measure transaction rollback } } } diff --git a/benchmark/Shared.EFCore/Initialization/ColdStartEnabledTests.cs b/benchmark/Shared.EFCore/Initialization/ColdStartEnabledTests.cs index d9788431252..6830d374343 100644 --- a/benchmark/Shared.EFCore/Initialization/ColdStartEnabledTests.cs +++ b/benchmark/Shared.EFCore/Initialization/ColdStartEnabledTests.cs @@ -53,7 +53,7 @@ public void InitializeAndSaveChanges_AdventureWorks(int count) { context.SaveChanges(); - // TODO: Don't mesure transaction rollback + // TODO: Don't measure transaction rollback } } } diff --git a/eng/common/SigningValidation.proj b/eng/common/SigningValidation.proj index 7045fb6fb9d..44b8bd844b9 100644 --- a/eng/common/SigningValidation.proj +++ b/eng/common/SigningValidation.proj @@ -1,13 +1,13 @@ - - - + diff --git a/src/EFCore.Cosmos/Query/Pipeline/SqlExpression.cs b/src/EFCore.Cosmos/Query/Pipeline/SqlExpression.cs index d606168eff3..fb224c3ee8e 100644 --- a/src/EFCore.Cosmos/Query/Pipeline/SqlExpression.cs +++ b/src/EFCore.Cosmos/Query/Pipeline/SqlExpression.cs @@ -21,7 +21,7 @@ protected SqlExpression(Type type, CoreTypeMapping typeMapping) public CoreTypeMapping TypeMapping { get; } protected override Expression VisitChildren(ExpressionVisitor visitor) - => throw new InvalidOperationException("VisitChildren must be overriden in class deriving from SqlExpression"); + => throw new InvalidOperationException("VisitChildren must be overridden in class deriving from SqlExpression"); public override ExpressionType NodeType => ExpressionType.Extension; public abstract void Print(ExpressionPrinter expressionPrinter); diff --git a/src/EFCore.Relational/Diagnostics/RelationalLoggerExtensions.cs b/src/EFCore.Relational/Diagnostics/RelationalLoggerExtensions.cs index 126cf071e8f..0ff070e2cd7 100644 --- a/src/EFCore.Relational/Diagnostics/RelationalLoggerExtensions.cs +++ b/src/EFCore.Relational/Diagnostics/RelationalLoggerExtensions.cs @@ -27,7 +27,7 @@ namespace Microsoft.EntityFrameworkCore.Diagnostics { /// /// - /// This class contains static methods used by EF Core internals and relationl database providers to + /// This class contains static methods used by EF Core internals and relational database providers to /// write information to an and a for /// well-known events. /// @@ -2669,7 +2669,7 @@ public static void TransactionError( { var definition = RelationalResources.LogTransactionError(diagnostics); - LogTransactionErrror(diagnostics, exception, definition); + LogTransactionError(diagnostics, exception, definition); var diagnosticSourceEnabled = diagnostics.DiagnosticSource.IsEnabled(definition.EventId.Name); var interceptor = diagnostics.Interceptors?.Resolve(); @@ -2720,7 +2720,7 @@ public static Task TransactionErrorAsync( { var definition = RelationalResources.LogTransactionError(diagnostics); - LogTransactionErrror(diagnostics, exception, definition); + LogTransactionError(diagnostics, exception, definition); var diagnosticSourceEnabled = diagnostics.DiagnosticSource.IsEnabled(definition.EventId.Name); var interceptor = diagnostics.Interceptors?.Resolve(); @@ -2784,7 +2784,7 @@ private static TransactionErrorEventData BroadcastTransactionError( return eventData; } - private static void LogTransactionErrror( + private static void LogTransactionError( IDiagnosticsLogger diagnostics, Exception exception, EventDefinition definition) diff --git a/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs b/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs index 74deabc19b7..1f08eab9537 100644 --- a/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs +++ b/src/EFCore.Relational/Migrations/Internal/MigrationsModelDiffer.cs @@ -574,7 +574,7 @@ private IEnumerable DiffAnnotations( [NotNull] TableMapping source, [NotNull] TableMapping target) { - // Validation should ensure that all the relevant annotations for the colocated entity types are the same + // Validation should ensure that all the relevant annotations for the collocated entity types are the same var sourceMigrationsAnnotations = MigrationsAnnotations.For(source.EntityTypes[0]).ToList(); var targetMigrationsAnnotations = MigrationsAnnotations.For(target.EntityTypes[0]).ToList(); if (HasDifferences(sourceMigrationsAnnotations, targetMigrationsAnnotations)) diff --git a/src/EFCore.Relational/Migrations/MigrationsSqlGenerator.cs b/src/EFCore.Relational/Migrations/MigrationsSqlGenerator.cs index 95da47d5133..6268ef2b8c7 100644 --- a/src/EFCore.Relational/Migrations/MigrationsSqlGenerator.cs +++ b/src/EFCore.Relational/Migrations/MigrationsSqlGenerator.cs @@ -1423,7 +1423,7 @@ protected virtual void CreateTableConstraints( Check.NotNull(operation, nameof(operation)); Check.NotNull(builder, nameof(builder)); - CreateTablePrimaryKeyContstraint(operation, model, builder); + CreateTablePrimaryKeyConstraint(operation, model, builder); CreateTableUniqueConstraints(operation, model, builder); CreateTableCheckConstraints(operation, model, builder); CreateTableForeignKeys(operation, model, builder); @@ -1505,7 +1505,7 @@ protected virtual void ForeignKeyConstraint( /// The operation. /// The target model which may be null if the operations exist without a model. /// The command builder to use to add the SQL fragment. - protected virtual void CreateTablePrimaryKeyContstraint( + protected virtual void CreateTablePrimaryKeyConstraint( [NotNull] CreateTableOperation operation, [CanBeNull] IModel model, [NotNull] MigrationCommandListBuilder builder) diff --git a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs index c9d58ecf7cd..1c8152e0e2c 100644 --- a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs +++ b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs @@ -1243,7 +1243,7 @@ public static EventDefinition LogNoMigrationsFound([NotNull] IDiagnostic } /// - /// Property '{property}' on entity type '{entityType}' is part of a primary or alternate key but has a constant default value set. Constant default values are not useful for primary or alternate keys since these properties must always have non-null unqiue values. + /// Property '{property}' on entity type '{entityType}' is part of a primary or alternate key but has a constant default value set. Constant default values are not useful for primary or alternate keys since these properties must always have non-null unique values. /// public static EventDefinition LogKeyHasDefaultValue([NotNull] IDiagnosticsLogger logger) { diff --git a/src/EFCore.Relational/Properties/RelationalStrings.resx b/src/EFCore.Relational/Properties/RelationalStrings.resx index 9d409350f3e..bba3197d4ea 100644 --- a/src/EFCore.Relational/Properties/RelationalStrings.resx +++ b/src/EFCore.Relational/Properties/RelationalStrings.resx @@ -294,7 +294,7 @@ Cannot use table '{table}' for entity type '{entityType}' since it is being used for entity type '{otherEntityType}' and there is no relationship between their primary keys. - Property '{property}' on entity type '{entityType}' is part of a primary or alternate key but has a constant default value set. Constant default values are not useful for primary or alternate keys since these properties must always have non-null unqiue values. + Property '{property}' on entity type '{entityType}' is part of a primary or alternate key but has a constant default value set. Constant default values are not useful for primary or alternate keys since these properties must always have non-null unique values. Warning RelationalEventId.ModelValidationKeyDefaultValueWarning string string diff --git a/src/EFCore.Relational/Query/Pipeline/IncludeCompilingExpressionVisitor.cs b/src/EFCore.Relational/Query/Pipeline/IncludeCompilingExpressionVisitor.cs index 8a55371565b..4a0d14a767f 100644 --- a/src/EFCore.Relational/Query/Pipeline/IncludeCompilingExpressionVisitor.cs +++ b/src/EFCore.Relational/Query/Pipeline/IncludeCompilingExpressionVisitor.cs @@ -221,7 +221,7 @@ private static void InitializeIncludeCollection( DbDataReader dbDataReader, ResultCoordinator resultCoordinator, TParent entity, - Func parentIdenfier, + Func parentIdentifier, Func outerIdentifier, INavigation navigation, IClrCollectionAccessor clrCollectionAccessor, @@ -243,7 +243,7 @@ private static void InitializeIncludeCollection( collection = clrCollectionAccessor.GetOrCreate(entity); } - var parentKey = parentIdenfier(queryContext, dbDataReader); + var parentKey = parentIdentifier(queryContext, dbDataReader); var outerKey = outerIdentifier(queryContext, dbDataReader); var collectionMaterializationContext = new CollectionMaterializationContext(entity, collection, parentKey, outerKey); @@ -260,14 +260,14 @@ private static TCollection InitializeCollection( QueryContext queryContext, DbDataReader dbDataReader, ResultCoordinator resultCoordinator, - Func parentIdenfier, + Func parentIdentifier, Func outerIdentifier, IClrCollectionAccessor clrCollectionAccessor) where TCollection :class, IEnumerable { var collection = clrCollectionAccessor?.Create() ?? new List(); - var parentKey = parentIdenfier(queryContext, dbDataReader); + var parentKey = parentIdentifier(queryContext, dbDataReader); var outerKey = outerIdentifier(queryContext, dbDataReader); var collectionMaterializationContext = new CollectionMaterializationContext(null, collection, parentKey, outerKey); diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressionOptimizingVisitor.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressionOptimizingVisitor.cs index c0e4f7d7f07..be25acffeba 100644 --- a/src/EFCore.Relational/Query/Pipeline/SqlExpressionOptimizingVisitor.cs +++ b/src/EFCore.Relational/Query/Pipeline/SqlExpressionOptimizingVisitor.cs @@ -59,7 +59,7 @@ private Expression VisitSqlUnaryExpression(SqlUnaryExpression sqlUnaryExpression } // NULL IS NULL -> true - // non_nullablee_constant IS NULL -> false + // non_nullable_constant IS NULL -> false if (sqlUnaryExpression.OperatorType == ExpressionType.Equal && sqlUnaryExpression.Operand is SqlConstantExpression innerConstantNull1) { @@ -67,7 +67,7 @@ private Expression VisitSqlUnaryExpression(SqlUnaryExpression sqlUnaryExpression } // NULL IS NOT NULL -> false - // non_nullablee_constant IS NOT NULL -> true + // non_nullable_constant IS NOT NULL -> true if (sqlUnaryExpression.OperatorType == ExpressionType.NotEqual && sqlUnaryExpression.Operand is SqlConstantExpression innerConstantNull2) { diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlExpression.cs index fc160c8f244..bd21a829954 100644 --- a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlExpression.cs +++ b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlExpression.cs @@ -21,7 +21,7 @@ protected SqlExpression(Type type, RelationalTypeMapping typeMapping) public RelationalTypeMapping TypeMapping { get; } protected override Expression VisitChildren(ExpressionVisitor visitor) - => throw new InvalidOperationException("VisitChildren must be overriden in class deriving from SqlExpression"); + => throw new InvalidOperationException("VisitChildren must be overridden in class deriving from SqlExpression"); public override ExpressionType NodeType => ExpressionType.Extension; public abstract void Print(ExpressionPrinter expressionPrinter); diff --git a/src/EFCore.Relational/Storage/TypedRelationalValueBufferFactoryFactory.cs b/src/EFCore.Relational/Storage/TypedRelationalValueBufferFactoryFactory.cs index 7e1beec159d..bb2f076c52c 100644 --- a/src/EFCore.Relational/Storage/TypedRelationalValueBufferFactoryFactory.cs +++ b/src/EFCore.Relational/Storage/TypedRelationalValueBufferFactoryFactory.cs @@ -117,7 +117,7 @@ public virtual IRelationalValueBufferFactory Create(IReadOnlyList - /// Creates value buffer assignment expressions for the the given type information. + /// Creates value buffer assignment expressions for the given type information. /// /// Types and mapping for the values to be read. /// The value buffer assignment expressions. diff --git a/src/EFCore.Relational/Update/UpdateSqlGenerator.cs b/src/EFCore.Relational/Update/UpdateSqlGenerator.cs index 2338a9487b7..4860668ef75 100644 --- a/src/EFCore.Relational/Update/UpdateSqlGenerator.cs +++ b/src/EFCore.Relational/Update/UpdateSqlGenerator.cs @@ -14,7 +14,7 @@ namespace Microsoft.EntityFrameworkCore.Update { /// /// - /// A a base class for the service that is typically inherited from + /// A base class for the service that is typically inherited from /// by database providers. /// /// diff --git a/src/EFCore.SqlServer/Extensions/SqlServerDbFunctionsExtensions.cs b/src/EFCore.SqlServer/Extensions/SqlServerDbFunctionsExtensions.cs index 96e2afc37ab..ab366e2cb5d 100644 --- a/src/EFCore.SqlServer/Extensions/SqlServerDbFunctionsExtensions.cs +++ b/src/EFCore.SqlServer/Extensions/SqlServerDbFunctionsExtensions.cs @@ -452,7 +452,7 @@ public static int DateDiffMinute( /// The DbFunctions instance. /// Starting timespan for the calculation. /// Ending timespan for the calculation. - /// Number of minute boundaries crossed between the timepsans. + /// Number of minute boundaries crossed between the timespans. public static int DateDiffMinute( [CanBeNull] this DbFunctions _, TimeSpan startTimeSpan, diff --git a/src/EFCore.SqlServer/Query/Pipeline/SqlServerSqlTranslatingExpressionVisitor.cs b/src/EFCore.SqlServer/Query/Pipeline/SqlServerSqlTranslatingExpressionVisitor.cs index b13441467fe..42cbb57c892 100644 --- a/src/EFCore.SqlServer/Query/Pipeline/SqlServerSqlTranslatingExpressionVisitor.cs +++ b/src/EFCore.SqlServer/Query/Pipeline/SqlServerSqlTranslatingExpressionVisitor.cs @@ -22,7 +22,7 @@ private static readonly HashSet _dateTimeDataTypes "datetimeoffset" }; - private static readonly HashSet _arithmaticOperatorTypes + private static readonly HashSet _arithmeticOperatorTypes = new HashSet { ExpressionType.Add, @@ -52,7 +52,7 @@ protected override Expression VisitBinary(BinaryExpression binaryExpression) } return visitedExpression is SqlBinaryExpression sqlBinary - && _arithmaticOperatorTypes.Contains(sqlBinary.OperatorType) + && _arithmeticOperatorTypes.Contains(sqlBinary.OperatorType) && (_dateTimeDataTypes.Contains(GetProviderType(sqlBinary.Left)) || _dateTimeDataTypes.Contains(GetProviderType(sqlBinary.Right))) ? null diff --git a/src/EFCore.Sqlite.Core/Infrastructure/SpatialiteLoader.cs b/src/EFCore.Sqlite.Core/Infrastructure/SpatialiteLoader.cs index f4c7f515363..ed4a9693d0c 100644 --- a/src/EFCore.Sqlite.Core/Infrastructure/SpatialiteLoader.cs +++ b/src/EFCore.Sqlite.Core/Infrastructure/SpatialiteLoader.cs @@ -59,7 +59,7 @@ public static bool TryLoad([NotNull] DbConnection connection) var opened = false; if (connection.State != ConnectionState.Open) { - // NB: If closed, LoadExtension won't throw immidiately + // NB: If closed, LoadExtension won't throw immediately connection.Open(); opened = true; } diff --git a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 index 27e3b8cf7c1..f4ebf003564 100644 --- a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 +++ b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 @@ -726,7 +726,7 @@ function GetStartupProject($name, $fallbackProject) { Write-Warning 'No startup project set.' } - + Write-Warning "Using project '$($fallbackProject.ProjectName)' as the startup project." return $fallbackProject @@ -1066,7 +1066,7 @@ function GetPlatformTarget($project) return $platformTarget } - $platformTarget = GetMSBuildProperty $project 'PlatfromTarget' + $platformTarget = GetMSBuildProperty $project 'PlatformTarget' if ($platformTarget) { return $platformTarget diff --git a/src/EFCore/DbContextOptionsBuilder.cs b/src/EFCore/DbContextOptionsBuilder.cs index 26642a4a789..03cd37a8398 100644 --- a/src/EFCore/DbContextOptionsBuilder.cs +++ b/src/EFCore/DbContextOptionsBuilder.cs @@ -317,7 +317,7 @@ public virtual DbContextOptionsBuilder ReplaceService /// /// /// Calling this method multiple times will result in all interceptors in every call being added to the context. - /// Interceptors added in a previous call are not overriden by interceptors added in a later call. + /// Interceptors added in a previous call are not overridden by interceptors added in a later call. /// /// /// The interceptors to add. @@ -341,7 +341,7 @@ public virtual DbContextOptionsBuilder AddInterceptors([NotNull] IEnumerable /// /// Calling this method multiple times will result in all interceptors in every call being added to the context. - /// Interceptors added in a previous call are not overriden by interceptors added in a later call. + /// Interceptors added in a previous call are not overridden by interceptors added in a later call. /// /// /// The interceptors to add. diff --git a/src/EFCore/Diagnostics/CoreLoggerExtensions.cs b/src/EFCore/Diagnostics/CoreLoggerExtensions.cs index 3ca4afae740..4424cf85ce0 100644 --- a/src/EFCore/Diagnostics/CoreLoggerExtensions.cs +++ b/src/EFCore/Diagnostics/CoreLoggerExtensions.cs @@ -1569,7 +1569,7 @@ private static string NonDefiningInverseNavigationWarning(EventDefinitionBase de /// The navigation property. /// The target type. /// The inverse navigation property. - /// The ownership navigationb property. + /// The ownership navigation property. public static void NonOwnershipInverseNavigationWarning( [NotNull] this IDiagnosticsLogger diagnostics, [NotNull] IEntityType declaringType, diff --git a/src/EFCore/Internal/Graph.cs b/src/EFCore/Internal/Graph.cs index e3dc828b297..740b9688d34 100644 --- a/src/EFCore/Internal/Graph.cs +++ b/src/EFCore/Internal/Graph.cs @@ -56,11 +56,11 @@ public virtual ISet GetUnreachableVertices([NotNull] IReadOnlyList TopologicalSort( foreach (var vertex in _vertices) { - foreach (var outgoingNeighbour in GetOutgoingNeighbors(vertex)) + foreach (var outgoingNeighbor in GetOutgoingNeighbors(vertex)) { - if (predecessorCounts.ContainsKey(outgoingNeighbour)) + if (predecessorCounts.ContainsKey(outgoingNeighbor)) { - predecessorCounts[outgoingNeighbour]++; + predecessorCounts[outgoingNeighbor]++; } else { - predecessorCounts[outgoingNeighbour] = 1; + predecessorCounts[outgoingNeighbor] = 1; } } } @@ -188,7 +188,7 @@ public virtual IReadOnlyList TopologicalSort( { var currentRoot = sortedQueue[index]; - foreach (var successor in GetOutgoingNeighbors(currentRoot).Where(neighbour => predecessorCounts.ContainsKey(neighbour))) + foreach (var successor in GetOutgoingNeighbors(currentRoot).Where(neighbor => predecessorCounts.ContainsKey(neighbor))) { // Decrement counts for edges from sorted vertices and append any vertices that no longer have predecessors predecessorCounts[successor]--; @@ -218,13 +218,13 @@ public virtual IReadOnlyList TopologicalSort( var candidateVertex = candidateVertices[candidateIndex]; // Find vertices in the unsorted portion of the graph that have edges to the candidate - var incomingNeighbours = GetIncomingNeighbors(candidateVertex) - .Where(neighbour => predecessorCounts.ContainsKey(neighbour)).ToList(); + var incomingNeighbors = GetIncomingNeighbors(candidateVertex) + .Where(neighbor => predecessorCounts.ContainsKey(neighbor)).ToList(); - foreach (var incomingNeighbour in incomingNeighbours) + foreach (var incomingNeighbor in incomingNeighbors) { // Check to see if the edge can be broken - if (canBreakEdge(incomingNeighbour, candidateVertex, _successorMap[incomingNeighbour][candidateVertex])) + if (canBreakEdge(incomingNeighbor, candidateVertex, _successorMap[incomingNeighbor][candidateVertex])) { predecessorCounts[candidateVertex]--; if (predecessorCounts[candidateVertex] == 0) @@ -253,7 +253,7 @@ public virtual IReadOnlyList TopologicalSort( { // Find a cycle foreach (var predecessor in GetIncomingNeighbors(currentCycleVertex) - .Where(neighbour => predecessorCounts.ContainsKey(neighbour))) + .Where(neighbor => predecessorCounts.ContainsKey(neighbor))) { if (predecessorCounts[predecessor] != 0) { @@ -324,15 +324,15 @@ public virtual IReadOnlyList> BatchingTopologicalSort( foreach (var vertex in _vertices) { - foreach (var outgoingNeighbour in GetOutgoingNeighbors(vertex)) + foreach (var outgoingNeighbor in GetOutgoingNeighbors(vertex)) { - if (predecessorCounts.ContainsKey(outgoingNeighbour)) + if (predecessorCounts.ContainsKey(outgoingNeighbor)) { - predecessorCounts[outgoingNeighbour]++; + predecessorCounts[outgoingNeighbor]++; } else { - predecessorCounts[outgoingNeighbour] = 1; + predecessorCounts[outgoingNeighbor] = 1; } } } diff --git a/src/EFCore/Metadata/Conventions/DatabaseGeneratedAttributeConvention.cs b/src/EFCore/Metadata/Conventions/DatabaseGeneratedAttributeConvention.cs index f1b5c082c5a..32c32b366e4 100644 --- a/src/EFCore/Metadata/Conventions/DatabaseGeneratedAttributeConvention.cs +++ b/src/EFCore/Metadata/Conventions/DatabaseGeneratedAttributeConvention.cs @@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions { /// - /// A convention that that configures a property as if + /// A convention that configures a property as if /// is specified, if /// is specified or if /// is specified using a . diff --git a/src/EFCore/Metadata/Internal/ParameterBindingFactories.cs b/src/EFCore/Metadata/Internal/ParameterBindingFactories.cs index 13b32cb15ee..9c51aede7a8 100644 --- a/src/EFCore/Metadata/Internal/ParameterBindingFactories.cs +++ b/src/EFCore/Metadata/Internal/ParameterBindingFactories.cs @@ -50,10 +50,10 @@ public ParameterBindingFactories( /// any release. You should only use it directly in your code with extreme caution and knowing that /// doing so can result in application failures when updating to a new Entity Framework Core release. /// - public virtual IParameterBindingFactory FindFactory(Type patameterType, string parameterName) - => _parameterBindingFactories.FirstOrDefault(f => f.CanBind(patameterType, parameterName)) - ?? (_registeredServices.Services.Contains(patameterType) - ? new ServiceParameterBindingFactory(patameterType) + public virtual IParameterBindingFactory FindFactory(Type parameterType, string parameterName) + => _parameterBindingFactories.FirstOrDefault(f => f.CanBind(parameterType, parameterName)) + ?? (_registeredServices.Services.Contains(parameterType) + ? new ServiceParameterBindingFactory(parameterType) : null); } } diff --git a/src/EFCore/Properties/CoreStrings.Designer.cs b/src/EFCore/Properties/CoreStrings.Designer.cs index 51577cbbc7a..a6a242d418d 100644 --- a/src/EFCore/Properties/CoreStrings.Designer.cs +++ b/src/EFCore/Properties/CoreStrings.Designer.cs @@ -463,7 +463,7 @@ public static string BadDependencyRegistration([CanBeNull] object dependenciesTy dependenciesType); /// - /// The type '{givenType}' cannot be used a a value generator because it does not inherit from '{expectedType}'. + /// The type '{givenType}' cannot be used as a value generator because it does not inherit from '{expectedType}'. /// public static string BadValueGeneratorType([CanBeNull] object givenType, [CanBeNull] object expectedType) => string.Format( @@ -3693,7 +3693,7 @@ public static EventDefinition LogOptimisticConcurrencyException([NotN } /// - /// The foreign key {redundantForeignKey} on entity type '{entityType} targets itself, it should be removed since it serves no purpuse. + /// The foreign key {redundantForeignKey} on entity type '{entityType} targets itself, it should be removed since it serves no purpose. /// public static EventDefinition LogRedundantForeignKey([NotNull] IDiagnosticsLogger logger) { diff --git a/src/EFCore/Properties/CoreStrings.resx b/src/EFCore/Properties/CoreStrings.resx index bb5166febe5..cd4066e6ad0 100644 --- a/src/EFCore/Properties/CoreStrings.resx +++ b/src/EFCore/Properties/CoreStrings.resx @@ -1,17 +1,17 @@  - @@ -302,7 +302,7 @@ The service dependencies type '{dependenciesType}' has been registered inappropriately in the service collection. Service dependencies types must only be registered by Entity Framework, or in rare cases by database providers and then only to change the service lifetime. - The type '{givenType}' cannot be used a a value generator because it does not inherit from '{expectedType}'. + The type '{givenType}' cannot be used as a value generator because it does not inherit from '{expectedType}'. Cannot create instance of value generator type '{generatorType}'. Ensure that the type is instantiable and has a parameterless constructor, or use the overload of HasValueGenerator that accepts a delegate. @@ -1102,7 +1102,7 @@ The key {key} cannot be added to keyless type '{entityType}'. - The foreign key {redundantForeignKey} on entity type '{entityType} targets itself, it should be removed since it serves no purpuse. + The foreign key {redundantForeignKey} on entity type '{entityType} targets itself, it should be removed since it serves no purpose. Warning CoreEventId.RedundantForeignKeyWarning string string diff --git a/src/EFCore/ValueGeneration/HiLoValueGeneratorState.cs b/src/EFCore/ValueGeneration/HiLoValueGeneratorState.cs index 4a2785d4b0e..fe54ae4b5ab 100644 --- a/src/EFCore/ValueGeneration/HiLoValueGeneratorState.cs +++ b/src/EFCore/ValueGeneration/HiLoValueGeneratorState.cs @@ -55,7 +55,7 @@ public virtual TValue Next([NotNull] Func getNewLowValue) // If the chosen value is outside of the current block then we need a new block. // It is possible that other threads will use all of the new block before this thread - // gets a chance to use the new new value, so use a while here to do it all again. + // gets a chance to use the new value, so use a while here to do it all again. while (newValue.Low >= newValue.High) { using (_asyncLock.Lock()) @@ -97,7 +97,7 @@ public virtual async ValueTask NextAsync( // If the chosen value is outside of the current block then we need a new block. // It is possible that other threads will use all of the new block before this thread - // gets a chance to use the new new value, so use a while here to do it all again. + // gets a chance to use the new value, so use a while here to do it all again. while (newValue.Low >= newValue.High) { using (await _asyncLock.LockAsync(cancellationToken)) diff --git a/src/dotnet-ef/RootCommand.cs b/src/dotnet-ef/RootCommand.cs index c8c7693c796..7e81f8bb19c 100644 --- a/src/dotnet-ef/RootCommand.cs +++ b/src/dotnet-ef/RootCommand.cs @@ -62,16 +62,16 @@ protected override int Execute() return ShowHelp(_help.HasValue(), commands); } - var (projectFile, starupProjectFile) = ResolveProjects( + var (projectFile, startupProjectFile) = ResolveProjects( _project.Value(), _startupProject.Value()); Reporter.WriteVerbose(Resources.UsingProject(projectFile)); - Reporter.WriteVerbose(Resources.UsingStartupProject(starupProjectFile)); + Reporter.WriteVerbose(Resources.UsingStartupProject(startupProjectFile)); var project = Project.FromFile(projectFile, _msbuildprojectextensionspath.Value()); var startupProject = Project.FromFile( - starupProjectFile, + startupProjectFile, _msbuildprojectextensionspath.Value(), _framework.Value(), _configuration.Value(), diff --git a/test/EFCore.Cosmos.FunctionalTests/NestedDocumentsTest.cs b/test/EFCore.Cosmos.FunctionalTests/NestedDocumentsTest.cs index cffc0354d6f..fd426a3a409 100644 --- a/test/EFCore.Cosmos.FunctionalTests/NestedDocumentsTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/NestedDocumentsTest.cs @@ -118,8 +118,8 @@ public virtual void Can_add_collection_dependent_to_owner() var secondPersonEntry = context.Entry(people[1]); var json = secondPersonEntry.Property("__jObject").CurrentValue; - var adresses = (JArray)json["Stored Addresses"]; - var jsonAddress = (JObject)adresses[0]; + var addresses = (JArray)json["Stored Addresses"]; + var jsonAddress = (JObject)addresses[0]; Assert.Equal("Second", jsonAddress[nameof(Address.Street)]); jsonAddress["unmappedId"] = 2; diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.Select.cs b/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.Select.cs index fd1934b297b..b4db7362d8b 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.Select.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.Select.cs @@ -10,9 +10,9 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Query { public partial class SimpleQueryCosmosTest { - public override async Task Projection_when_arithmetic_expression_precendence(bool isAsync) + public override async Task Projection_when_arithmetic_expression_precedence(bool isAsync) { - await base.Projection_when_arithmetic_expression_precendence(isAsync); + await base.Projection_when_arithmetic_expression_precedence(isAsync); AssertSql( @"SELECT (c[""OrderID""] / (c[""OrderID""] / 2)) AS A, ((c[""OrderID""] / c[""OrderID""]) / 2) AS B diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.Where.cs b/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.Where.cs index 39b0e0bf177..f0c034816df 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.Where.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.Where.cs @@ -1414,9 +1414,9 @@ FROM root c WHERE ((c[""Discriminator""] = ""Product"") AND (c[""Discontinued""] = ((c[""ProductID""] > 50) != @__prm_0)))"); } - public override async Task Where_de_morgan_or_optimizated(bool isAsync) + public override async Task Where_de_morgan_or_optimized(bool isAsync) { - await base.Where_de_morgan_or_optimizated(isAsync); + await base.Where_de_morgan_or_optimized(isAsync); AssertSql( @"SELECT c @@ -1424,9 +1424,9 @@ FROM root c WHERE ((c[""Discriminator""] = ""Product"") AND NOT((c[""Discontinued""] OR (c[""ProductID""] < 20))))"); } - public override async Task Where_de_morgan_and_optimizated(bool isAsync) + public override async Task Where_de_morgan_and_optimized(bool isAsync) { - await base.Where_de_morgan_and_optimizated(isAsync); + await base.Where_de_morgan_and_optimized(isAsync); AssertSql( @"SELECT c diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs index e84e067befd..8cfcf09c276 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs @@ -3674,7 +3674,7 @@ FROM root c } [ConditionalTheory(Skip = "Issue #14935")] - public override async Task Let_subquery_with_multiple_occurences(bool isAsync) + public override async Task Let_subquery_with_multiple_occurrences(bool isAsync) { await AssertQuery( isAsync, diff --git a/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj b/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj index 2ea0f3e56f6..b9c618a8996 100644 --- a/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj +++ b/test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj @@ -6,7 +6,7 @@ Microsoft.EntityFrameworkCore true - + CrossStore.FunctionalTests ..\..\EFCore.ruleset diff --git a/test/EFCore.CrossStore.FunctionalTests/ProviderSpecificServicesTest.cs b/test/EFCore.CrossStore.FunctionalTests/ProviderSpecificServicesTest.cs index f16ca6e9570..b93f5ddadc6 100644 --- a/test/EFCore.CrossStore.FunctionalTests/ProviderSpecificServicesTest.cs +++ b/test/EFCore.CrossStore.FunctionalTests/ProviderSpecificServicesTest.cs @@ -32,13 +32,13 @@ public void Throws_with_new_when_non_relational_provider_in_use() [ConditionalFact] public void Throws_with_add_when_non_relational_provider_in_use() { - var appServiceProivder = new ServiceCollection() + var appServiceProvider = new ServiceCollection() .AddEntityFrameworkInMemoryDatabase() .AddDbContext( (p, b) => b.UseInMemoryDatabase(Guid.NewGuid().ToString()).UseInternalServiceProvider(p)) .BuildServiceProvider(); - using (var serviceScope = appServiceProivder + using (var serviceScope = appServiceProvider .GetRequiredService() .CreateScope()) { diff --git a/test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationOperationGeneratorTest.cs b/test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationOperationGeneratorTest.cs index e75420b28e2..2c6e3beafd7 100644 --- a/test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationOperationGeneratorTest.cs +++ b/test/EFCore.Design.Tests/Migrations/Design/CSharpMigrationOperationGeneratorTest.cs @@ -150,7 +150,7 @@ public void AddColumnOperation_DefaultValueSql() } [ConditionalFact] - public void AddColumnOperation_ComutedExpression() + public void AddColumnOperation_ComputedExpression() { Test( new AddColumnOperation diff --git a/test/EFCore.InMemory.FunctionalTests/CompositeKeyEndToEndTest.cs b/test/EFCore.InMemory.FunctionalTests/CompositeKeyEndToEndTest.cs index be6de2beee3..eb379c33929 100644 --- a/test/EFCore.InMemory.FunctionalTests/CompositeKeyEndToEndTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/CompositeKeyEndToEndTest.cs @@ -121,7 +121,7 @@ public async Task Can_use_generated_values_in_composite_key_end_to_end() } [ConditionalFact] - public async Task Only_one_part_of_a_composite_key_needs_to_vary_for_uniquness() + public async Task Only_one_part_of_a_composite_key_needs_to_vary_for_uniqueness() { var serviceProvider = new ServiceCollection() .AddEntityFrameworkInMemoryDatabase() diff --git a/test/EFCore.InMemory.FunctionalTests/Query/OwnedQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/OwnedQueryInMemoryTest.cs index 16eeca9b2b8..e9288883c04 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/OwnedQueryInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/OwnedQueryInMemoryTest.cs @@ -6,7 +6,7 @@ namespace Microsoft.EntityFrameworkCore.Query { - // issue issue #15285 + // issue #15285 internal class OwnedQueryInMemoryTest : OwnedQueryTestBase { public OwnedQueryInMemoryTest(OwnedQueryInMemoryFixture fixture, ITestOutputHelper testOutputHelper) diff --git a/test/EFCore.Relational.Specification.Tests/Query/InheritanceRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/InheritanceRelationalFixture.cs index 83bc322b397..f6fe6a9b964 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/InheritanceRelationalFixture.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/InheritanceRelationalFixture.cs @@ -23,10 +23,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con modelBuilder.Entity().Property(e => e.Species).HasMaxLength(100); - modelBuilder.Entity().Property(e => e.Carbination).HasColumnName("CokeCO2"); + modelBuilder.Entity().Property(e => e.Carbonation).HasColumnName("CokeCO2"); modelBuilder.Entity().Property(e => e.SugarGrams).HasColumnName("SugarGrams"); modelBuilder.Entity().Property(e => e.CaffeineGrams).HasColumnName("CaffeineGrams"); - modelBuilder.Entity().Property(e => e.Carbination).HasColumnName("LiltCO2"); + modelBuilder.Entity().Property(e => e.Carbonation).HasColumnName("LiltCO2"); modelBuilder.Entity().Property(e => e.SugarGrams).HasColumnName("SugarGrams"); modelBuilder.Entity().Property(e => e.CaffeineGrams).HasColumnName("CaffeineGrams"); diff --git a/test/EFCore.Relational.Specification.Tests/TransactionTestBase.cs b/test/EFCore.Relational.Specification.Tests/TransactionTestBase.cs index 35aabe7c8d7..b7f469ff2df 100644 --- a/test/EFCore.Relational.Specification.Tests/TransactionTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/TransactionTestBase.cs @@ -752,7 +752,7 @@ public virtual async Task SaveChangesAsync_uses_explicit_transaction_and_does_no [ConditionalTheory] [InlineData(true)] [InlineData(false)] - public virtual async Task RelationalTransaction_can_be_commited(bool autoTransaction) + public virtual async Task RelationalTransaction_can_be_committed(bool autoTransaction) { using (var context = CreateContext()) { @@ -777,7 +777,7 @@ public virtual async Task RelationalTransaction_can_be_commited(bool autoTransac [ConditionalTheory] [InlineData(true)] [InlineData(false)] - public virtual async Task RelationalTransaction_can_be_commited_from_context(bool autoTransaction) + public virtual async Task RelationalTransaction_can_be_committed_from_context(bool autoTransaction) { using (var context = CreateContext()) { diff --git a/test/EFCore.Relational.Tests/Design/DesignTimeProviderServicesTest.cs b/test/EFCore.Relational.Tests/Design/DesignTimeProviderServicesTest.cs index 9a7634bc57a..542a549dc34 100644 --- a/test/EFCore.Relational.Tests/Design/DesignTimeProviderServicesTest.cs +++ b/test/EFCore.Relational.Tests/Design/DesignTimeProviderServicesTest.cs @@ -13,7 +13,7 @@ public abstract class DesignTimeProviderServicesTest protected abstract Type GetDesignTimeServicesType(); [ConditionalFact] - public void Ensure_assmebly_identity_matches() + public void Ensure_assembly_identity_matches() { var runtimeAssembly = GetRuntimeAssembly(); var dtAttribute = runtimeAssembly.GetCustomAttribute(); diff --git a/test/EFCore.Relational.Tests/Metadata/DbFunctionMetadataTests.cs b/test/EFCore.Relational.Tests/Metadata/DbFunctionMetadataTests.cs index 6ea2cfb1543..f0ed0642c35 100644 --- a/test/EFCore.Relational.Tests/Metadata/DbFunctionMetadataTests.cs +++ b/test/EFCore.Relational.Tests/Metadata/DbFunctionMetadataTests.cs @@ -40,13 +40,13 @@ public class MyBaseContext : DbContext nameof(StaticPublicBase), nameof(StaticProtectedBase), nameof(StaticPrivateBase), - nameof(StaticInteranlBase), - nameof(StaticProtectedInteralBase), + nameof(StaticInternalBase), + nameof(StaticProtectedInternalBase), nameof(InstancePublicBase), nameof(InstanceProtectedBase), nameof(InstancePrivateBase), - nameof(InstanceInteranlBase), - nameof(InstanceProtectedInteralBase) + nameof(InstanceInternalBase), + nameof(InstanceProtectedInternalBase) }; public static void Foo() @@ -71,10 +71,10 @@ private static void Skip() private static int StaticPrivateBase() => throw new Exception(); [DbFunction] - internal static int StaticInteranlBase() => throw new Exception(); + internal static int StaticInternalBase() => throw new Exception(); [DbFunction] - protected internal static int StaticProtectedInteralBase() => throw new Exception(); + protected internal static int StaticProtectedInternalBase() => throw new Exception(); [DbFunction] public int InstancePublicBase() => throw new Exception(); @@ -86,10 +86,10 @@ private static void Skip() private int InstancePrivateBase() => throw new Exception(); [DbFunction] - internal int InstanceInteranlBase() => throw new Exception(); + internal int InstanceInternalBase() => throw new Exception(); [DbFunction] - protected internal int InstanceProtectedInteralBase() => throw new Exception(); + protected internal int InstanceProtectedInternalBase() => throw new Exception(); [DbFunction] public virtual int VirtualBase() => throw new Exception(); @@ -102,13 +102,13 @@ public class MyDerivedContext : MyBaseContext nameof(StaticPublicDerived), nameof(StaticProtectedDerived), nameof(StaticPrivateDerived), - nameof(StaticInteranlDerived), - nameof(StaticProtectedInteralDerived), + nameof(StaticInternalDerived), + nameof(StaticProtectedInternalDerived), nameof(InstancePublicDerived), nameof(InstanceProtectedDerived), nameof(InstancePrivateDerived), - nameof(InstanceInteranlDerived), - nameof(InstanceProtectedInteralDerived) + nameof(InstanceInternalDerived), + nameof(InstanceProtectedInternalDerived) }; public static void Bar() @@ -138,10 +138,10 @@ public static int DuplicateNameTest() private static int StaticPrivateDerived() => throw new Exception(); [DbFunction] - internal static int StaticInteranlDerived() => throw new Exception(); + internal static int StaticInternalDerived() => throw new Exception(); [DbFunction] - protected internal static int StaticProtectedInteralDerived() => throw new Exception(); + protected internal static int StaticProtectedInternalDerived() => throw new Exception(); [DbFunction] public int InstancePublicDerived() => throw new Exception(); @@ -153,10 +153,10 @@ public static int DuplicateNameTest() private int InstancePrivateDerived() => throw new Exception(); [DbFunction] - internal int InstanceInteranlDerived() => throw new Exception(); + internal int InstanceInternalDerived() => throw new Exception(); [DbFunction] - protected internal int InstanceProtectedInteralDerived() => throw new Exception(); + protected internal int InstanceProtectedInternalDerived() => throw new Exception(); [DbFunction] public override int VirtualBase() => throw new Exception(); diff --git a/test/EFCore.Relational.Tests/Migrations/MigrationCommandExecutorTest.cs b/test/EFCore.Relational.Tests/Migrations/MigrationCommandExecutorTest.cs index cdbe606eb35..82182dc2d77 100644 --- a/test/EFCore.Relational.Tests/Migrations/MigrationCommandExecutorTest.cs +++ b/test/EFCore.Relational.Tests/Migrations/MigrationCommandExecutorTest.cs @@ -18,7 +18,7 @@ public class MigrationCommandExecutorTest [ConditionalTheory] [InlineData(false)] [InlineData(true)] - public async Task Executes_migtration_commands_in_same_transaction(bool async) + public async Task Executes_migration_commands_in_same_transaction(bool async) { var fakeConnection = CreateConnection(); var logger = new FakeDiagnosticsLogger(); diff --git a/test/EFCore.Relational.Tests/RelationalConnectionTest.cs b/test/EFCore.Relational.Tests/RelationalConnectionTest.cs index 9383f185ae9..6a534ccd24a 100644 --- a/test/EFCore.Relational.Tests/RelationalConnectionTest.cs +++ b/test/EFCore.Relational.Tests/RelationalConnectionTest.cs @@ -31,12 +31,12 @@ public void Throws_with_new_when_no_EF_services_use_Database() [ConditionalFact] public void Throws_with_add_when_no_EF_services_use_Database() { - var appServiceProivder = new ServiceCollection() + var appServiceProvider = new ServiceCollection() .AddDbContext( (p, b) => b.UseInternalServiceProvider(p)) .BuildServiceProvider(); - using (var serviceScope = appServiceProivder + using (var serviceScope = appServiceProvider .GetRequiredService() .CreateScope()) { @@ -72,12 +72,12 @@ public void Throws_with_add_when_no_provider_use_Database() var serviceCollection = new ServiceCollection(); new EntityFrameworkServicesBuilder(serviceCollection).TryAddCoreServices(); - var appServiceProivder = serviceCollection + var appServiceProvider = serviceCollection .AddDbContext( (p, b) => b.UseInternalServiceProvider(p)) .BuildServiceProvider(); - using (var serviceScope = appServiceProivder + using (var serviceScope = appServiceProvider .GetRequiredService() .CreateScope()) { @@ -279,7 +279,7 @@ public void Lazy_connection_is_not_created_just_so_it_can_be_disposed() } [ConditionalFact] - public void Can_create_new_connection_from_exsting_DbConnection() + public void Can_create_new_connection_from_existing_DbConnection() { var dbConnection = new FakeDbConnection("Database=FrodoLives"); diff --git a/test/EFCore.Relational.Tests/Storage/NamedConnectionStringResolverTest.cs b/test/EFCore.Relational.Tests/Storage/NamedConnectionStringResolverTest.cs index 140ceb354bf..ad158243d6e 100644 --- a/test/EFCore.Relational.Tests/Storage/NamedConnectionStringResolverTest.cs +++ b/test/EFCore.Relational.Tests/Storage/NamedConnectionStringResolverTest.cs @@ -56,18 +56,18 @@ public void Returns_resolved_string_if_IConfiguration_contains_key() .AddInMemoryCollection( new Dictionary { - { "MyConnectuonString", "Conn1" }, + { "MyConnectionString", "Conn1" }, { "ConnectionStrings:DefaultConnection", "Conn2" }, - { "ConnectionStrings:MyConnectuonString", "Conn3" } + { "ConnectionStrings:MyConnectionString", "Conn3" } }) .Build())); - Assert.Equal("Conn1", resolver.ResolveConnectionString("name=MyConnectuonString")); + Assert.Equal("Conn1", resolver.ResolveConnectionString("name=MyConnectionString")); Assert.Equal("Conn2", resolver.ResolveConnectionString("name=ConnectionStrings:DefaultConnection")); Assert.Equal("Conn2", resolver.ResolveConnectionString("name=DefaultConnection")); - Assert.Equal("Conn3", resolver.ResolveConnectionString("name=ConnectionStrings:MyConnectuonString")); + Assert.Equal("Conn3", resolver.ResolveConnectionString("name=ConnectionStrings:MyConnectionString")); - Assert.Equal("Conn1", resolver.ResolveConnectionString(" NamE = MyConnectuonString ")); + Assert.Equal("Conn1", resolver.ResolveConnectionString(" NamE = MyConnectionString ")); } [ConditionalFact] diff --git a/test/EFCore.Relational.Tests/Storage/RelationalTypeMappingTest.cs b/test/EFCore.Relational.Tests/Storage/RelationalTypeMappingTest.cs index d997b2c5f20..05fdd25d07d 100644 --- a/test/EFCore.Relational.Tests/Storage/RelationalTypeMappingTest.cs +++ b/test/EFCore.Relational.Tests/Storage/RelationalTypeMappingTest.cs @@ -162,7 +162,7 @@ public virtual void Create_and_clone_unicode_sized_mappings_with_converter(Type FakeTypeMapping.CreateParameters( clrType, size: 33, - unicide: false, + unicode: false, fixedLength: true, storeTypePostfix: StoreTypePostfix.Size) }, @@ -225,7 +225,7 @@ public FakeTypeMapping() public static object CreateParameters( Type clrType, int? size = null, - bool unicide = false, + bool unicode = false, bool fixedLength = false, StoreTypePostfix storeTypePostfix = StoreTypePostfix.PrecisionAndScale) { @@ -239,7 +239,7 @@ public static object CreateParameters( storeTypePostfix, System.Data.DbType.VarNumeric, size: size, - unicode: unicide, + unicode: unicode, fixedLength: fixedLength); } diff --git a/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs b/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs index 80d3e24601a..d1114302623 100644 --- a/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs +++ b/test/EFCore.Specification.Tests/DataAnnotationTestBase.cs @@ -284,7 +284,7 @@ protected class DifferentUnit1 : BaseEntity1 } [ConditionalFact] - public virtual void NotMapped_on_base_class_property_and_overriden_property_ignores_them() + public virtual void NotMapped_on_base_class_property_and_overridden_property_ignores_them() { var modelBuilder = CreateModelBuilder(); @@ -342,7 +342,7 @@ public virtual void NotMapped_on_base_class_property_discovered_through_navigati } [ConditionalFact] - public virtual void NotMapped_on_overriden_mapped_base_class_property_throws() + public virtual void NotMapped_on_overridden_mapped_base_class_property_throws() { var modelBuilder = CreateModelBuilder(); @@ -417,7 +417,7 @@ public virtual void NotMapped_on_abstract_base_class_property_ignores_it() } [ConditionalFact] - public virtual void NotMapped_on_unmapped_base_class_property_and_overriden_property_ignores_it() + public virtual void NotMapped_on_unmapped_base_class_property_and_overridden_property_ignores_it() { var modelBuilder = CreateModelBuilder(); modelBuilder.Ignore(); @@ -488,7 +488,7 @@ protected class DifferentUnit5 : BaseEntity5 } [ConditionalFact] - public virtual void StringLength_with_value_takes_presedence_over_MaxLength() + public virtual void StringLength_with_value_takes_precedence_over_MaxLength() { var modelBuilder = CreateModelBuilder(); @@ -751,7 +751,7 @@ public class Toy } [ConditionalFact] - public virtual ModelBuilder Key_specified_on_multiple_properties_can_be_overriden() + public virtual ModelBuilder Key_specified_on_multiple_properties_can_be_overridden() { var modelBuilder = CreateModelBuilder(); @@ -999,7 +999,7 @@ public virtual void Required_and_ForeignKey_to_Required_and_ForeignKey() } [ConditionalFact] - public virtual void Required_and_ForeignKey_to_Required_and_ForeignKey_can_be_overriden() + public virtual void Required_and_ForeignKey_to_Required_and_ForeignKey_can_be_overridden() { var modelBuilder = CreateModelBuilder(); diff --git a/test/EFCore.Specification.Tests/FieldMappingTestBase.cs b/test/EFCore.Specification.Tests/FieldMappingTestBase.cs index 4de5ee71492..0c94112b60a 100644 --- a/test/EFCore.Specification.Tests/FieldMappingTestBase.cs +++ b/test/EFCore.Specification.Tests/FieldMappingTestBase.cs @@ -731,7 +731,7 @@ public virtual void Update_fields_only_only_for_navs_too() => Update("_posts"); protected virtual void Load_collection(string navigation) - where TBlog : class, IBlogAccesor, new() + where TBlog : class, IBlogAccessor, new() { using (var context = CreateContext()) { @@ -747,7 +747,7 @@ protected virtual void Load_collection(string navigation) } protected virtual void Load_reference(string navigation) - where TPost : class, IPostAccesor, new() + where TPost : class, IPostAccessor, new() { using (var context = CreateContext()) { @@ -763,7 +763,7 @@ protected virtual void Load_reference(string navigation) } protected virtual void Query_with_conditional_constant(string property, bool tracking) - where TPost : class, IPostAccesor, new() + where TPost : class, IPostAccessor, new() { using (var context = CreateContext()) { @@ -782,7 +782,7 @@ protected virtual void Query_with_conditional_constant(string property, b } protected virtual void Query_with_conditional_param(string property, bool tracking) - where TPost : class, IPostAccesor, new() + where TPost : class, IPostAccessor, new() { var postTitle = "Post11"; using (var context = CreateContext()) @@ -798,7 +798,7 @@ protected virtual void Query_with_conditional_param(string property, bool } protected virtual void Projection(string property1, string property2, bool tracking) - where TPost : class, IPostAccesor, new() + where TPost : class, IPostAccessor, new() { using (var context = CreateContext()) { @@ -819,7 +819,7 @@ protected virtual void Projection(string property1, string property2, boo } protected virtual void Update(string navigation) - where TBlog : class, IBlogAccesor, new() + where TBlog : class, IBlogAccessor, new() { TestHelpers.ExecuteWithStrategyInTransaction( CreateContext, UseTransaction, @@ -862,14 +862,14 @@ protected virtual void UseTransaction(DatabaseFacade facade, IDbContextTransacti { } - protected void AssertBlogs(IEnumerable blogs) + protected void AssertBlogs(IEnumerable blogs) { Assert.Equal(2, blogs.Count()); Assert.Equal("Blog10", blogs.Single(e => e.AccessId == 10).AccessTitle); Assert.Equal("Blog20", blogs.Single(e => e.AccessId == 20).AccessTitle); } - protected void AssertGraph(IEnumerable blogs, string updated = "") + protected void AssertGraph(IEnumerable blogs, string updated = "") { Assert.Equal(2, blogs.Count()); @@ -888,7 +888,7 @@ protected void AssertGraph(IEnumerable blogs, string updated = "") AssertPost(blog2.AccessPosts.Single(e => e.AccessId == 21), 21, blog2, updated); } - private static void AssertPost(IPostAccesor post, int postId, IBlogAccesor blog1, string updated = "") + private static void AssertPost(IPostAccessor post, int postId, IBlogAccessor blog1, string updated = "") { Assert.Equal("Post" + postId + updated, post.AccessTitle); //issue #15318 @@ -896,7 +896,7 @@ private static void AssertPost(IPostAccesor post, int postId, IBlogAccesor blog1 Assert.Equal(blog1.AccessId, post.AccessBlogId); } - protected void AssertGraph(IEnumerable posts) + protected void AssertGraph(IEnumerable posts) { Assert.Equal(4, posts.Count()); @@ -916,7 +916,7 @@ protected void AssertGraph(IEnumerable posts) AssertPost(posts.Single(e => e.AccessId == 21), 21, blog2); } - protected class BlogAuto : IBlogAccesor + protected class BlogAuto : IBlogAccessor { [DatabaseGenerated(DatabaseGeneratedOption.None)] public int Id { get; set; } @@ -924,26 +924,26 @@ protected class BlogAuto : IBlogAccesor public string Title { get; set; } public IEnumerable Posts { get; set; } - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => Id; set => Id = value; } - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => Title; set => Title = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => Posts; set => Posts = (IEnumerable)value; } } - protected class PostAuto : IPostAccesor + protected class PostAuto : IPostAccessor { [DatabaseGenerated(DatabaseGeneratedOption.None)] public int Id { get; set; } @@ -953,32 +953,32 @@ protected class PostAuto : IPostAccesor public int BlogId { get; set; } public BlogAuto Blog { get; set; } - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => Id; set => Id = value; } - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => Title; set => Title = value; } - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => BlogId; set => BlogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => Blog; set => Blog = (BlogAuto)value; } } - protected class BlogFull : IBlogAccesor + protected class BlogFull : IBlogAccessor { private int _id; private string _title; @@ -1006,26 +1006,26 @@ public IEnumerable Posts set => _posts = (ICollection)value; } - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => Id; set => Id = value; } - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => Title; set => Title = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => Posts; set => Posts = (IEnumerable)value; } } - protected class PostFull : IPostAccesor + protected class PostFull : IPostAccessor { private int _id; private string _title; @@ -1061,32 +1061,32 @@ public BlogFull Blog set => _blog = value; } - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => Id; set => Id = value; } - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => Title; set => Title = value; } - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => BlogId; set => BlogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => Blog; set => Blog = (BlogFull)value; } } - protected class BlogNavFields : IBlogAccesor + protected class BlogNavFields : IBlogAccessor { [DatabaseGenerated(DatabaseGeneratedOption.None)] private int _id; @@ -1094,27 +1094,27 @@ protected class BlogNavFields : IBlogAccesor private string _title; private ICollection _posts; - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => _id; set => _id = value; } // ReSharper disable once ConvertToAutoProperty - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => _title; set => _title = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => _posts; set => _posts = (ICollection)value; } } - protected class PostNavFields : IPostAccesor + protected class PostNavFields : IPostAccessor { [DatabaseGenerated(DatabaseGeneratedOption.None)] private int _id; @@ -1124,34 +1124,34 @@ protected class PostNavFields : IPostAccesor private BlogNavFields _blog; - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => _id; set => _id = value; } // ReSharper disable once ConvertToAutoProperty - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => _title; set => _title = value; } // ReSharper disable once ConvertToAutoProperty - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => _blogId; set => _blogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => _blog; set => _blog = (BlogNavFields)value; } } - protected class BlogFullExplicit : IBlogAccesor + protected class BlogFullExplicit : IBlogAccessor { private int _myid; private string _mytitle; @@ -1179,26 +1179,26 @@ public IEnumerable Posts set => _myposts = (ICollection)value; } - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => Id; set => Id = value; } - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => Title; set => Title = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => Posts; set => Posts = (IEnumerable)value; } } - protected class PostFullExplicit : IPostAccesor + protected class PostFullExplicit : IPostAccessor { private int _myid; private string _mytitle; @@ -1234,32 +1234,32 @@ public BlogFullExplicit Blog set => _myblog = value; } - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => Id; set => Id = value; } - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => Title; set => Title = value; } - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => BlogId; set => BlogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => Blog; set => Blog = (BlogFullExplicit)value; } } - protected class BlogReadOnly : IBlogAccesor + protected class BlogReadOnly : IBlogAccessor { private int _id; private string _title; @@ -1275,26 +1275,26 @@ protected class BlogReadOnly : IBlogAccesor // ReSharper disable once ConvertToAutoPropertyWithPrivateSetter public IEnumerable Posts => _posts; - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => Id; set => _id = value; } - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => Title; set => _title = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => Posts; set => _posts = (ICollection)value; } } - protected class PostReadOnly : IPostAccesor + protected class PostReadOnly : IPostAccessor { private int _id; private string _title; @@ -1314,32 +1314,32 @@ protected class PostReadOnly : IPostAccesor // ReSharper disable once ConvertToAutoPropertyWithPrivateSetter public BlogReadOnly Blog => _blog; - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => Id; set => _id = value; } - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => Title; set => _title = value; } - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => BlogId; set => _blogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => Blog; set => _blog = (BlogReadOnly)value; } } - protected class BlogReadOnlyExplicit : IBlogAccesor + protected class BlogReadOnlyExplicit : IBlogAccessor { private int _myid; private string _mytitle; @@ -1355,26 +1355,26 @@ protected class BlogReadOnlyExplicit : IBlogAccesor // ReSharper disable once ConvertToAutoPropertyWithPrivateSetter public IEnumerable Posts => _myposts; - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => Id; set => _myid = value; } - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => Title; set => _mytitle = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => Posts; set => _myposts = (ICollection)value; } } - protected class PostReadOnlyExplicit : IPostAccesor + protected class PostReadOnlyExplicit : IPostAccessor { private int _myid; private string _mytitle; @@ -1394,32 +1394,32 @@ protected class PostReadOnlyExplicit : IPostAccesor // ReSharper disable once ConvertToAutoPropertyWithPrivateSetter public BlogReadOnlyExplicit Blog => _myblog; - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => Id; set => _myid = value; } - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => Title; set => _mytitle = value; } - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => BlogId; set => _myblogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => Blog; set => _myblog = (BlogReadOnlyExplicit)value; } } - protected class BlogWriteOnly : IBlogAccesor + protected class BlogWriteOnly : IBlogAccessor { private int _id; private string _title; @@ -1441,26 +1441,26 @@ public IEnumerable Posts set => _posts = (ICollection)value; } - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => _id; set => Id = value; } - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => _title; set => Title = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => _posts; set => Posts = (IEnumerable)value; } } - protected class PostWriteOnly : IPostAccesor + protected class PostWriteOnly : IPostAccessor { private int _id; private string _title; @@ -1488,32 +1488,32 @@ public BlogWriteOnly Blog set => _blog = value; } - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => _id; set => Id = value; } - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => _title; set => Title = value; } - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => _blogId; set => BlogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => _blog; set => Blog = (BlogWriteOnly)value; } } - protected class BlogWriteOnlyExplicit : IBlogAccesor + protected class BlogWriteOnlyExplicit : IBlogAccessor { private int _myid; private string _mytitle; @@ -1535,26 +1535,26 @@ public IEnumerable Posts set => _myposts = (ICollection)value; } - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => _myid; set => Id = value; } - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => _mytitle; set => Title = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => _myposts; set => Posts = (IEnumerable)value; } } - protected class PostWriteOnlyExplicit : IPostAccesor + protected class PostWriteOnlyExplicit : IPostAccessor { private int _myid; private string _mytitle; @@ -1582,32 +1582,32 @@ public BlogWriteOnlyExplicit Blog set => _myblog = value; } - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => _myid; set => Id = value; } - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => _mytitle; set => Title = value; } - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => _myblogId; set => BlogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => _myblog; set => Blog = (BlogWriteOnlyExplicit)value; } } - protected class BlogFields : IBlogAccesor + protected class BlogFields : IBlogAccessor { [DatabaseGenerated(DatabaseGeneratedOption.None)] private int _id; @@ -1616,27 +1616,27 @@ protected class BlogFields : IBlogAccesor public IEnumerable Posts { get; set; } - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => _id; set => _id = value; } // ReSharper disable once ConvertToAutoProperty - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => _title; set => _title = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => Posts; set => Posts = (IEnumerable)value; } } - protected class PostFields : IPostAccesor + protected class PostFields : IPostAccessor { [DatabaseGenerated(DatabaseGeneratedOption.None)] private int _id; @@ -1646,56 +1646,56 @@ protected class PostFields : IPostAccesor public BlogFields Blog { get; set; } - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => _id; set => _id = value; } // ReSharper disable once ConvertToAutoProperty - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => _title; set => _title = value; } // ReSharper disable once ConvertToAutoProperty - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => _blogId; set => _blogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => Blog; set => Blog = (BlogFields)value; } } - protected interface IBlogAccesor + protected interface IBlogAccessor { int AccessId { get; set; } string AccessTitle { get; set; } - IEnumerable AccessPosts { get; set; } + IEnumerable AccessPosts { get; set; } } - protected interface IPostAccesor + protected interface IPostAccessor { int AccessId { get; set; } string AccessTitle { get; set; } int AccessBlogId { get; set; } - IBlogAccesor AccessBlog { get; set; } + IBlogAccessor AccessBlog { get; set; } } protected static TBlog CreateBlogAndPosts() - where TBlog : IBlogAccesor, new() - where TPost : IPostAccesor, new() + where TBlog : IBlogAccessor, new() + where TPost : IPostAccessor, new() => new TBlog { AccessId = 10, AccessTitle = "Blog10", - AccessPosts = (IEnumerable)new List + AccessPosts = (IEnumerable)new List { new TPost { @@ -1711,8 +1711,8 @@ protected static TBlog CreateBlogAndPosts() }; protected static IList CreatePostsAndBlog() - where TBlog : IBlogAccesor, new() - where TPost : IPostAccesor, new() + where TBlog : IBlogAccessor, new() + where TPost : IPostAccessor, new() { var blog = new TBlog { @@ -1745,7 +1745,7 @@ protected class BlogHidingBase public object Posts { get; set; } } - protected class BlogHiding : BlogHidingBase, IBlogAccesor + protected class BlogHiding : BlogHidingBase, IBlogAccessor { [DatabaseGenerated(DatabaseGeneratedOption.None)] public new int Id @@ -1766,19 +1766,19 @@ protected class BlogHiding : BlogHidingBase, IBlogAccesor set => base.Posts = value; } - int IBlogAccesor.AccessId + int IBlogAccessor.AccessId { get => Id; set => Id = value; } - string IBlogAccesor.AccessTitle + string IBlogAccessor.AccessTitle { get => Title; set => Title = value; } - IEnumerable IBlogAccesor.AccessPosts + IEnumerable IBlogAccessor.AccessPosts { get => Posts; set => Posts = (IEnumerable)value; @@ -1795,7 +1795,7 @@ protected class PostHidingBase public object Blog { get; set; } } - protected class PostHiding : PostHidingBase, IPostAccesor + protected class PostHiding : PostHidingBase, IPostAccessor { [DatabaseGenerated(DatabaseGeneratedOption.None)] public new int Id @@ -1822,25 +1822,25 @@ protected class PostHiding : PostHidingBase, IPostAccesor set => base.Blog = value; } - int IPostAccesor.AccessId + int IPostAccessor.AccessId { get => Id; set => Id = value; } - string IPostAccesor.AccessTitle + string IPostAccessor.AccessTitle { get => Title; set => Title = value; } - int IPostAccesor.AccessBlogId + int IPostAccessor.AccessBlogId { get => BlogId; set => BlogId = value; } - IBlogAccesor IPostAccesor.AccessBlog + IBlogAccessor IPostAccessor.AccessBlog { get => Blog; set => Blog = (BlogHiding)value; diff --git a/test/EFCore.Specification.Tests/Query/ChangeTrackingTestBase.cs b/test/EFCore.Specification.Tests/Query/ChangeTrackingTestBase.cs index 2655bbfad2c..e83e59196e0 100644 --- a/test/EFCore.Specification.Tests/Query/ChangeTrackingTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/ChangeTrackingTestBase.cs @@ -349,7 +349,7 @@ public virtual void AsTracking_switches_tracking_on_when_off_in_options() } [ConditionalFact] - public virtual void Precendence_of_tracking_modifiers() + public virtual void Precedence_of_tracking_modifiers() { using (var context = CreateContext()) { @@ -361,7 +361,7 @@ public virtual void Precendence_of_tracking_modifiers() } [ConditionalFact] - public virtual void Precendence_of_tracking_modifiers2() + public virtual void Precedence_of_tracking_modifiers2() { using (var context = CreateContext()) { @@ -373,7 +373,7 @@ public virtual void Precendence_of_tracking_modifiers2() } [ConditionalFact] - public virtual void Precendence_of_tracking_modifiers3() + public virtual void Precedence_of_tracking_modifiers3() { using (var context = CreateContext()) { @@ -391,7 +391,7 @@ on c.CustomerID equals o.CustomerID } [ConditionalFact] - public virtual void Precendence_of_tracking_modifiers4() + public virtual void Precedence_of_tracking_modifiers4() { using (var context = CreateContext()) { @@ -409,7 +409,7 @@ on c.CustomerID equals o.CustomerID } [ConditionalFact] - public virtual void Precendence_of_tracking_modifiers5() + public virtual void Precedence_of_tracking_modifiers5() { using (var context = CreateContext()) { diff --git a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs index 7fc5fc0f6b6..765e07a30b4 100644 --- a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs @@ -928,7 +928,7 @@ await AssertQuery( w => new { w.Id, - Cartidge = w.AmmunitionType == ammunitionType + Cartridge = w.AmmunitionType == ammunitionType }), elementSorter: e => e.Id); @@ -942,7 +942,7 @@ await AssertQuery( w => new { w.Id, - Cartidge = w.AmmunitionType == ammunitionType + Cartridge = w.AmmunitionType == ammunitionType }), elementSorter: e => e.Id); } @@ -989,7 +989,7 @@ public virtual Task Select_ternary_operation_with_has_value_not_null(bool isAsyn w => new { w.Id, - IsCartidge = w.AmmunitionType.HasValue && w.AmmunitionType.Value == AmmunitionType.Cartridge ? "Yes" : "No" + IsCartridge = w.AmmunitionType.HasValue && w.AmmunitionType.Value == AmmunitionType.Cartridge ? "Yes" : "No" }), elementSorter: e => e.Id); } @@ -1004,7 +1004,7 @@ public virtual Task Select_ternary_operation_multiple_conditions(bool isAsync) w => new { w.Id, - IsCartidge = w.AmmunitionType == AmmunitionType.Shell && w.SynergyWithId == 1 ? "Yes" : "No" + IsCartridge = w.AmmunitionType == AmmunitionType.Shell && w.SynergyWithId == 1 ? "Yes" : "No" }), elementSorter: e => e.Id); } @@ -1019,7 +1019,7 @@ public virtual Task Select_ternary_operation_multiple_conditions_2(bool isAsync) w => new { w.Id, - IsCartidge = !w.IsAutomatic && w.SynergyWithId == 1 ? "Yes" : "No" + IsCartridge = !w.IsAutomatic && w.SynergyWithId == 1 ? "Yes" : "No" }), elementSorter: e => e.Id); } @@ -1034,7 +1034,7 @@ public virtual Task Select_multiple_conditions(bool isAsync) w => new { w.Id, - IsCartidge = !w.IsAutomatic && w.SynergyWithId == 1 + IsCartridge = !w.IsAutomatic && w.SynergyWithId == 1 }), elementSorter: e => e.Id); } @@ -1049,7 +1049,7 @@ public virtual Task Select_nested_ternary_operations(bool isAsync) w => new { w.Id, - IsManualCartidge = !w.IsAutomatic + IsManualCartridge = !w.IsAutomatic ? w.AmmunitionType == AmmunitionType.Cartridge ? "ManualCartridge" : "Manual" : "Auto" }), @@ -5774,7 +5774,7 @@ public virtual void Include_with_group_by_distinct() [ConditionalTheory] [MemberData(nameof(IsAsyncData))] - public virtual Task Null_semantics_on_nullable_bool_from_inner_join_subuery_is_fully_applied(bool isAsync) + public virtual Task Null_semantics_on_nullable_bool_from_inner_join_subquery_is_fully_applied(bool isAsync) { return AssertQuery( isAsync, @@ -5787,7 +5787,7 @@ join h in fs.OfType().Where(f => f.Name == "Swarm") on ll.Name equa [ConditionalTheory] [MemberData(nameof(IsAsyncData))] - public virtual Task Null_semantics_on_nullable_bool_from_left_join_subuery_is_fully_applied(bool isAsync) + public virtual Task Null_semantics_on_nullable_bool_from_left_join_subquery_is_fully_applied(bool isAsync) { return AssertQuery( isAsync, @@ -7310,7 +7310,7 @@ public virtual Task GetValueOrDefault_with_argument_complex(bool isAsync) [ConditionalTheory] [MemberData(nameof(IsAsyncData))] - public virtual Task Filter_with_compex_predicate_containig_subquery(bool isAsync) + public virtual Task Filter_with_complex_predicate_containing_subquery(bool isAsync) { return AssertQuery( isAsync, @@ -7321,7 +7321,7 @@ public virtual Task Filter_with_compex_predicate_containig_subquery(bool isAsync [ConditionalTheory] [MemberData(nameof(IsAsyncData))] - public virtual Task Query_with_complex_let_containing_ordering_and_filter_projecting_firstOrDefefault_element_of_let(bool isAsync) + public virtual Task Query_with_complex_let_containing_ordering_and_filter_projecting_firstOrDefault_element_of_let(bool isAsync) { return AssertQuery( isAsync, diff --git a/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryTestBase.cs index 8abbd6497a1..c0099cbd748 100644 --- a/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryTestBase.cs @@ -102,7 +102,7 @@ public virtual void Include_reference_with_inheritance_reverse() } [ConditionalFact] - public virtual void Include_self_refence_with_inheritence() + public virtual void Include_self_reference_with_inheritance() { using (var context = CreateContext()) { @@ -114,7 +114,7 @@ public virtual void Include_self_refence_with_inheritence() } [ConditionalFact] - public virtual void Include_self_refence_with_inheritence_reverse() + public virtual void Include_self_reference_with_inheritance_reverse() { using (var context = CreateContext()) { diff --git a/test/EFCore.Specification.Tests/Query/InheritanceTestBase.cs b/test/EFCore.Specification.Tests/Query/InheritanceTestBase.cs index 238d55c911f..8fec8252579 100644 --- a/test/EFCore.Specification.Tests/Query/InheritanceTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/InheritanceTestBase.cs @@ -29,11 +29,11 @@ public virtual void Can_query_when_shared_column() var coke = context.Set().Single(); Assert.Equal(6, coke.SugarGrams); Assert.Equal(4, coke.CaffeineGrams); - Assert.Equal(5, coke.Carbination); + Assert.Equal(5, coke.Carbonation); var lilt = context.Set().Single(); Assert.Equal(4, lilt.SugarGrams); - Assert.Equal(7, lilt.Carbination); + Assert.Equal(7, lilt.Carbonation); var tea = context.Set().Single(); Assert.True(tea.HasMilk); @@ -52,11 +52,11 @@ public virtual void Can_query_all_types_when_shared_column() var coke = drinks.OfType().Single(); Assert.Equal(6, coke.SugarGrams); Assert.Equal(4, coke.CaffeineGrams); - Assert.Equal(5, coke.Carbination); + Assert.Equal(5, coke.Carbonation); var lilt = drinks.OfType().Single(); Assert.Equal(4, lilt.SugarGrams); - Assert.Equal(7, lilt.Carbination); + Assert.Equal(7, lilt.Carbonation); var tea = drinks.OfType().Single(); Assert.True(tea.HasMilk); @@ -397,17 +397,17 @@ public virtual void Discriminator_with_cast_in_shadow_property() { using (var context = CreateContext()) { - var preditors + var predators = context.Set() .Where(b => "Kiwi" == EF.Property(b, "Discriminator")) .Select( k => new { - Preditor = EF.Property((Bird)k, "EagleId") + Predator = EF.Property((Bird)k, "EagleId") }) .ToArray(); - Assert.Equal(1, preditors.Length); + Assert.Equal(1, predators.Length); } } diff --git a/test/EFCore.Specification.Tests/Query/QueryNavigationsTestBase.cs b/test/EFCore.Specification.Tests/Query/QueryNavigationsTestBase.cs index f395985ffa8..b74d2f00e37 100644 --- a/test/EFCore.Specification.Tests/Query/QueryNavigationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/QueryNavigationsTestBase.cs @@ -126,10 +126,10 @@ from od in grouping2 entryCount: 89); } - private static readonly Random _randomGenrator = new Random(); + private static readonly Random _randomGenerator = new Random(); private static T ClientProjection(T t, object _) => t; private static bool ClientPredicate(T t, object _) => true; - private static int ClientOrderBy(T t, object _) => _randomGenrator.Next(0, 20); + private static int ClientOrderBy(T t, object _) => _randomGenerator.Next(0, 20); [ConditionalTheory] [MemberData(nameof(IsAsyncData))] diff --git a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs index 9e07d8b0efa..f0548118018 100644 --- a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs +++ b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Select.cs @@ -33,7 +33,7 @@ into id [ConditionalTheory] [MemberData(nameof(IsAsyncData))] - public virtual Task Projection_when_arithmetic_expression_precendence(bool isAsync) + public virtual Task Projection_when_arithmetic_expression_precedence(bool isAsync) { return AssertQuery( isAsync, diff --git a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Where.cs b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Where.cs index 04420ac3667..d66f0ff3115 100644 --- a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Where.cs +++ b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.Where.cs @@ -1437,7 +1437,7 @@ public virtual Task Where_bool_member_and_parameter_compared_to_binary_expressio [ConditionalTheory] [MemberData(nameof(IsAsyncData))] - public virtual Task Where_de_morgan_or_optimizated(bool isAsync) + public virtual Task Where_de_morgan_or_optimized(bool isAsync) { return AssertQuery( isAsync, @@ -1446,7 +1446,7 @@ public virtual Task Where_de_morgan_or_optimizated(bool isAsync) [ConditionalTheory] [MemberData(nameof(IsAsyncData))] - public virtual Task Where_de_morgan_and_optimizated(bool isAsync) + public virtual Task Where_de_morgan_and_optimized(bool isAsync) { return AssertQuery( isAsync, diff --git a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.cs index 9d7497bbc4f..372f8a06424 100644 --- a/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.cs @@ -5789,7 +5789,7 @@ public virtual void Manual_expression_tree_typed_null_equality() [ConditionalTheory] [MemberData(nameof(IsAsyncData))] - public virtual Task Let_subquery_with_multiple_occurences(bool isAsync) + public virtual Task Let_subquery_with_multiple_occurrences(bool isAsync) { return AssertQuery( isAsync, diff --git a/test/EFCore.Specification.Tests/TestModels/Inheritance/Coke.cs b/test/EFCore.Specification.Tests/TestModels/Inheritance/Coke.cs index 7bc3781be65..6497f2f5679 100644 --- a/test/EFCore.Specification.Tests/TestModels/Inheritance/Coke.cs +++ b/test/EFCore.Specification.Tests/TestModels/Inheritance/Coke.cs @@ -7,6 +7,6 @@ public class Coke : Drink, ISugary { public int SugarGrams { get; set; } public int CaffeineGrams { get; set; } - public int Carbination { get; set; } + public int Carbonation { get; set; } } } diff --git a/test/EFCore.Specification.Tests/TestModels/Inheritance/InheritanceContext.cs b/test/EFCore.Specification.Tests/TestModels/Inheritance/InheritanceContext.cs index 29b678ec958..4e87f18ccfe 100644 --- a/test/EFCore.Specification.Tests/TestModels/Inheritance/InheritanceContext.cs +++ b/test/EFCore.Specification.Tests/TestModels/Inheritance/InheritanceContext.cs @@ -76,13 +76,13 @@ public static void SeedData(InheritanceContext context) new Lilt { SugarGrams = 4, - Carbination = 7 + Carbonation = 7 }, new Coke { SugarGrams = 6, CaffeineGrams = 4, - Carbination = 5 + Carbonation = 5 }); context.SaveChanges(); diff --git a/test/EFCore.Specification.Tests/TestModels/Inheritance/Lilt.cs b/test/EFCore.Specification.Tests/TestModels/Inheritance/Lilt.cs index b292bbd08cc..820d2ff3c8c 100644 --- a/test/EFCore.Specification.Tests/TestModels/Inheritance/Lilt.cs +++ b/test/EFCore.Specification.Tests/TestModels/Inheritance/Lilt.cs @@ -6,6 +6,6 @@ namespace Microsoft.EntityFrameworkCore.TestModels.Inheritance public class Lilt : Drink, ISugary { public int SugarGrams { get; set; } - public int Carbination { get; set; } + public int Carbonation { get; set; } } } diff --git a/test/EFCore.Specification.Tests/TestUtilities/IncludeQueryResultAsserter.cs b/test/EFCore.Specification.Tests/TestUtilities/IncludeQueryResultAsserter.cs index 6e1d74552a3..845bcc98a12 100644 --- a/test/EFCore.Specification.Tests/TestUtilities/IncludeQueryResultAsserter.cs +++ b/test/EFCore.Specification.Tests/TestUtilities/IncludeQueryResultAsserter.cs @@ -145,8 +145,8 @@ protected virtual void AssertCollection( protected void ProcessIncludes(TEntity expected, TEntity actual, IEnumerable expectedIncludes) { - var curentPath = string.Join(".", _path); - foreach (var expectedInclude in expectedIncludes.OfType>().Where(i => i.NavigationPath == curentPath)) + var currentPath = string.Join(".", _path); + foreach (var expectedInclude in expectedIncludes.OfType>().Where(i => i.NavigationPath == currentPath)) { var expectedIncludedNavigation = expectedInclude.Include(expected); var actualIncludedNavigation = expectedInclude.Include(actual); diff --git a/test/EFCore.Specification.Tests/TestUtilities/TestHelpers.cs b/test/EFCore.Specification.Tests/TestUtilities/TestHelpers.cs index a5fb50f21f5..d472ddc0dd2 100644 --- a/test/EFCore.Specification.Tests/TestUtilities/TestHelpers.cs +++ b/test/EFCore.Specification.Tests/TestUtilities/TestHelpers.cs @@ -293,7 +293,7 @@ public static int AssertResults( if (elementAsserter != null) { throw new InvalidOperationException( - "Elemenent asserter will not be used because results are not properly ordered - either remove asserter from the AssertQuery, add element sorter or set assertOrder to 'true'."); + "Element asserter will not be used because results are not properly ordered - either remove asserter from the AssertQuery, add element sorter or set assertOrder to 'true'."); } return AssertResults(expected, actual, assertOrder: false); @@ -333,7 +333,7 @@ public static int AssertResults( if (elementAsserter != null) { throw new InvalidOperationException( - "Elemenent asserter will not be used because results are not properly ordered - either remove asserter from the AssertQuery, add element sorter or set assertOrder to 'true'."); + "Element asserter will not be used because results are not properly ordered - either remove asserter from the AssertQuery, add element sorter or set assertOrder to 'true'."); } return AssertResults(expected, actual, assertOrder: false); @@ -373,7 +373,7 @@ public static int AssertResultsNullable( if (elementAsserter != null) { throw new InvalidOperationException( - "Elemenent asserter will not be used because results are not properly ordered - either remove asserter from the AssertQuery, add element sorter or set assertOrder to 'true'."); + "Element asserter will not be used because results are not properly ordered - either remove asserter from the AssertQuery, add element sorter or set assertOrder to 'true'."); } return AssertResults(expected, actual, assertOrder: false); diff --git a/test/EFCore.Specification.Tests/WithConstructorsTestBase.cs b/test/EFCore.Specification.Tests/WithConstructorsTestBase.cs index b445d7f038e..0e75f8c09e8 100644 --- a/test/EFCore.Specification.Tests/WithConstructorsTestBase.cs +++ b/test/EFCore.Specification.Tests/WithConstructorsTestBase.cs @@ -538,7 +538,7 @@ public virtual void Attaching_entity_sets_lazy_loader() } [ConditionalFact] - public virtual void Detatching_entity_resets_lazy_loader_so_it_can_be_reattached() + public virtual void Detaching_entity_resets_lazy_loader_so_it_can_be_reattached() { LazyPropertyPost post; using (var context = CreateContext()) @@ -620,7 +620,7 @@ public virtual void Attaching_entity_sets_lazy_loader_field() } [ConditionalFact] - public virtual void Detatching_entity_resets_lazy_loader_field_so_it_can_be_reattached() + public virtual void Detaching_entity_resets_lazy_loader_field_so_it_can_be_reattached() { LazyFieldPost post; using (var context = CreateContext()) @@ -677,7 +677,7 @@ public virtual void Attaching_entity_sets_lazy_loader_delegate() } [ConditionalFact] - public virtual void Detatching_entity_resets_lazy_loader_delegate_so_it_can_be_reattached() + public virtual void Detaching_entity_resets_lazy_loader_delegate_so_it_can_be_reattached() { LazyPcsPost post; using (var context = CreateContext()) diff --git a/test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs index 3c91baef0c6..1a0c6eb6fa1 100644 --- a/test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs @@ -1711,7 +1711,7 @@ private static void AssertMappedNullableDataTypesWithIdentity(MappedNullableData Assert.Equal(82.2m, entity.DecimalAsSmallmoney); Assert.Equal(83.3, entity.DoubleAsFloat); Assert.Equal(84.4f, entity.FloatAsReal); - Assert.Equal(85.5, entity.DoubkleAsDoublePrecision); + Assert.Equal(85.5, entity.DoubleAsDoublePrecision); Assert.Equal(new DateTime(2015, 1, 2), entity.DateTimeAsDate); Assert.Equal(new DateTimeOffset(new DateTime(2016, 1, 2, 11, 11, 12), TimeSpan.Zero), entity.DateTimeOffsetAsDatetimeoffset); Assert.Equal(new DateTime(2017, 1, 2, 12, 11, 12), entity.DateTimeAsDatetime2); @@ -1768,7 +1768,7 @@ private static MappedNullableDataTypesWithIdentity CreateMappedNullableDataTypes DecimalAsSmallmoney = 82.2m, DoubleAsFloat = 83.3, FloatAsReal = 84.4f, - DoubkleAsDoublePrecision = 85.5, + DoubleAsDoublePrecision = 85.5, DateTimeAsDate = new DateTime(2015, 1, 2, 10, 11, 12), DateTimeOffsetAsDatetimeoffset = new DateTimeOffset(new DateTime(2016, 1, 2, 11, 11, 12), TimeSpan.Zero), DateTimeAsDatetime2 = new DateTime(2017, 1, 2, 12, 11, 12), @@ -1899,7 +1899,7 @@ private static void AssertNullMappedNullableDataTypesWithIdentity( Assert.Null(entity.DecimalAsSmallmoney); Assert.Null(entity.DoubleAsFloat); Assert.Null(entity.FloatAsReal); - Assert.Null(entity.DoubkleAsDoublePrecision); + Assert.Null(entity.DoubleAsDoublePrecision); Assert.Null(entity.DateTimeAsDate); Assert.Null(entity.DateTimeOffsetAsDatetimeoffset); Assert.Null(entity.DateTimeAsDatetime2); @@ -2790,7 +2790,7 @@ public virtual void Columns_have_expected_data_types() MappedNullableDataTypesWithIdentity.DecimalAsMoney ---> [nullable money] [Precision = 19 Scale = 4] MappedNullableDataTypesWithIdentity.DecimalAsNumeric ---> [nullable numeric] [Precision = 18 Scale = 0] MappedNullableDataTypesWithIdentity.DecimalAsSmallmoney ---> [nullable smallmoney] [Precision = 10 Scale = 4] -MappedNullableDataTypesWithIdentity.DoubkleAsDoublePrecision ---> [nullable float] [Precision = 53] +MappedNullableDataTypesWithIdentity.DoubleAsDoublePrecision ---> [nullable float] [Precision = 53] MappedNullableDataTypesWithIdentity.DoubleAsFloat ---> [nullable float] [Precision = 53] MappedNullableDataTypesWithIdentity.EnumAsNvarchar20 ---> [nullable nvarchar] [MaxLength = 20] MappedNullableDataTypesWithIdentity.EnumAsVarcharMax ---> [nullable varchar] [MaxLength = -1] @@ -3877,7 +3877,7 @@ protected class MappedNullableDataTypesWithIdentity public float? FloatAsReal { get; set; } [Column(TypeName = "double precision")] - public double? DoubkleAsDoublePrecision { get; set; } + public double? DoubleAsDoublePrecision { get; set; } [Column(TypeName = "date")] public DateTime? DateTimeAsDate { get; set; } diff --git a/test/EFCore.SqlServer.FunctionalTests/ConnectionSpecificationTest.cs b/test/EFCore.SqlServer.FunctionalTests/ConnectionSpecificationTest.cs index 015315bc7c7..19522af1cca 100644 --- a/test/EFCore.SqlServer.FunctionalTests/ConnectionSpecificationTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/ConnectionSpecificationTest.cs @@ -263,7 +263,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) } [ConditionalTheory] - [InlineData("MyConnectuonString", "name=MyConnectuonString")] + [InlineData("MyConnectionString", "name=MyConnectionString")] [InlineData("ConnectionStrings:DefaultConnection", "name=ConnectionStrings:DefaultConnection")] [InlineData("ConnectionStrings:DefaultConnection", " NamE = ConnectionStrings:DefaultConnection ")] public void Can_use_AddDbContext_and_get_connection_string_from_config(string key, string connectionString) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/DbFunctionsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/DbFunctionsSqlServerTest.cs index 7d05b892e5e..883b41da28d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/DbFunctionsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/DbFunctionsSqlServerTest.cs @@ -235,7 +235,7 @@ await Assert.ThrowsAsync( [ConditionalFact] [SqlServerCondition(SqlServerCondition.SupportsFullTextSearch)] - public async Task FreeText_throws_when_using_non_column_for_propeprty_reference() + public async Task FreeText_throws_when_using_non_column_for_property_reference() { using (var context = CreateContext()) { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs index 307cc791ae1..13859b3f097 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs @@ -906,7 +906,7 @@ public override async Task Select_comparison_with_null(bool isAsync) SELECT [w].[Id], CASE WHEN (([w].[AmmunitionType] = @__ammunitionType_0) AND ([w].[AmmunitionType] IS NOT NULL AND @__ammunitionType_0 IS NOT NULL)) OR ([w].[AmmunitionType] IS NULL AND @__ammunitionType_0 IS NULL) THEN CAST(1 AS bit) ELSE CAST(0 AS bit) -END AS [Cartidge] +END AS [Cartridge] FROM [Weapons] AS [w] WHERE (([w].[AmmunitionType] = @__ammunitionType_0) AND ([w].[AmmunitionType] IS NOT NULL AND @__ammunitionType_0 IS NOT NULL)) OR ([w].[AmmunitionType] IS NULL AND @__ammunitionType_0 IS NULL)", // @@ -915,7 +915,7 @@ FROM [Weapons] AS [w] SELECT [w].[Id], CASE WHEN (([w].[AmmunitionType] = @__ammunitionType_0) AND ([w].[AmmunitionType] IS NOT NULL AND @__ammunitionType_0 IS NOT NULL)) OR ([w].[AmmunitionType] IS NULL AND @__ammunitionType_0 IS NULL) THEN CAST(1 AS bit) ELSE CAST(0 AS bit) -END AS [Cartidge] +END AS [Cartridge] FROM [Weapons] AS [w] WHERE (([w].[AmmunitionType] = @__ammunitionType_0) AND ([w].[AmmunitionType] IS NOT NULL AND @__ammunitionType_0 IS NOT NULL)) OR ([w].[AmmunitionType] IS NULL AND @__ammunitionType_0 IS NULL)"); } @@ -952,7 +952,7 @@ public override async Task Select_ternary_operation_with_has_value_not_null(bool @"SELECT [w].[Id], CASE WHEN [w].[AmmunitionType] IS NOT NULL AND (([w].[AmmunitionType] = 1) AND [w].[AmmunitionType] IS NOT NULL) THEN N'Yes' ELSE N'No' -END AS [IsCartidge] +END AS [IsCartridge] FROM [Weapons] AS [w] WHERE [w].[AmmunitionType] IS NOT NULL AND (([w].[AmmunitionType] = 1) AND [w].[AmmunitionType] IS NOT NULL)"); } @@ -965,7 +965,7 @@ public override async Task Select_ternary_operation_multiple_conditions(bool isA @"SELECT [w].[Id], CASE WHEN (([w].[AmmunitionType] = 2) AND [w].[AmmunitionType] IS NOT NULL) AND (([w].[SynergyWithId] = 1) AND [w].[SynergyWithId] IS NOT NULL) THEN N'Yes' ELSE N'No' -END AS [IsCartidge] +END AS [IsCartridge] FROM [Weapons] AS [w]"); } @@ -977,7 +977,7 @@ public override async Task Select_ternary_operation_multiple_conditions_2(bool i @"SELECT [w].[Id], CASE WHEN ([w].[IsAutomatic] <> CAST(1 AS bit)) AND (([w].[SynergyWithId] = 1) AND [w].[SynergyWithId] IS NOT NULL) THEN N'Yes' ELSE N'No' -END AS [IsCartidge] +END AS [IsCartridge] FROM [Weapons] AS [w]"); } @@ -989,7 +989,7 @@ public override async Task Select_multiple_conditions(bool isAsync) @"SELECT [w].[Id], CASE WHEN ([w].[IsAutomatic] <> CAST(1 AS bit)) AND (([w].[SynergyWithId] = 1) AND [w].[SynergyWithId] IS NOT NULL) THEN CAST(1 AS bit) ELSE CAST(0 AS bit) -END AS [IsCartidge] +END AS [IsCartridge] FROM [Weapons] AS [w]"); } @@ -1004,7 +1004,7 @@ public override async Task Select_nested_ternary_operations(bool isAsync) ELSE N'Manual' END ELSE N'Auto' -END AS [IsManualCartidge] +END AS [IsManualCartridge] FROM [Weapons] AS [w]"); } @@ -6085,9 +6085,9 @@ WHERE [g0].[Discriminator] IN (N'Officer', N'Gear') ORDER BY [t].[Nickname], [t].[FullName]"); } - public override async Task Null_semantics_on_nullable_bool_from_inner_join_subuery_is_fully_applied(bool isAsync) + public override async Task Null_semantics_on_nullable_bool_from_inner_join_subquery_is_fully_applied(bool isAsync) { - await base.Null_semantics_on_nullable_bool_from_inner_join_subuery_is_fully_applied(isAsync); + await base.Null_semantics_on_nullable_bool_from_inner_join_subquery_is_fully_applied(isAsync); AssertSql( @"SELECT [t].[Id], [t].[CapitalName], [t].[Discriminator], [t].[Name], [t].[CommanderName], [t].[Eradicated] @@ -6100,9 +6100,9 @@ FROM [Factions] AS [f] WHERE [l].[Discriminator] IN (N'LocustLeader', N'LocustCommander') AND (([t].[Eradicated] <> CAST(1 AS bit)) OR [t].[Eradicated] IS NULL)"); } - public override async Task Null_semantics_on_nullable_bool_from_left_join_subuery_is_fully_applied(bool isAsync) + public override async Task Null_semantics_on_nullable_bool_from_left_join_subquery_is_fully_applied(bool isAsync) { - await base.Null_semantics_on_nullable_bool_from_left_join_subuery_is_fully_applied(isAsync); + await base.Null_semantics_on_nullable_bool_from_left_join_subquery_is_fully_applied(isAsync); AssertSql( @"SELECT [t].[Id], [t].[CapitalName], [t].[Discriminator], [t].[Name], [t].[CommanderName], [t].[Eradicated] @@ -7825,9 +7825,9 @@ FROM [Weapons] AS [w] WHERE COALESCE([w].[SynergyWithId], CAST(LEN([w].[Name]) AS int) + 42) > 10"); } - public override async Task Filter_with_compex_predicate_containig_subquery(bool isAsync) + public override async Task Filter_with_complex_predicate_containing_subquery(bool isAsync) { - await base.Filter_with_compex_predicate_containig_subquery(isAsync); + await base.Filter_with_complex_predicate_containing_subquery(isAsync); AssertSql( @"SELECT [g].[Nickname], [g].[SquadId], [g].[AssignedCityName], [g].[CityOrBirthName], [g].[Discriminator], [g].[FullName], [g].[HasSoulPatch], [g].[LeaderNickname], [g].[LeaderSquadId], [g].[Rank] @@ -7839,9 +7839,9 @@ FROM [Weapons] AS [w] ORDER BY [w].[Id]) IS NOT NULL)"); } - public override async Task Query_with_complex_let_containing_ordering_and_filter_projecting_firstOrDefefault_element_of_let(bool isAsync) + public override async Task Query_with_complex_let_containing_ordering_and_filter_projecting_firstOrDefault_element_of_let(bool isAsync) { - await base.Query_with_complex_let_containing_ordering_and_filter_projecting_firstOrDefefault_element_of_let(isAsync); + await base.Query_with_complex_let_containing_ordering_and_filter_projecting_firstOrDefault_element_of_let(isAsync); AssertSql( @"SELECT [g].[Nickname], ( diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceRelationshipsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceRelationshipsQuerySqlServerTest.cs index 684451865a0..78153ade343 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceRelationshipsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceRelationshipsQuerySqlServerTest.cs @@ -45,9 +45,9 @@ WHERE [b0].[Discriminator] IN (N'BaseInheritanceRelationshipEntity', N'DerivedIn WHERE [b].[Discriminator] IN (N'BaseReferenceOnBase', N'DerivedReferenceOnBase')"); } - public override void Include_self_refence_with_inheritence() + public override void Include_self_reference_with_inheritance() { - base.Include_self_refence_with_inheritence(); + base.Include_self_reference_with_inheritance(); AssertSql( @"SELECT [b].[Id], [b].[Discriminator], [b].[Name], [b].[BaseId], [t].[Id], [t].[Discriminator], [t].[Name], [t].[BaseId] @@ -60,9 +60,9 @@ FROM [BaseEntities] AS [b0] WHERE [b].[Discriminator] IN (N'BaseInheritanceRelationshipEntity', N'DerivedInheritanceRelationshipEntity')"); } - public override void Include_self_refence_with_inheritence_reverse() + public override void Include_self_reference_with_inheritance_reverse() { - base.Include_self_refence_with_inheritence_reverse(); + base.Include_self_reference_with_inheritance_reverse(); AssertSql( @"SELECT [b].[Id], [b].[Discriminator], [b].[Name], [b].[BaseId], [t].[Id], [t].[Discriminator], [t].[Name], [t].[BaseId] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceSqlServerTest.cs index 8109ca6ce8e..ee897aa24a6 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/InheritanceSqlServerTest.cs @@ -32,10 +32,10 @@ public virtual void Common_property_shares_column() Assert.Equal("SugarGrams", cokeType.FindProperty("SugarGrams").GetColumnName()); Assert.Equal("CaffeineGrams", cokeType.FindProperty("CaffeineGrams").GetColumnName()); - Assert.Equal("CokeCO2", cokeType.FindProperty("Carbination").GetColumnName()); + Assert.Equal("CokeCO2", cokeType.FindProperty("Carbonation").GetColumnName()); Assert.Equal("SugarGrams", liltType.FindProperty("SugarGrams").GetColumnName()); - Assert.Equal("LiltCO2", liltType.FindProperty("Carbination").GetColumnName()); + Assert.Equal("LiltCO2", liltType.FindProperty("Carbonation").GetColumnName()); Assert.Equal("CaffeineGrams", teaType.FindProperty("CaffeineGrams").GetColumnName()); Assert.Equal("HasMilk", teaType.FindProperty("HasMilk").GetColumnName()); @@ -428,13 +428,13 @@ public override void Union_siblings_with_duplicate_property_in_subquery() base.Union_siblings_with_duplicate_property_in_subquery(); AssertSql( - @"SELECT [t].[Id], [t].[Discriminator], [t].[CaffeineGrams], [t].[CokeCO2], [t].[SugarGrams], [t].[Carbination], [t].[SugarGrams0], [t].[CaffeineGrams0], [t].[HasMilk] + @"SELECT [t].[Id], [t].[Discriminator], [t].[CaffeineGrams], [t].[CokeCO2], [t].[SugarGrams], [t].[Carbonation], [t].[SugarGrams0], [t].[CaffeineGrams0], [t].[HasMilk] FROM ( - SELECT [d].[Id], [d].[Discriminator], [d].[CaffeineGrams], [d].[CokeCO2], [d].[SugarGrams], NULL AS [CaffeineGrams0], NULL AS [HasMilk], NULL AS [Carbination], NULL AS [SugarGrams0] + SELECT [d].[Id], [d].[Discriminator], [d].[CaffeineGrams], [d].[CokeCO2], [d].[SugarGrams], NULL AS [CaffeineGrams0], NULL AS [HasMilk], NULL AS [Carbonation], NULL AS [SugarGrams0] FROM [Drink] AS [d] WHERE [d].[Discriminator] = N'Coke' UNION - SELECT [d0].[Id], [d0].[Discriminator], NULL AS [CaffeineGrams], NULL AS [CokeCO2], NULL AS [SugarGrams], [d0].[CaffeineGrams] AS [CaffeineGrams0], [d0].[HasMilk], NULL AS [Carbination], NULL AS [SugarGrams0] + SELECT [d0].[Id], [d0].[Discriminator], NULL AS [CaffeineGrams], NULL AS [CokeCO2], NULL AS [SugarGrams], [d0].[CaffeineGrams] AS [CaffeineGrams0], [d0].[HasMilk], NULL AS [Carbonation], NULL AS [SugarGrams0] FROM [Drink] AS [d0] WHERE [d0].[Discriminator] = N'Tea' ) AS [t] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Select.cs b/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Select.cs index 8300d42fa98..0f4298562f9 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Select.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Select.cs @@ -7,9 +7,9 @@ namespace Microsoft.EntityFrameworkCore.Query { public partial class SimpleQuerySqlServerTest { - public override async Task Projection_when_arithmetic_expression_precendence(bool isAsync) + public override async Task Projection_when_arithmetic_expression_precedence(bool isAsync) { - await base.Projection_when_arithmetic_expression_precendence(isAsync); + await base.Projection_when_arithmetic_expression_precedence(isAsync); AssertSql( @"SELECT [o].[OrderID] / ([o].[OrderID] / 2) AS [A], ([o].[OrderID] / [o].[OrderID]) / 2 AS [B] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Where.cs b/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Where.cs index 7f69179420e..5d70cd50ec7 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Where.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.Where.cs @@ -1276,9 +1276,9 @@ ELSE CAST(0 AS bit) END"); } - public override async Task Where_de_morgan_or_optimizated(bool isAsync) + public override async Task Where_de_morgan_or_optimized(bool isAsync) { - await base.Where_de_morgan_or_optimizated(isAsync); + await base.Where_de_morgan_or_optimized(isAsync); AssertSql( @"SELECT [p].[ProductID], [p].[Discontinued], [p].[ProductName], [p].[SupplierID], [p].[UnitPrice], [p].[UnitsInStock] @@ -1286,9 +1286,9 @@ FROM [Products] AS [p] WHERE ([p].[Discontinued] <> CAST(1 AS bit)) AND ([p].[ProductID] >= 20)"); } - public override async Task Where_de_morgan_and_optimizated(bool isAsync) + public override async Task Where_de_morgan_and_optimized(bool isAsync) { - await base.Where_de_morgan_and_optimizated(isAsync); + await base.Where_de_morgan_and_optimized(isAsync); AssertSql( @"SELECT [p].[ProductID], [p].[Discontinued], [p].[ProductName], [p].[SupplierID], [p].[UnitPrice], [p].[UnitsInStock] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.cs index 3143a1def15..de785b58ce8 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/SimpleQuerySqlServerTest.cs @@ -4701,9 +4701,9 @@ FROM [Orders] AS [o] WHERE [o].[OrderID] < 10300"); } - public override async Task Let_subquery_with_multiple_occurences(bool isAsync) + public override async Task Let_subquery_with_multiple_occurrences(bool isAsync) { - await base.Let_subquery_with_multiple_occurences(isAsync); + await base.Let_subquery_with_multiple_occurrences(isAsync); AssertSql( @"SELECT ( diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs index 7c8cd26d8ae..afac66567af 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs @@ -1108,7 +1108,7 @@ public void Default_max_length_are_added_to_nchar_1() @" CREATE TABLE DefaultRequiredLengthNcharColumns ( Id int, - natioanlCharColumn national char(4000), + nationalCharColumn national char(4000), );", Enumerable.Empty(), Enumerable.Empty(), @@ -1116,7 +1116,7 @@ natioanlCharColumn national char(4000), { var columns = dbModel.Tables.Single().Columns; - Assert.Equal("nchar(4000)", columns.Single(c => c.Name == "natioanlCharColumn").StoreType); + Assert.Equal("nchar(4000)", columns.Single(c => c.Name == "nationalCharColumn").StoreType); }, "DROP TABLE DefaultRequiredLengthNcharColumns;"); } diff --git a/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationScenariosTest.cs b/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationScenariosTest.cs index 67627638ddb..b271739eee6 100644 --- a/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationScenariosTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/SqlServerValueGenerationScenariosTest.cs @@ -256,13 +256,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) base.OnModelCreating(modelBuilder); modelBuilder - .HasSequence("MyStrinySequence") + .HasSequence("MyStringSequence") .StartsAt(77); modelBuilder .Entity() .Property(e => e.Id) - .HasDefaultValueSql("'i' + CAST((NEXT VALUE FOR MyStrinySequence) AS VARCHAR(20))"); + .HasDefaultValueSql("'i' + CAST((NEXT VALUE FOR MyStringSequence) AS VARCHAR(20))"); } } @@ -1176,7 +1176,7 @@ public void Update_explicit_value_in_computed_column() // Concurrency [ConditionalFact] - public void Resolve_concurreny() + public void Resolve_concurrency() { using (var testStore = SqlServerTestStore.CreateInitialized(DatabaseName)) { @@ -1206,7 +1206,7 @@ public void Resolve_concurreny() } catch (DbUpdateConcurrencyException) { - // Update origianal values (and optionally any current values) + // Update original values (and optionally any current values) // Would normally do this with just one method call context.Entry(blog).Property(e => e.Id).OriginalValue = updatedBlog.Id; context.Entry(blog).Property(e => e.Name).OriginalValue = updatedBlog.Name; diff --git a/test/EFCore.SqlServer.Tests/SqlServerDatabaseFacadeTest.cs b/test/EFCore.SqlServer.Tests/SqlServerDatabaseFacadeTest.cs index 9d85948ee65..4b307b3144a 100644 --- a/test/EFCore.SqlServer.Tests/SqlServerDatabaseFacadeTest.cs +++ b/test/EFCore.SqlServer.Tests/SqlServerDatabaseFacadeTest.cs @@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore public class SqlServerDatabaseFacadeTest { [ConditionalFact] - public void IsSqlServer_when_using_OnConfguring() + public void IsSqlServer_when_using_OnConfiguring() { using (var context = new SqlServerOnConfiguringContext()) { @@ -19,7 +19,7 @@ public void IsSqlServer_when_using_OnConfguring() } [ConditionalFact] - public void IsSqlServer_in_OnModelCreating_when_using_OnConfguring() + public void IsSqlServer_in_OnModelCreating_when_using_OnConfiguring() { using (var context = new SqlServerOnModelContext()) { @@ -29,7 +29,7 @@ public void IsSqlServer_in_OnModelCreating_when_using_OnConfguring() } [ConditionalFact] - public void IsSqlServer_in_constructor_when_using_OnConfguring() + public void IsSqlServer_in_constructor_when_using_OnConfiguring() { using (var context = new SqlServerConstructorContext()) { @@ -39,7 +39,7 @@ public void IsSqlServer_in_constructor_when_using_OnConfguring() } [ConditionalFact] - public void Cannot_use_IsSqlServer_in_OnConfguring() + public void Cannot_use_IsSqlServer_in_OnConfiguring() { using (var context = new SqlServerUseInOnConfiguringContext()) { @@ -92,7 +92,7 @@ public void IsSqlServer_in_constructor_when_using_constructor() } [ConditionalFact] - public void Cannot_use_IsSqlServer_in_OnConfguring_with_constructor() + public void Cannot_use_IsSqlServer_in_OnConfiguring_with_constructor() { using (var context = new ProviderUseInOnConfiguringContext( new DbContextOptionsBuilder() diff --git a/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs b/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs index ed7a8d98075..44f3e7cf007 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Scaffolding/SqliteDatabaseModelFactoryTest.cs @@ -464,7 +464,7 @@ PRIMARY KEY ( Id2, Id1 ) } [ConditionalFact] - public void Create_primary_key_when_integer_primary_key_alised_to_rowid() + public void Create_primary_key_when_integer_primary_key_aliased_to_rowid() { Test( @" diff --git a/test/EFCore.Sqlite.Tests/Storage/SqliteTypeMappingTest.cs b/test/EFCore.Sqlite.Tests/Storage/SqliteTypeMappingTest.cs index 1bd3259b076..5964c72cf4e 100644 --- a/test/EFCore.Sqlite.Tests/Storage/SqliteTypeMappingTest.cs +++ b/test/EFCore.Sqlite.Tests/Storage/SqliteTypeMappingTest.cs @@ -103,6 +103,6 @@ public override void ULong_literal_generated_correctly() protected override DbContextOptions ContextOptions { get; } = new DbContextOptionsBuilder() .UseInternalServiceProvider(new ServiceCollection().AddEntityFrameworkSqlite().BuildServiceProvider()) - .UseSqlite("Filename=dummmy.db").Options; + .UseSqlite("Filename=dummy.db").Options; } } diff --git a/test/EFCore.Tests/ChangeTracking/AggregatesTest.cs b/test/EFCore.Tests/ChangeTracking/AggregatesTest.cs index 0f12c670657..bb5d61b42b6 100644 --- a/test/EFCore.Tests/ChangeTracking/AggregatesTest.cs +++ b/test/EFCore.Tests/ChangeTracking/AggregatesTest.cs @@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.ChangeTracking public class AggregatesTest { [ConditionalFact] - public void Can_add_aggreate() + public void Can_add_aggregate() { using (var context = new AggregateContext()) { @@ -45,7 +45,7 @@ public void Can_add_aggreate() } [ConditionalFact] - public void Can_add_one_to_one_aggreate() + public void Can_add_one_to_one_aggregate() { using (var context = new AggregateContext()) { @@ -63,7 +63,7 @@ public void Can_add_one_to_one_aggreate() } [ConditionalFact] - public void Can_attach_aggreate() + public void Can_attach_aggregate() { using (var context = new AggregateContext()) { @@ -127,7 +127,7 @@ public void Can_attach_aggreate() } [ConditionalFact] - public void Can_attach_one_to_one_aggreate() + public void Can_attach_one_to_one_aggregate() { using (var context = new AggregateContext()) { diff --git a/test/EFCore.Tests/ChangeTracking/CollectionEntryTest.cs b/test/EFCore.Tests/ChangeTracking/CollectionEntryTest.cs index f23d8f6437e..7d3fbe59a9b 100644 --- a/test/EFCore.Tests/ChangeTracking/CollectionEntryTest.cs +++ b/test/EFCore.Tests/ChangeTracking/CollectionEntryTest.cs @@ -268,7 +268,7 @@ public void Can_get_and_set_current_value_start_tracking_generic() } [ConditionalFact] - public void Can_get_and_set_current_value_attched() + public void Can_get_and_set_current_value_attached() { using (var context = new FreezerContext()) { @@ -308,7 +308,7 @@ public void Can_get_and_set_current_value_attched() } [ConditionalFact] - public void Can_get_and_set_current_value_generic_attched() + public void Can_get_and_set_current_value_generic_attached() { using (var context = new FreezerContext()) { diff --git a/test/EFCore.Tests/ChangeTracking/EntityEntryTest.cs b/test/EFCore.Tests/ChangeTracking/EntityEntryTest.cs index f27ad5824c7..2b019b6d1c2 100644 --- a/test/EFCore.Tests/ChangeTracking/EntityEntryTest.cs +++ b/test/EFCore.Tests/ChangeTracking/EntityEntryTest.cs @@ -643,7 +643,7 @@ public void Throws_when_accessing_property_as_collection() } [ConditionalFact] - public void Throws_when_accessing_refernce_as_collection() + public void Throws_when_accessing_reference_as_collection() { using (var context = new FreezerContext()) { diff --git a/test/EFCore.Tests/ChangeTracking/Internal/InternalEntryEntrySubscriberTest.cs b/test/EFCore.Tests/ChangeTracking/Internal/InternalEntryEntrySubscriberTest.cs index 1efa928237f..375552833df 100644 --- a/test/EFCore.Tests/ChangeTracking/Internal/InternalEntryEntrySubscriberTest.cs +++ b/test/EFCore.Tests/ChangeTracking/Internal/InternalEntryEntrySubscriberTest.cs @@ -97,7 +97,7 @@ public void Non_notifying_collection_acceptable_when_snapshot_tracking() [InlineData(ChangeTrackingStrategy.ChangedNotifications)] [InlineData(ChangeTrackingStrategy.ChangingAndChangedNotifications)] [InlineData(ChangeTrackingStrategy.ChangingAndChangedNotificationsWithOriginalValues)] - public void Non_notifying_collections_not_acceotable_when_noitification_tracking( + public void Non_notifying_collections_not_acceptable_when_notification_tracking( ChangeTrackingStrategy changeTrackingStrategy) { var entry = InMemoryTestHelpers.Instance.CreateInternalEntry( diff --git a/test/EFCore.Tests/ChangeTracking/ObservableHashSetTest.cs b/test/EFCore.Tests/ChangeTracking/ObservableHashSetTest.cs index b6622f32650..dd451004b20 100644 --- a/test/EFCore.Tests/ChangeTracking/ObservableHashSetTest.cs +++ b/test/EFCore.Tests/ChangeTracking/ObservableHashSetTest.cs @@ -351,7 +351,7 @@ public void Can_except_with() } [ConditionalFact] - public void Can_symetrical_except_with() + public void Can_symmetrical_except_with() { var hashSet = new ObservableHashSet { diff --git a/test/EFCore.Tests/Infrastructure/InternalSeviceCollectionMapTest.cs b/test/EFCore.Tests/Infrastructure/InternalServiceCollectionMapTest.cs similarity index 99% rename from test/EFCore.Tests/Infrastructure/InternalSeviceCollectionMapTest.cs rename to test/EFCore.Tests/Infrastructure/InternalServiceCollectionMapTest.cs index 908c4b90449..7f46bb36169 100644 --- a/test/EFCore.Tests/Infrastructure/InternalSeviceCollectionMapTest.cs +++ b/test/EFCore.Tests/Infrastructure/InternalServiceCollectionMapTest.cs @@ -10,7 +10,7 @@ namespace Microsoft.EntityFrameworkCore.Infrastructure { - public class InternalSeviceCollectionMapTest + public class InternalServiceCollectionMapTest { [ConditionalFact] public void Can_patch_transient_service_with_concrete_implementation() diff --git a/test/EFCore.Tests/Metadata/Conventions/ConstructorBindingConventionTest.cs b/test/EFCore.Tests/Metadata/Conventions/ConstructorBindingConventionTest.cs index 561ae53ff6f..2c8687c8fb7 100644 --- a/test/EFCore.Tests/Metadata/Conventions/ConstructorBindingConventionTest.cs +++ b/test/EFCore.Tests/Metadata/Conventions/ConstructorBindingConventionTest.cs @@ -399,7 +399,7 @@ public BlogConflict(string title, Guid? shadow, bool dummy, int id) } [ConditionalFact] - public void Resolvess_properties_with_different_kinds_of_name() + public void Resolves_properties_with_different_kinds_of_name() { var constructorBinding = GetBinding(); @@ -456,7 +456,7 @@ public BlogSpanner( [ConditionalFact] public void Binds_to_partial_set_of_parameters_that_resolve() { - var constructorBinding = GetBinding(); + var constructorBinding = GetBinding(); Assert.NotNull(constructorBinding); @@ -473,9 +473,9 @@ public void Binds_to_partial_set_of_parameters_that_resolve() Assert.Equal("m_follows", bindings[1].ConsumedProperties.First().Name); } - private class BlogWierdScience : Blog + private class BlogWeirdScience : Blog { - public BlogWierdScience(string content, int follows) + public BlogWeirdScience(string content, int follows) { } } diff --git a/test/EFCore.Tests/Metadata/Conventions/NavigationAttributeConventionTest.cs b/test/EFCore.Tests/Metadata/Conventions/NavigationAttributeConventionTest.cs index b8f5c8f4ee2..99e19df3f72 100644 --- a/test/EFCore.Tests/Metadata/Conventions/NavigationAttributeConventionTest.cs +++ b/test/EFCore.Tests/Metadata/Conventions/NavigationAttributeConventionTest.cs @@ -707,7 +707,7 @@ public void ForeignKeyAttribute_sets_composite_foreign_key_properties_when_appli } [ConditionalFact] - public void ForeignKeyAttribute_throws_when_values_on_property_and_navigtaion_in_entity_type_do_not_match() + public void ForeignKeyAttribute_throws_when_values_on_property_and_navigation_in_entity_type_do_not_match() { var dependentEntityTypeBuilder = CreateInternalEntityTypeBuilder(); var principalEntityTypeBuilder = diff --git a/test/EFCore.Tests/Metadata/Conventions/PropertyAttributeConventionTest.cs b/test/EFCore.Tests/Metadata/Conventions/PropertyAttributeConventionTest.cs index b66edeacbc9..dd064781346 100644 --- a/test/EFCore.Tests/Metadata/Conventions/PropertyAttributeConventionTest.cs +++ b/test/EFCore.Tests/Metadata/Conventions/PropertyAttributeConventionTest.cs @@ -228,7 +228,7 @@ public void KeyAttribute_throws_when_setting_key_in_derived_type() } [ConditionalFact] - public void KeyAttribute_allows_composite_key_with_inheritence() + public void KeyAttribute_allows_composite_key_with_inheritance() { var derivedEntityTypeBuilder = CreateInternalEntityTypeBuilder(); var baseEntityTypeBuilder = derivedEntityTypeBuilder.ModelBuilder.Entity(typeof(BaseEntity), ConfigurationSource.Explicit); diff --git a/test/EFCore.Tests/Metadata/Internal/ClrPropertySetterFactoryTest.cs b/test/EFCore.Tests/Metadata/Internal/ClrPropertySetterFactoryTest.cs index 85a0777abf7..eb3e78361ee 100644 --- a/test/EFCore.Tests/Metadata/Internal/ClrPropertySetterFactoryTest.cs +++ b/test/EFCore.Tests/Metadata/Internal/ClrPropertySetterFactoryTest.cs @@ -281,13 +281,13 @@ private class Customer private class ConcreteEntity2 : ConcreteEntity1 { - // ReSharper disable once RedundantOverridenMember + // ReSharper disable once RedundantOverriddenMember public override int VirtualPrivateProperty_Override => base.VirtualPrivateProperty_Override; } private class ConcreteEntity1 : BaseEntity { - // ReSharper disable once RedundantOverridenMember + // ReSharper disable once RedundantOverriddenMember public override int VirtualPrivateProperty_Override => base.VirtualPrivateProperty_Override; } diff --git a/test/EFCore.Tests/Metadata/Internal/ForeignKeyTest.cs b/test/EFCore.Tests/Metadata/Internal/ForeignKeyTest.cs index ac57c8ae4f9..d13096f977f 100644 --- a/test/EFCore.Tests/Metadata/Internal/ForeignKeyTest.cs +++ b/test/EFCore.Tests/Metadata/Internal/ForeignKeyTest.cs @@ -82,7 +82,7 @@ public void Constructor_throws_when_referenced_key_not_on_referenced_entity() } [ConditionalFact] - public void Constructor_throws_when_principal_and_depedent_property_count_do_not_match() + public void Constructor_throws_when_principal_and_dependent_property_count_do_not_match() { var model = CreateModel(); var dependentEntityType = model.AddEntityType("D"); @@ -103,7 +103,7 @@ public void Constructor_throws_when_principal_and_depedent_property_count_do_not } [ConditionalFact] - public void Constructor_throws_when_principal_and_depedent_property_types_do_not_match() + public void Constructor_throws_when_principal_and_dependent_property_types_do_not_match() { var dependentEntityType = CreateModel().AddEntityType("D"); var principalEntityType = CreateModel().AddEntityType("P"); diff --git a/test/EFCore.Tests/Metadata/Internal/PropertyBaseTest.cs b/test/EFCore.Tests/Metadata/Internal/PropertyBaseTest.cs index 6fed38b89e8..942efd41719 100644 --- a/test/EFCore.Tests/Metadata/Internal/PropertyBaseTest.cs +++ b/test/EFCore.Tests/Metadata/Internal/PropertyBaseTest.cs @@ -751,7 +751,7 @@ private void MemberInfoTestCommon( } [ConditionalFact] - public virtual void Access_mode_can_be_overriden_at_entity_and_property_levels() + public virtual void Access_mode_can_be_overridden_at_entity_and_property_levels() { IMutableModel model = new Model(); diff --git a/test/EFCore.Tests/ModelBuilding/ManyToOneTestBase.cs b/test/EFCore.Tests/ModelBuilding/ManyToOneTestBase.cs index eb965bb01df..9643aa03bda 100644 --- a/test/EFCore.Tests/ModelBuilding/ManyToOneTestBase.cs +++ b/test/EFCore.Tests/ModelBuilding/ManyToOneTestBase.cs @@ -1286,7 +1286,7 @@ public virtual void Creates_both_navigations_and_finds_existing_composite_FK() c.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1340,7 +1340,7 @@ public virtual void Creates_both_navigations_and_creates_composite_FK_specified( }); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1400,7 +1400,7 @@ public virtual void Can_use_alternate_composite_key() })); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1476,7 +1476,7 @@ public virtual void Can_use_alternate_composite_key_in_any_order() })); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1551,7 +1551,7 @@ public virtual void Creates_specified_composite_FK_with_navigation_to_principal( }); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1602,7 +1602,7 @@ public virtual void Creates_specified_composite_FK_with_navigation_to_dependent( }); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1654,7 +1654,7 @@ public virtual void Creates_relationship_with_no_navigations_and_specified_compo modelBuilder.Entity().HasMany(w => w.Tomatoes).WithOne(t => t.Whoopper); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1717,7 +1717,7 @@ public virtual void Creates_relationship_on_existing_FK_is_using_different_princ e.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1783,7 +1783,7 @@ public virtual void Creates_relationship_on_existing_FK_is_using_different_princ e.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -2027,7 +2027,7 @@ public virtual void Non_nullable_FK_can_be_made_optional() } [ConditionalFact] - public virtual void Non_nullable_FK_can_be_made_optional_separetely() + public virtual void Non_nullable_FK_can_be_made_optional_separately() { var modelBuilder = HobNobBuilder(); diff --git a/test/EFCore.Tests/ModelBuilding/NonRelationshipTestBase.cs b/test/EFCore.Tests/ModelBuilding/NonRelationshipTestBase.cs index b1781c69fd5..bf33e37edee 100644 --- a/test/EFCore.Tests/ModelBuilding/NonRelationshipTestBase.cs +++ b/test/EFCore.Tests/ModelBuilding/NonRelationshipTestBase.cs @@ -691,7 +691,7 @@ public virtual void Properties_can_have_access_mode_set() } [ConditionalFact] - public virtual void Access_mode_can_be_overriden_at_entity_and_property_levels() + public virtual void Access_mode_can_be_overridden_at_entity_and_property_levels() { var modelBuilder = CreateModelBuilder(); var model = modelBuilder.Model; diff --git a/test/EFCore.Tests/ModelBuilding/OneToManyTestBase.cs b/test/EFCore.Tests/ModelBuilding/OneToManyTestBase.cs index 4ae9572a26f..67b52d3b9bf 100644 --- a/test/EFCore.Tests/ModelBuilding/OneToManyTestBase.cs +++ b/test/EFCore.Tests/ModelBuilding/OneToManyTestBase.cs @@ -1512,7 +1512,7 @@ public virtual void Creates_both_navigations_and_uses_existing_composite_FK() c.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1561,7 +1561,7 @@ public virtual void Creates_both_navigations_and_creates_composite_FK_specified( })); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1622,7 +1622,7 @@ public virtual void Can_use_alternate_composite_key() })); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1698,7 +1698,7 @@ public virtual void Can_use_alternate_composite_key_in_any_order() })); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1778,7 +1778,7 @@ public virtual void Creates_specified_composite_FK_with_navigation_to_dependent( b.Property(e => e.BurgerId2); }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1829,7 +1829,7 @@ public virtual void Creates_specified_composite_FK_with_navigation_to_principal( }); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -1878,7 +1878,7 @@ public virtual void Creates_relationship_with_no_navigations_and_specified_compo }); modelBuilder.Entity().HasMany(w => w.Tomatoes).WithOne(t => t.Whoopper); modelBuilder.Entity(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); @@ -1946,7 +1946,7 @@ public virtual void Creates_relationship_on_existing_FK_is_using_different_princ e.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -2014,7 +2014,7 @@ public virtual void Creates_relationship_on_existing_FK_is_using_different_princ e.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -2295,7 +2295,7 @@ public virtual void Non_nullable_FK_cannot_be_made_optional() } [ConditionalFact] - public virtual void Non_nullable_FK_can_be_made_optional_separetely() + public virtual void Non_nullable_FK_can_be_made_optional_separately() { var modelBuilder = HobNobBuilder(); diff --git a/test/EFCore.Tests/ModelBuilding/OneToOneTestBase.cs b/test/EFCore.Tests/ModelBuilding/OneToOneTestBase.cs index eb4d79c0543..903324032a8 100644 --- a/test/EFCore.Tests/ModelBuilding/OneToOneTestBase.cs +++ b/test/EFCore.Tests/ModelBuilding/OneToOneTestBase.cs @@ -1720,7 +1720,7 @@ public virtual void Principal_and_dependent_cannot_be_flipped_twice() } [ConditionalFact] - public virtual void Principal_and_dependent_can_be_flipped_twice_separetely() + public virtual void Principal_and_dependent_can_be_flipped_twice_separately() { var modelBuilder = CreateModelBuilder(); var model = modelBuilder.Model; @@ -1775,7 +1775,7 @@ public virtual void Principal_and_dependent_cannot_be_flipped_twice_in_reverse_o } [ConditionalFact] - public virtual void Principal_and_dependent_can_be_flipped_twice_in_reverse_order_separetely() + public virtual void Principal_and_dependent_can_be_flipped_twice_in_reverse_order_separately() { var modelBuilder = CreateModelBuilder(); var model = modelBuilder.Model; @@ -2070,7 +2070,7 @@ public virtual void Creates_both_navigations_and_uses_existing_composite_FK() e.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -2122,7 +2122,7 @@ public virtual void Creates_both_navigations_and_creates_composite_FK_specified( }); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -2179,7 +2179,7 @@ public virtual void Can_use_alternate_composite_key() })); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -2253,7 +2253,7 @@ public virtual void Can_use_alternate_composite_key_in_any_order() })); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -2324,7 +2324,7 @@ public virtual void Uses_composite_PK_for_FK_by_convention() c.Id1, c.Id2 }); - modelBuilder.Entity().HasKey( + modelBuilder.Entity().HasKey( c => new { c.Id1, @@ -2333,7 +2333,7 @@ public virtual void Uses_composite_PK_for_FK_by_convention() modelBuilder.Ignore(); modelBuilder.Ignore(); - var dependentType = model.FindEntityType(typeof(Moostard)); + var dependentType = model.FindEntityType(typeof(Mustard)); var principalType = model.FindEntityType(typeof(Whoopper)); var fkProperty1 = dependentType.FindProperty("Id1"); @@ -2343,8 +2343,8 @@ public virtual void Uses_composite_PK_for_FK_by_convention() var dependentKey = dependentType.FindPrimaryKey(); modelBuilder - .Entity().HasOne(e => e.Whoopper).WithOne(e => e.Moostard) - .HasForeignKey(); + .Entity().HasOne(e => e.Whoopper).WithOne(e => e.Mustard) + .HasForeignKey(); modelBuilder.FinalizeModel(); @@ -2354,7 +2354,7 @@ public virtual void Uses_composite_PK_for_FK_by_convention() Assert.Same(fkProperty2, fk.Properties[1]); Assert.Equal("Whoopper", dependentType.GetNavigations().Single().Name); - Assert.Equal("Moostard", principalType.GetNavigations().Single().Name); + Assert.Equal("Mustard", principalType.GetNavigations().Single().Name); Assert.Same(fk, dependentType.GetNavigations().Single().ForeignKey); Assert.Same(fk, principalType.GetNavigations().Single().ForeignKey); AssertEqual( @@ -2383,7 +2383,7 @@ public virtual void Principal_and_dependent_can_be_flipped_and_composite_PK_is_s c.Id1, c.Id2 }); - modelBuilder.Entity().HasKey( + modelBuilder.Entity().HasKey( c => new { c.Id1, @@ -2392,7 +2392,7 @@ public virtual void Principal_and_dependent_can_be_flipped_and_composite_PK_is_s modelBuilder.Ignore(); modelBuilder.Ignore(); - var dependentType = model.FindEntityType(typeof(Moostard)); + var dependentType = model.FindEntityType(typeof(Mustard)); var principalType = model.FindEntityType(typeof(Whoopper)); var fkProperty1 = dependentType.FindProperty("Id1"); @@ -2402,8 +2402,8 @@ public virtual void Principal_and_dependent_can_be_flipped_and_composite_PK_is_s var dependentKey = dependentType.FindPrimaryKey(); modelBuilder - .Entity().HasOne(e => e.Moostard).WithOne(e => e.Whoopper) - .HasForeignKey(); + .Entity().HasOne(e => e.Mustard).WithOne(e => e.Whoopper) + .HasForeignKey(); modelBuilder.FinalizeModel(); @@ -2412,7 +2412,7 @@ public virtual void Principal_and_dependent_can_be_flipped_and_composite_PK_is_s Assert.Same(fkProperty2, fk.Properties[1]); Assert.Equal("Whoopper", dependentType.GetNavigations().Single().Name); - Assert.Equal("Moostard", principalType.GetNavigations().Single().Name); + Assert.Equal("Mustard", principalType.GetNavigations().Single().Name); Assert.Same(fk, dependentType.GetNavigations().Single().ForeignKey); Assert.Same(fk, principalType.GetNavigations().Single().ForeignKey); AssertEqual( @@ -2441,7 +2441,7 @@ public virtual void Principal_and_dependent_can_be_flipped_using_principal_and_c c.Id1, c.Id2 }); - modelBuilder.Entity().HasKey( + modelBuilder.Entity().HasKey( c => new { c.Id1, @@ -2450,7 +2450,7 @@ public virtual void Principal_and_dependent_can_be_flipped_using_principal_and_c modelBuilder.Ignore(); modelBuilder.Ignore(); - var dependentType = model.FindEntityType(typeof(Moostard)); + var dependentType = model.FindEntityType(typeof(Mustard)); var principalType = model.FindEntityType(typeof(Whoopper)); var fkProperty1 = dependentType.FindProperty("Id1"); @@ -2460,7 +2460,7 @@ public virtual void Principal_and_dependent_can_be_flipped_using_principal_and_c var dependentKey = dependentType.FindPrimaryKey(); modelBuilder - .Entity().HasOne(e => e.Whoopper).WithOne(e => e.Moostard) + .Entity().HasOne(e => e.Whoopper).WithOne(e => e.Mustard) .HasPrincipalKey( e => new { @@ -2475,7 +2475,7 @@ public virtual void Principal_and_dependent_can_be_flipped_using_principal_and_c Assert.Same(fkProperty2, fk.Properties[1]); Assert.Equal("Whoopper", dependentType.GetNavigations().Single().Name); - Assert.Equal("Moostard", principalType.GetNavigations().Single().Name); + Assert.Equal("Mustard", principalType.GetNavigations().Single().Name); Assert.Same(fk, dependentType.GetNavigations().Single().ForeignKey); Assert.Same(fk, principalType.GetNavigations().Single().ForeignKey); AssertEqual( @@ -2505,7 +2505,7 @@ public virtual void Creates_composite_FK_when_specified_on_principal_with_naviga }); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -2554,7 +2554,7 @@ public virtual void Creates_composite_FK_when_specified_on_principal_with_naviga }); modelBuilder.Entity(); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -2605,7 +2605,7 @@ public virtual void Creates_composite_FK_when_specified_on_principal_with_no_nav c.Id2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(ToastedBun)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -3047,7 +3047,7 @@ public virtual void Throws_if_specified_FK_types_do_not_match() } [ConditionalFact] - public virtual void Overrides_PK_if_specified_FK_types_do_not_match_separetely() + public virtual void Overrides_PK_if_specified_FK_types_do_not_match_separately() { var modelBuilder = CreateModelBuilder(); var model = modelBuilder.Model; @@ -3088,7 +3088,7 @@ public virtual void Throws_if_specified_PK_types_do_not_match() } [ConditionalFact] - public virtual void Overrides_FK_if_specified_PK_types_do_not_match_separetely() + public virtual void Overrides_FK_if_specified_PK_types_do_not_match_separately() { var modelBuilder = CreateModelBuilder(); var model = modelBuilder.Model; @@ -3131,7 +3131,7 @@ public virtual void Throws_if_specified_FK_count_does_not_match() } [ConditionalFact] - public virtual void Overrides_PK_if_specified_FK_count_does_not_match_separetely() + public virtual void Overrides_PK_if_specified_FK_count_does_not_match_separately() { var modelBuilder = CreateModelBuilder(); var model = modelBuilder.Model; @@ -3172,7 +3172,7 @@ public virtual void Throws_if_specified_PK_count_does_not_match() } [ConditionalFact] - public virtual void Overrides_FK_if_specified_PK_count_does_not_match_separetely() + public virtual void Overrides_FK_if_specified_PK_count_does_not_match_separately() { var modelBuilder = CreateModelBuilder(); var model = modelBuilder.Model; @@ -3237,7 +3237,7 @@ public virtual void Creates_relationship_on_existing_FK_if_using_different_princ c.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -3299,7 +3299,7 @@ public virtual void Creates_relationship_on_existing_FK_if_using_different_princ c.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -3358,7 +3358,7 @@ public virtual void Creates_index_even_if_covered_by_an_alternate_key() c.BurgerId2 }); modelBuilder.Ignore(); - modelBuilder.Ignore(); + modelBuilder.Ignore(); var dependentType = model.FindEntityType(typeof(Tomato)); var principalType = model.FindEntityType(typeof(Whoopper)); @@ -3636,7 +3636,7 @@ public virtual void Non_nullable_FK_can_be_made_optional() } [ConditionalFact] - public virtual void Non_nullable_FK_can_be_made_optional_separetely() + public virtual void Non_nullable_FK_can_be_made_optional_separately() { var modelBuilder = HobNobBuilder(); diff --git a/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs b/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs index 1721dafb3ac..9b76478c3e8 100644 --- a/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs +++ b/test/EFCore.Tests/ModelBuilding/OwnedTypesTestBase.cs @@ -556,12 +556,12 @@ public virtual void Ambiguous_relationship_between_owned_types_throws() var modelBuilder = CreateModelBuilder(); modelBuilder.Owned(); - modelBuilder.Owned(); + modelBuilder.Owned(); modelBuilder.Entity(); modelBuilder.Ignore(); Assert.Equal( - CoreStrings.AmbiguousOwnedNavigation(nameof(Whoopper), nameof(Moostard)), + CoreStrings.AmbiguousOwnedNavigation(nameof(Whoopper), nameof(Mustard)), Assert.Throws(() => modelBuilder.FinalizeModel()).Message); } diff --git a/test/EFCore.Tests/ModelBuilding/TestModel.cs b/test/EFCore.Tests/ModelBuilding/TestModel.cs index 12e9fdbf18e..b5588a9b1ec 100644 --- a/test/EFCore.Tests/ModelBuilding/TestModel.cs +++ b/test/EFCore.Tests/ModelBuilding/TestModel.cs @@ -53,7 +53,7 @@ private class Whoopper public ToastedBun ToastedBun { get; set; } - public Moostard Moostard { get; set; } + public Mustard Mustard { get; set; } } private class Tomato @@ -74,7 +74,7 @@ private class ToastedBun public Whoopper Whoopper { get; set; } } - private class Moostard + private class Mustard { public int Id1 { get; set; } public int Id2 { get; set; } diff --git a/test/EFCore.Tests/Storage/ExecutionStrategyTest.cs b/test/EFCore.Tests/Storage/ExecutionStrategyTest.cs index cd60766f6d3..6cd9632e233 100644 --- a/test/EFCore.Tests/Storage/ExecutionStrategyTest.cs +++ b/test/EFCore.Tests/Storage/ExecutionStrategyTest.cs @@ -197,18 +197,18 @@ private void Execute_does_not_throw_when_invoked_twice(Action e.Execute(() => f())); + Execute_doesnt_retry_if_successful((e, f) => e.Execute(() => f())); } [ConditionalFact] - public void Execute_Func_doesnt_retry_if_succesful() + public void Execute_Func_doesnt_retry_if_successful() { - Execute_doesnt_retry_if_succesful((e, f) => e.Execute(f)); + Execute_doesnt_retry_if_successful((e, f) => e.Execute(f)); } - private void Execute_doesnt_retry_if_succesful(Action> execute) + private void Execute_doesnt_retry_if_successful(Action> execute) { var executionCount = 0; execute(CreateFailOnRetryStrategy(), () => executionCount++); @@ -246,18 +246,18 @@ private void Execute_doesnt_retry_if_suspended(Action e.Execute(() => f())); + Execute_retries_until_successful((e, f) => e.Execute(() => f())); } [ConditionalFact] - public void Execute_Func_retries_until_succesful() + public void Execute_Func_retries_until_successful() { - Execute_retries_until_succesful((e, f) => e.Execute(f)); + Execute_retries_until_successful((e, f) => e.Execute(f)); } - private void Execute_retries_until_succesful(Action> execute) + private void Execute_retries_until_successful(Action> execute) { var executionStrategyMock = new TestExecutionStrategy( Context, @@ -478,18 +478,18 @@ await executeAsync( } [ConditionalFact] - public Task ExecuteAsync_Action_doesnt_retry_if_succesful() + public Task ExecuteAsync_Action_doesnt_retry_if_successful() { - return ExecuteAsync_doesnt_retry_if_succesful((e, f) => e.ExecuteAsync(ct => (Task)f(ct), CancellationToken.None)); + return ExecuteAsync_doesnt_retry_if_successful((e, f) => e.ExecuteAsync(ct => (Task)f(ct), CancellationToken.None)); } [ConditionalFact] - public Task ExecuteAsync_Func_doesnt_retry_if_succesful() + public Task ExecuteAsync_Func_doesnt_retry_if_successful() { - return ExecuteAsync_doesnt_retry_if_succesful((e, f) => e.ExecuteAsync(f, CancellationToken.None)); + return ExecuteAsync_doesnt_retry_if_successful((e, f) => e.ExecuteAsync(f, CancellationToken.None)); } - private async Task ExecuteAsync_doesnt_retry_if_succesful( + private async Task ExecuteAsync_doesnt_retry_if_successful( Func>, Task> executeAsync) { var executionCount = 0; @@ -529,18 +529,18 @@ await Assert.ThrowsAsync( } [ConditionalFact] - public Task ExecuteAsync_Action_retries_until_succesful() + public Task ExecuteAsync_Action_retries_until_successful() { - return ExecuteAsync_retries_until_succesful((e, f) => e.ExecuteAsync(ct => (Task)f(ct), CancellationToken.None)); + return ExecuteAsync_retries_until_successful((e, f) => e.ExecuteAsync(ct => (Task)f(ct), CancellationToken.None)); } [ConditionalFact] - public Task ExecuteAsync_Func_retries_until_succesful() + public Task ExecuteAsync_Func_retries_until_successful() { - return ExecuteAsync_retries_until_succesful((e, f) => e.ExecuteAsync(f, CancellationToken.None)); + return ExecuteAsync_retries_until_successful((e, f) => e.ExecuteAsync(f, CancellationToken.None)); } - private async Task ExecuteAsync_retries_until_succesful( + private async Task ExecuteAsync_retries_until_successful( Func>, Task> executeAsync) { var executionStrategyMock = new TestExecutionStrategy( diff --git a/test/EFCore.Tests/Storage/ValueComparerTest.cs b/test/EFCore.Tests/Storage/ValueComparerTest.cs index 02bba37a3f5..99263db3602 100644 --- a/test/EFCore.Tests/Storage/ValueComparerTest.cs +++ b/test/EFCore.Tests/Storage/ValueComparerTest.cs @@ -544,7 +544,7 @@ public void Can_clone_to_nullable() } [ConditionalFact] - public void Structural_objects_get_deep_key_comperer_by_default() + public void Structural_objects_get_deep_key_comparer_by_default() { var comparer = new ValueComparer(false); var keyComparer = new ValueComparer(true); diff --git a/test/EFCore.Tests/Utilities/MultigraphTest.cs b/test/EFCore.Tests/Utilities/MultigraphTest.cs index 6d43d34f46d..8a32f8ee109 100644 --- a/test/EFCore.Tests/Utilities/MultigraphTest.cs +++ b/test/EFCore.Tests/Utilities/MultigraphTest.cs @@ -114,7 +114,7 @@ public void AddVertex_adds_a_vertex() } [ConditionalFact] - public void AddVertices_add_verticies() + public void AddVertices_add_vertices() { var vertexOne = new Vertex { @@ -173,7 +173,7 @@ public void AddEdge_adds_an_edge() } [ConditionalFact] - public void AddEdge_throws_on_verticies_not_in_the_graph() + public void AddEdge_throws_on_vertices_not_in_the_graph() { var vertexOne = new Vertex { @@ -237,7 +237,7 @@ public void AddEdges_adds_multiple_edges() } [ConditionalFact] - public void AddEdges_throws_on_verticies_not_in_the_graph() + public void AddEdges_throws_on_vertices_not_in_the_graph() { var vertexOne = new Vertex { @@ -266,7 +266,7 @@ public void AddEdges_throws_on_verticies_not_in_the_graph() } [ConditionalFact] - public void AddEdge_updates_incomming_and_outgoing_neighbours() + public void AddEdge_updates_incoming_and_outgoing_neighbors() { var vertexOne = new Vertex { @@ -308,7 +308,7 @@ public void AddEdge_updates_incomming_and_outgoing_neighbours() } [ConditionalFact] - public void TopologicalSort_on_graph_with_no_edges_returns_all_verticies() + public void TopologicalSort_on_graph_with_no_edges_returns_all_vertices() { var vertexOne = new Vertex { @@ -332,7 +332,7 @@ public void TopologicalSort_on_graph_with_no_edges_returns_all_verticies() } [ConditionalFact] - public void TopologicalSort_on_simple_graph_returns_all_verticies_in_order() + public void TopologicalSort_on_simple_graph_returns_all_vertices_in_order() { var vertexOne = new Vertex { @@ -370,7 +370,7 @@ public void TopologicalSort_on_simple_graph_returns_all_verticies_in_order() } [ConditionalFact] - public void TopologicalSort_on_tree_graph_returns_all_verticies_in_order() + public void TopologicalSort_on_tree_graph_returns_all_vertices_in_order() { var vertexOne = new Vertex { diff --git a/test/Microsoft.Data.Sqlite.Tests/SqliteCommandTest.cs b/test/Microsoft.Data.Sqlite.Tests/SqliteCommandTest.cs index 078dd5d5f8d..ededc3b9b5e 100644 --- a/test/Microsoft.Data.Sqlite.Tests/SqliteCommandTest.cs +++ b/test/Microsoft.Data.Sqlite.Tests/SqliteCommandTest.cs @@ -548,9 +548,9 @@ public void ExecuteReader_throws_when_transaction_mismatched() { otherConnection.Open(); - using (var transction = otherConnection.BeginTransaction()) + using (var transaction = otherConnection.BeginTransaction()) { - command.Transaction = transction; + command.Transaction = transaction; var ex = Assert.Throws(() => command.ExecuteReader());