Skip to content

Commit d33488f

Browse files
pwelter34pwelter34
committed
remove FluentAssertions
1 parent 9d67b2b commit d33488f

File tree

7 files changed

+155
-167
lines changed

7 files changed

+155
-167
lines changed

‎test/EntityFrameworkCore.Generator.Core.Tests/CodeGeneratorTests.cs‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
using EntityFrameworkCore.Generator.Options;
44

5-
using FluentAssertions;
6-
75
using FluentCommand.SqlServer.Tests;
86

97
using Microsoft.Extensions.Logging.Abstractions;
@@ -29,7 +27,7 @@ public void Generate()
2927
var result = generator.Generate(generatorOptions);
3028

3129

32-
result.Should().BeTrue();
30+
Assert.True(result);
3331
}
3432

3533

@@ -43,7 +41,7 @@ public void Generate_Should_Work_For_Password_With_CurlyBrace()
4341
var generator = new CodeGenerator(NullLoggerFactory.Instance);
4442
var result = generator.Generate(generatorOptions);
4543

46-
result.Should().BeTrue();
44+
Assert.True(result);
4745
}
4846

4947
[Fact]
@@ -55,7 +53,7 @@ public void GenerateSpatial()
5553
var generator = new CodeGenerator(NullLoggerFactory.Instance);
5654
var result = generator.Generate(generatorOptions);
5755

58-
result.Should().BeTrue();
56+
Assert.True(result);
5957

6058
const string spatialTableName = "CitiesSpatial";
6159

@@ -65,18 +63,18 @@ public void GenerateSpatial()
6563
var citiesSpatialEntityContent = File.ReadAllText(citiesSpatialEntityFile);
6664
var citiesSpatialMappingContent = File.ReadAllText(citiesSpatialMappingFile);
6765

68-
citiesSpatialEntityContent.Contains("public NetTopologySuite.Geometries.Geometry GeometryField { get; set; }").Should().BeTrue();
69-
citiesSpatialEntityContent.Contains("public NetTopologySuite.Geometries.Geometry GeographyField { get; set; }").Should().BeTrue();
66+
Assert.Contains("public NetTopologySuite.Geometries.Geometry GeometryField { get; set; }", citiesSpatialEntityContent);
67+
Assert.Contains("public NetTopologySuite.Geometries.Geometry GeographyField { get; set; }", citiesSpatialEntityContent);
7068

71-
citiesSpatialMappingContent.Contains("builder.Property(t => t.GeometryField)" + System.Environment.NewLine +
69+
Assert.Contains("builder.Property(t => t.GeometryField)" + System.Environment.NewLine +
7270
" .IsRequired()" + System.Environment.NewLine +
7371
" .HasColumnName(\"GeometryField\")" + System.Environment.NewLine +
74-
" .HasColumnType(\"geometry\");").Should().BeTrue();
72+
" .HasColumnType(\"geometry\");", citiesSpatialMappingContent);
7573

76-
citiesSpatialMappingContent.Contains("builder.Property(t => t.GeographyField)" + System.Environment.NewLine +
74+
Assert.Contains("builder.Property(t => t.GeographyField)" + System.Environment.NewLine +
7775
" .IsRequired()" + System.Environment.NewLine +
7876
" .HasColumnName(\"GeographyField\")" + System.Environment.NewLine +
79-
" .HasColumnType(\"geography\");").Should().BeTrue();
77+
" .HasColumnType(\"geography\");", citiesSpatialMappingContent);
8078

8179
}
8280

‎test/EntityFrameworkCore.Generator.Core.Tests/EntityFrameworkCore.Generator.Core.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
</PackageReference>
2626
<PackageReference Include="dbup-sqlserver" Version="6.0.0" />
27-
<PackageReference Include="FluentAssertions" Version="8.1.1" />
2827
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.3" />
2928
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.3" />
3029
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />

‎test/EntityFrameworkCore.Generator.Core.Tests/ModelGeneratorTests.cs‎

Lines changed: 112 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
using EntityFrameworkCore.Generator.Options;
44

5-
using FluentAssertions;
6-
75
using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
86
using Microsoft.EntityFrameworkCore.SqlServer.Storage.Internal;
97
using Microsoft.EntityFrameworkCore.Storage;
@@ -56,27 +54,27 @@ public void GenerateCheckNames()
5654
var typeMappingSource = CreateTypeMappingSource();
5755

5856
var result = generator.Generate(generatorOptions, databaseModel, typeMappingSource);
59-
result.ContextClass.Should().Be("TestDatabaseContext");
60-
result.ContextNamespace.Should().Be("TestDatabase.Data");
61-
result.Entities.Count.Should().Be(1);
57+
Assert.Equal("TestDatabaseContext", result.ContextClass);
58+
Assert.Equal("TestDatabase.Data", result.ContextNamespace);
59+
Assert.Single(result.Entities);
6260

6361
var firstEntity = result.Entities[0];
64-
firstEntity.TableName.Should().Be("TestTable");
65-
firstEntity.TableSchema.Should().Be("dbo");
66-
firstEntity.EntityClass.Should().Be("TestTable");
67-
firstEntity.EntityNamespace.Should().Be("TestDatabase.Data.Entities");
68-
firstEntity.MappingClass.Should().Be("TestTableMap");
69-
firstEntity.MappingNamespace.Should().Be("TestDatabase.Data.Mapping");
62+
Assert.Equal("TestTable", firstEntity.TableName);
63+
Assert.Equal("dbo", firstEntity.TableSchema);
64+
Assert.Equal("TestTable", firstEntity.EntityClass);
65+
Assert.Equal("TestDatabase.Data.Entities", firstEntity.EntityNamespace);
66+
Assert.Equal("TestTableMap", firstEntity.MappingClass);
67+
Assert.Equal("TestDatabase.Data.Mapping", firstEntity.MappingNamespace);
7068

71-
firstEntity.Properties.Count.Should().Be(2);
69+
Assert.Equal(2, firstEntity.Properties.Count);
7270

7371
var identifierProperty = firstEntity.Properties.ByColumn("Id");
74-
identifierProperty.Should().NotBeNull();
75-
identifierProperty.PropertyName.Should().Be("Id");
72+
Assert.NotNull(identifierProperty);
73+
Assert.Equal("Id", identifierProperty.PropertyName);
7674

7775
var nameProperty = firstEntity.Properties.ByColumn("Name");
78-
nameProperty.Should().NotBeNull();
79-
nameProperty.PropertyName.Should().Be("Name");
76+
Assert.NotNull(nameProperty);
77+
Assert.Equal("Name", nameProperty.PropertyName);
8078
}
8179

8280
[Fact]
@@ -124,30 +122,30 @@ public void GenerateModelsCheckNames()
124122
var typeMappingSource = CreateTypeMappingSource();
125123

126124
var result = generator.Generate(generatorOptions, databaseModel, typeMappingSource);
127-
result.ContextClass.Should().Be("TestDatabaseContext");
128-
result.ContextNamespace.Should().Be("TestDatabase.Data");
129-
result.Entities.Count.Should().Be(1);
125+
Assert.Equal("TestDatabaseContext", result.ContextClass);
126+
Assert.Equal("TestDatabase.Data", result.ContextNamespace);
127+
Assert.Single(result.Entities);
130128

131129
var firstEntity = result.Entities[0];
132-
firstEntity.TableName.Should().Be("TestTable");
133-
firstEntity.TableSchema.Should().Be("dbo");
134-
firstEntity.EntityClass.Should().Be("TestTable");
135-
firstEntity.EntityNamespace.Should().Be("TestDatabase.Data.Entities");
136-
firstEntity.MappingClass.Should().Be("TestTableMap");
137-
firstEntity.MappingNamespace.Should().Be("TestDatabase.Data.Mapping");
138-
firstEntity.MapperClass.Should().Be("TestTableProfile");
139-
firstEntity.MapperNamespace.Should().Be("TestDatabase.Domain.Mapping");
140-
141-
firstEntity.Properties.Count.Should().Be(2);
142-
firstEntity.Models.Count.Should().Be(3);
130+
Assert.Equal("TestTable", firstEntity.TableName);
131+
Assert.Equal("dbo", firstEntity.TableSchema);
132+
Assert.Equal("TestTable", firstEntity.EntityClass);
133+
Assert.Equal("TestDatabase.Data.Entities", firstEntity.EntityNamespace);
134+
Assert.Equal("TestTableMap", firstEntity.MappingClass);
135+
Assert.Equal("TestDatabase.Data.Mapping", firstEntity.MappingNamespace);
136+
Assert.Equal("TestTableProfile", firstEntity.MapperClass);
137+
Assert.Equal("TestDatabase.Domain.Mapping", firstEntity.MapperNamespace);
138+
139+
Assert.Equal(2, firstEntity.Properties.Count);
140+
Assert.Equal(3, firstEntity.Models.Count);
143141

144142
var firstModel = firstEntity.Models[0];
145-
firstModel.ModelClass.Should().StartWith("TestTable");
146-
firstModel.ModelClass.Should().EndWith("Model");
147-
firstModel.ModelNamespace.Should().Be("TestDatabase.Domain.Models");
148-
firstModel.ValidatorClass.Should().StartWith("TestTable");
149-
firstModel.ValidatorClass.Should().EndWith("Validator");
150-
firstModel.ValidatorNamespace.Should().Be("TestDatabase.Domain.Validation");
143+
Assert.StartsWith("TestTable", firstModel.ModelClass);
144+
Assert.EndsWith("Model", firstModel.ModelClass);
145+
Assert.Equal("TestDatabase.Domain.Models", firstModel.ModelNamespace);
146+
Assert.StartsWith("TestTable", firstModel.ValidatorClass);
147+
Assert.EndsWith("Validator", firstModel.ValidatorClass);
148+
Assert.Equal("TestDatabase.Domain.Validation", firstModel.ValidatorNamespace);
151149

152150
}
153151

@@ -181,12 +179,12 @@ public void GenerateWithSymbolInDatabaseName()
181179
var typeMappingSource = CreateTypeMappingSource();
182180

183181
var result = generator.Generate(generatorOptions, databaseModel, typeMappingSource);
184-
result.ContextClass.Should().Be("TestSymbolContext");
185-
result.ContextNamespace.Should().Be("TestSymbol.Data");
182+
Assert.Equal("TestSymbolContext", result.ContextClass);
183+
Assert.Equal("TestSymbol.Data", result.ContextNamespace);
186184

187-
result.Entities.Count.Should().Be(1);
188-
result.Entities[0].EntityClass.Should().Be("TestError");
189-
result.Entities[0].EntityNamespace.Should().Be("TestSymbol.Data.Entities");
185+
Assert.Single(result.Entities);
186+
Assert.Equal("TestError", result.Entities[0].EntityClass);
187+
Assert.Equal("TestSymbol.Data.Entities", result.Entities[0].EntityNamespace);
190188
}
191189

192190
[Fact]
@@ -228,22 +226,22 @@ public void GenerateWithAllNumberColumnName()
228226
var typeMappingSource = CreateTypeMappingSource();
229227

230228
var result = generator.Generate(generatorOptions, databaseModel, typeMappingSource);
231-
result.ContextClass.Should().Be("TestDatabaseContext");
232-
result.ContextNamespace.Should().Be("TestDatabase.Data");
233-
result.Entities.Count.Should().Be(1);
229+
Assert.Equal("TestDatabaseContext", result.ContextClass);
230+
Assert.Equal("TestDatabase.Data", result.ContextNamespace);
231+
Assert.Single(result.Entities);
234232

235233
var firstEntity = result.Entities[0];
236-
firstEntity.EntityClass.Should().Be("TestTable");
237-
firstEntity.EntityNamespace.Should().Be("TestDatabase.Data.Entities");
238-
firstEntity.Properties.Count.Should().Be(2);
234+
Assert.Equal("TestTable", firstEntity.EntityClass);
235+
Assert.Equal("TestDatabase.Data.Entities", firstEntity.EntityNamespace);
236+
Assert.Equal(2, firstEntity.Properties.Count);
239237

240238
var identifierProperty = firstEntity.Properties.ByColumn("Id");
241-
identifierProperty.Should().NotBeNull();
242-
identifierProperty.PropertyName.Should().Be("Id");
239+
Assert.NotNull(identifierProperty);
240+
Assert.Equal("Id", identifierProperty.PropertyName);
243241

244242
var numberProperty = firstEntity.Properties.ByColumn("404");
245-
numberProperty.Should().NotBeNull();
246-
numberProperty.PropertyName.Should().Be("Number404");
243+
Assert.NotNull(numberProperty);
244+
Assert.Equal("Number404", numberProperty.PropertyName);
247245
}
248246

249247
[Fact]
@@ -288,27 +286,27 @@ public void GenerateWithComplexDefaultValue()
288286
var typeMappingSource = CreateTypeMappingSource();
289287

290288
var result = generator.Generate(generatorOptions, databaseModel, typeMappingSource);
291-
result.ContextClass.Should().Be("TestDatabaseContext");
292-
result.ContextNamespace.Should().Be("TestDatabase.Data");
293-
result.Entities.Count.Should().Be(1);
289+
Assert.Equal("TestDatabaseContext", result.ContextClass);
290+
Assert.Equal("TestDatabase.Data", result.ContextNamespace);
291+
Assert.Single(result.Entities);
294292

295293
var firstEntity = result.Entities[0];
296-
firstEntity.TableName.Should().Be("TestTable");
297-
firstEntity.TableSchema.Should().Be("dbo");
298-
firstEntity.EntityClass.Should().Be("TestTable");
299-
firstEntity.EntityNamespace.Should().Be("TestDatabase.Data.Entities");
300-
firstEntity.MappingClass.Should().Be("TestTableMap");
301-
firstEntity.MappingNamespace.Should().Be("TestDatabase.Data.Mapping");
294+
Assert.Equal("TestTable", firstEntity.TableName);
295+
Assert.Equal("dbo", firstEntity.TableSchema);
296+
Assert.Equal("TestTable", firstEntity.EntityClass);
297+
Assert.Equal("TestDatabase.Data.Entities", firstEntity.EntityNamespace);
298+
Assert.Equal("TestTableMap", firstEntity.MappingClass);
299+
Assert.Equal("TestDatabase.Data.Mapping", firstEntity.MappingNamespace);
302300

303-
firstEntity.Properties.Count.Should().Be(2);
301+
Assert.Equal(2, firstEntity.Properties.Count);
304302

305303
var identifierProperty = firstEntity.Properties.ByColumn("Id");
306-
identifierProperty.Should().NotBeNull();
307-
identifierProperty.PropertyName.Should().Be("Id");
304+
Assert.NotNull(identifierProperty);
305+
Assert.Equal("Id", identifierProperty.PropertyName);
308306

309307
var nameProperty = firstEntity.Properties.ByColumn("Name");
310-
nameProperty.Should().NotBeNull();
311-
nameProperty.PropertyName.Should().Be("Name");
308+
Assert.NotNull(nameProperty);
309+
Assert.Equal("Name", nameProperty.PropertyName);
312310
}
313311

314312
[Fact]
@@ -350,27 +348,27 @@ public void GenerateCheckNameCase()
350348
var typeMappingSource = CreateTypeMappingSource();
351349

352350
var result = generator.Generate(generatorOptions, databaseModel, typeMappingSource);
353-
result.ContextClass.Should().Be("TestDatabaseContext");
354-
result.ContextNamespace.Should().Be("TestDatabase.Data");
355-
result.Entities.Count.Should().Be(1);
351+
Assert.Equal("TestDatabaseContext", result.ContextClass);
352+
Assert.Equal("TestDatabase.Data", result.ContextNamespace);
353+
Assert.Single(result.Entities);
356354

357355
var firstEntity = result.Entities[0];
358-
firstEntity.TableName.Should().Be("aammstest");
359-
firstEntity.TableSchema.Should().Be("dbo");
360-
firstEntity.EntityClass.Should().Be("Aammstest");
361-
firstEntity.EntityNamespace.Should().Be("TestDatabase.Data.Entities");
362-
firstEntity.MappingClass.Should().Be("AammstestMap");
363-
firstEntity.MappingNamespace.Should().Be("TestDatabase.Data.Mapping");
356+
Assert.Equal("aammstest", firstEntity.TableName);
357+
Assert.Equal("dbo", firstEntity.TableSchema);
358+
Assert.Equal("Aammstest", firstEntity.EntityClass);
359+
Assert.Equal("TestDatabase.Data.Entities", firstEntity.EntityNamespace);
360+
Assert.Equal("AammstestMap", firstEntity.MappingClass);
361+
Assert.Equal("TestDatabase.Data.Mapping", firstEntity.MappingNamespace);
364362

365-
firstEntity.Properties.Count.Should().Be(2);
363+
Assert.Equal(2, firstEntity.Properties.Count);
366364

367365
var identifierProperty = firstEntity.Properties.ByColumn("Id");
368-
identifierProperty.Should().NotBeNull();
369-
identifierProperty.PropertyName.Should().Be("Id");
366+
Assert.NotNull(identifierProperty);
367+
Assert.Equal("Id", identifierProperty.PropertyName);
370368

371369
var nameProperty = firstEntity.Properties.ByColumn("Name");
372-
nameProperty.Should().NotBeNull();
373-
nameProperty.PropertyName.Should().Be("Name");
370+
Assert.NotNull(nameProperty);
371+
Assert.Equal("Name", nameProperty.PropertyName);
374372
}
375373

376374
[Fact]
@@ -439,25 +437,25 @@ public void GenerateWithPrefixedSchemaName()
439437

440438
var result = generator.Generate(generatorOptions, databaseModel, typeMappingSource);
441439

442-
result.ContextClass.Should().Be("TestDatabaseContext");
443-
result.ContextNamespace.Should().Be("TestDatabase.Data");
444-
result.Entities.Count.Should().Be(2);
440+
Assert.Equal("TestDatabaseContext", result.ContextClass);
441+
Assert.Equal("TestDatabase.Data", result.ContextNamespace);
442+
Assert.Equal(2, result.Entities.Count);
445443

446444
var firstEntity = result.Entities[0];
447-
firstEntity.TableName.Should().Be("TestTable");
448-
firstEntity.TableSchema.Should().Be("dbo");
449-
firstEntity.EntityClass.Should().Be("DboTestTable");
450-
firstEntity.EntityNamespace.Should().Be("TestDatabase.Data.Entities");
451-
firstEntity.MappingClass.Should().Be("DboTestTableMap");
452-
firstEntity.MappingNamespace.Should().Be("TestDatabase.Data.Mapping");
445+
Assert.Equal("TestTable", firstEntity.TableName);
446+
Assert.Equal("dbo", firstEntity.TableSchema);
447+
Assert.Equal("DboTestTable", firstEntity.EntityClass);
448+
Assert.Equal("TestDatabase.Data.Entities", firstEntity.EntityNamespace);
449+
Assert.Equal("DboTestTableMap", firstEntity.MappingClass);
450+
Assert.Equal("TestDatabase.Data.Mapping", firstEntity.MappingNamespace);
453451

454452
var secondEntity = result.Entities[1];
455-
secondEntity.TableName.Should().Be("TestTable");
456-
secondEntity.TableSchema.Should().Be("tst");
457-
secondEntity.EntityClass.Should().Be("TstTestTable");
458-
secondEntity.EntityNamespace.Should().Be("TestDatabase.Data.Entities");
459-
secondEntity.MappingClass.Should().Be("TstTestTableMap");
460-
secondEntity.MappingNamespace.Should().Be("TestDatabase.Data.Mapping");
453+
Assert.Equal("TestTable", secondEntity.TableName);
454+
Assert.Equal("tst", secondEntity.TableSchema);
455+
Assert.Equal("TstTestTable", secondEntity.EntityClass);
456+
Assert.Equal("TestDatabase.Data.Entities", secondEntity.EntityNamespace);
457+
Assert.Equal("TstTestTableMap", secondEntity.MappingClass);
458+
Assert.Equal("TestDatabase.Data.Mapping", secondEntity.MappingNamespace);
461459

462460
}
463461

@@ -539,30 +537,30 @@ public void GenerateIgnoreTable()
539537
var typeMappingSource = CreateTypeMappingSource();
540538

541539
var result = generator.Generate(generatorOptions, databaseModel, typeMappingSource);
542-
result.ContextClass.Should().Be("TestDatabaseContext");
543-
result.ContextNamespace.Should().Be("TestDatabase.Data");
544-
result.Entities.Count.Should().Be(1);
540+
Assert.Equal("TestDatabaseContext", result.ContextClass);
541+
Assert.Equal("TestDatabase.Data", result.ContextNamespace);
542+
Assert.Single(result.Entities);
545543

546544
var firstEntity = result.Entities[0];
547-
firstEntity.TableName.Should().Be("TestTable");
548-
firstEntity.TableSchema.Should().Be("dbo");
549-
firstEntity.EntityClass.Should().Be("TestTable");
550-
firstEntity.EntityNamespace.Should().Be("TestDatabase.Data.Entities");
551-
firstEntity.MappingClass.Should().Be("TestTableMap");
552-
firstEntity.MappingNamespace.Should().Be("TestDatabase.Data.Mapping");
553-
firstEntity.MapperClass.Should().Be("TestTableProfile");
554-
firstEntity.MapperNamespace.Should().Be("TestDatabase.Domain.Mapping");
555-
556-
firstEntity.Properties.Count.Should().Be(2);
557-
firstEntity.Models.Count.Should().Be(3);
545+
Assert.Equal("TestTable", firstEntity.TableName);
546+
Assert.Equal("dbo", firstEntity.TableSchema);
547+
Assert.Equal("TestTable", firstEntity.EntityClass);
548+
Assert.Equal("TestDatabase.Data.Entities", firstEntity.EntityNamespace);
549+
Assert.Equal("TestTableMap", firstEntity.MappingClass);
550+
Assert.Equal("TestDatabase.Data.Mapping", firstEntity.MappingNamespace);
551+
Assert.Equal("TestTableProfile", firstEntity.MapperClass);
552+
Assert.Equal("TestDatabase.Domain.Mapping", firstEntity.MapperNamespace);
553+
554+
Assert.Equal(2, firstEntity.Properties.Count);
555+
Assert.Equal(3, firstEntity.Models.Count);
558556

559557
var firstModel = firstEntity.Models[0];
560-
firstModel.ModelClass.Should().StartWith("TestTable");
561-
firstModel.ModelClass.Should().EndWith("Model");
562-
firstModel.ModelNamespace.Should().Be("TestDatabase.Domain.Models");
563-
firstModel.ValidatorClass.Should().StartWith("TestTable");
564-
firstModel.ValidatorClass.Should().EndWith("Validator");
565-
firstModel.ValidatorNamespace.Should().Be("TestDatabase.Domain.Validation");
558+
Assert.StartsWith("TestTable", firstModel.ModelClass);
559+
Assert.EndsWith("Model", firstModel.ModelClass);
560+
Assert.Equal("TestDatabase.Domain.Models", firstModel.ModelNamespace);
561+
Assert.StartsWith("TestTable", firstModel.ValidatorClass);
562+
Assert.EndsWith("Validator", firstModel.ValidatorClass);
563+
Assert.Equal("TestDatabase.Domain.Validation", firstModel.ValidatorNamespace);
566564

567565
}
568566

0 commit comments

Comments
 (0)