Skip to content

Commit 6f8b841

Browse files
hishamcohishamco
committed
Format unit tests
1 parent 707c6f2 commit 6f8b841

9 files changed

Lines changed: 133 additions & 107 deletions

File tree

‎test/OrchardCoreContrib.PoExtractor.Core.Tests/DisplayAttributeStringExtractorTests.cs‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
using OrchardCoreContrib.PoExtractor.Tests.Fakes;
22
using System.Linq;
3-
using Xunit;
43

54
namespace OrchardCoreContrib.PoExtractor.Tests
65
{
76
public class DisplayAttributeStringExtractorTests
87
{
8+
private readonly FakeCSharpProjectProcessor _fakeCSharpProjectProcessor = new();
9+
910
[Fact]
1011
public void ExtractLocalizedNameFromDisplayAttribute()
1112
{
1213
// Arrange
13-
var csProjectProcessor = new FakeCSharpProjectProcessor();
1414
var localizableStringCollection = new LocalizableStringCollection();
1515

1616
// Act
17-
csProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
17+
_fakeCSharpProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
1818

1919
// Assert
20-
var localizedStrings = localizableStringCollection.Values.Select(s => s.Text).ToList();
20+
var localizedStrings = localizableStringCollection.Values
21+
.Select(s => s.Text)
22+
.ToList();
2123

2224
Assert.Contains(localizedStrings, s => s == "First name");
2325
}
@@ -26,14 +28,15 @@ public void ExtractLocalizedNameFromDisplayAttribute()
2628
public void ExtractLocalizedShortNameFromDisplayAttribute()
2729
{
2830
// Arrange
29-
var csProjectProcessor = new FakeCSharpProjectProcessor();
3031
var localizableStringCollection = new LocalizableStringCollection();
3132

3233
// Act
33-
csProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
34+
_fakeCSharpProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
3435

3536
// Assert
36-
var localizedStrings = localizableStringCollection.Values.Select(s => s.Text).ToList();
37+
var localizedStrings = localizableStringCollection.Values
38+
.Select(s => s.Text)
39+
.ToList();
3740

3841
Assert.Contains(localizedStrings, s => s == "1st name");
3942
}
@@ -42,14 +45,15 @@ public void ExtractLocalizedShortNameFromDisplayAttribute()
4245
public void ExtractLocalizedGroupNameFromDisplayAttribute()
4346
{
4447
// Arrange
45-
var csProjectProcessor = new FakeCSharpProjectProcessor();
4648
var localizableStringCollection = new LocalizableStringCollection();
4749

4850
// Act
49-
csProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
51+
_fakeCSharpProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
5052

5153
// Assert
52-
var localizedStrings = localizableStringCollection.Values.Select(s => s.Text).ToList();
54+
var localizedStrings = localizableStringCollection.Values
55+
.Select(s => s.Text)
56+
.ToList();
5357

5458
Assert.Contains(localizedStrings, s => s == "Person info");
5559
}
@@ -58,14 +62,15 @@ public void ExtractLocalizedGroupNameFromDisplayAttribute()
5862
public void ExtractLocalizedDescriptionFromDisplayAttribute()
5963
{
6064
// Arrange
61-
var csProjectProcessor = new FakeCSharpProjectProcessor();
6265
var localizableStringCollection = new LocalizableStringCollection();
6366

6467
// Act
65-
csProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
68+
_fakeCSharpProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
6669

6770
// Assert
68-
var localizedStrings = localizableStringCollection.Values.Select(s => s.Text).ToList();
71+
var localizedStrings = localizableStringCollection.Values
72+
.Select(s => s.Text)
73+
.ToList();
6974

7075
Assert.Contains(localizedStrings, s => s == "The first name of the person");
7176
}

‎test/OrchardCoreContrib.PoExtractor.Core.Tests/ErrorMessageAnnotationStringExtractorTests.cs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
using OrchardCoreContrib.PoExtractor.Tests.Fakes;
22
using System.Linq;
3-
using Xunit;
43

54
namespace OrchardCoreContrib.PoExtractor.Tests
65
{
76
public class ErrorMessageAnnotationStringExtractorTests
87
{
8+
private readonly FakeCSharpProjectProcessor _fakeCSharpProjectProcessor = new();
9+
910
[Fact]
1011
public void ExtractLocalizedStringsFromDataAnnotations()
1112
{
1213
// Arrange
13-
var csProjectProcessor = new FakeCSharpProjectProcessor();
1414
var localizableStringCollection = new LocalizableStringCollection();
1515

1616
// Act
17-
csProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
17+
_fakeCSharpProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
1818

1919
// Assert
20-
var localizedStrings = localizableStringCollection.Values.Select(s => s.Text).ToList();
20+
var localizedStrings = localizableStringCollection.Values
21+
.Select(s => s.Text)
22+
.ToList();
2123

2224
Assert.NotEmpty(localizedStrings);
2325
Assert.Equal(6, localizedStrings.Count());
@@ -28,14 +30,15 @@ public void ExtractLocalizedStringsFromDataAnnotations()
2830
public void DataAnnotationsExtractorShouldRespectErrorMessageOrder()
2931
{
3032
// Arrange
31-
var csProjectProcessor = new FakeCSharpProjectProcessor();
3233
var localizableStringCollection = new LocalizableStringCollection();
3334

3435
// Act
35-
csProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
36+
_fakeCSharpProjectProcessor.Process(string.Empty, string.Empty, localizableStringCollection);
3637

3738
// Assert
38-
var localizedStrings = localizableStringCollection.Values.Select(s => s.Text).ToList();
39+
var localizedStrings = localizableStringCollection.Values
40+
.Select(s => s.Text)
41+
.ToList();
3942

4043
Assert.Contains(localizedStrings, s => s == "Age should be in the range [15-45].");
4144
}

‎test/OrchardCoreContrib.PoExtractor.Core.Tests/Extensions/StringExtensionsTests.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Xunit;
2-
3-
namespace OrchardCoreContrib.PoExtractor.Tests.Extensions
1+
namespace OrchardCoreContrib.PoExtractor.Tests.Extensions
42
{
53
public class StringExtensionsTests
64
{

‎test/OrchardCoreContrib.PoExtractor.Core.Tests/Fakes/FakeCSharpProjectProcessor.cs‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
using Microsoft.CodeAnalysis;
2-
using Microsoft.CodeAnalysis.CSharp;
3-
using OrchardCoreContrib.PoExtractor.DotNet;
4-
using OrchardCoreContrib.PoExtractor.DotNet.CS;
5-
using OrchardCoreContrib.PoExtractor.DotNet.CS.MetadataProviders;
6-
using System.IO;
7-
using System.Linq;
1+
using OrchardCoreContrib.PoExtractor.DotNet.CS;
82

93
namespace OrchardCoreContrib.PoExtractor.Tests.Fakes
104
{
@@ -24,30 +18,9 @@ public void Process(string path, string basePath, LocalizableStringCollection lo
2418
basePath = _defaultPath;
2519
}
2620

27-
var codeMetadataProvider = new CSharpMetadataProvider(basePath);
28-
var csharpWalker = new ExtractingCodeWalker(
29-
new IStringExtractor<SyntaxNode>[] {
30-
new SingularStringExtractor(codeMetadataProvider),
31-
new PluralStringExtractor(codeMetadataProvider),
32-
new ErrorMessageAnnotationStringExtractor(codeMetadataProvider),
33-
new DisplayAttributeDescriptionStringExtractor(codeMetadataProvider),
34-
new DisplayAttributeNameStringExtractor(codeMetadataProvider),
35-
new DisplayAttributeGroupNameStringExtractor(codeMetadataProvider),
36-
new DisplayAttributeShortNameStringExtractor(codeMetadataProvider)
37-
}, localizableStrings);
21+
var csharpProjectProcessor = new CSharpProjectProcessor();
3822

39-
foreach (var file in Directory.EnumerateFiles(path, "*.cs", SearchOption.AllDirectories).OrderBy(file => file))
40-
{
41-
using (var stream = File.OpenRead(file))
42-
{
43-
using (var reader = new StreamReader(stream))
44-
{
45-
var syntaxTree = CSharpSyntaxTree.ParseText(reader.ReadToEnd(), path: file);
46-
47-
csharpWalker.Visit(syntaxTree.GetRoot());
48-
}
49-
}
50-
}
23+
csharpProjectProcessor.Process(path, basePath, localizableStrings);
5124
}
5225
}
5326
}

‎test/OrchardCoreContrib.PoExtractor.Core.Tests/LocalizableStringCollectionTests.cs‎

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,77 @@
1-
using System.Linq;
2-
using Xunit;
3-
4-
namespace OrchardCoreContrib.PoExtractor.Tests
1+
namespace OrchardCoreContrib.PoExtractor.Tests
52
{
63
public class LocalizableStringCollectionTests
74
{
8-
private LocalizableStringOccurence s1 = new LocalizableStringOccurence() { Text = "Computer", Location = new LocalizableStringLocation() { SourceFileLine = 1 } };
9-
private LocalizableStringOccurence s2 = new LocalizableStringOccurence() { Text = "Computer", Location = new LocalizableStringLocation() { SourceFileLine = 1 } };
10-
private LocalizableStringOccurence otherS = new LocalizableStringOccurence() { Text = "Keyboard", Location = new LocalizableStringLocation() { SourceFileLine = 1 } };
5+
private readonly LocalizableStringOccurence _localizedString1 = new()
6+
{
7+
Text = "Computer",
8+
Location = new LocalizableStringLocation() { SourceFileLine = 1 }
9+
};
10+
private readonly LocalizableStringOccurence _localizedString2 = new()
11+
{
12+
Text = "Computer",
13+
Location = new LocalizableStringLocation() { SourceFileLine = 1 }
14+
};
15+
private readonly LocalizableStringOccurence _localizedString3 = new()
16+
{
17+
Text = "Keyboard", Location = new LocalizableStringLocation() { SourceFileLine = 1 }
18+
};
1119

1220
[Fact]
1321
public void WhenCreated_ValuesCollectionIsEmpty()
1422
{
15-
var sut = new LocalizableStringCollection();
23+
// Arrange
24+
var localizableString = new LocalizableStringCollection();
1625

17-
Assert.Empty(sut.Values);
26+
// Assert
27+
Assert.Empty(localizableString.Values);
1828
}
1929

2030
[Fact]
2131
public void Add_CreatesNewLocalizableString_IfTheCollectionIsEmpty()
2232
{
23-
var sut = new LocalizableStringCollection();
24-
25-
sut.Add(s1);
33+
// Arrange
34+
var localizableString = new LocalizableStringCollection();
2635

27-
Assert.Single(sut.Values);
36+
// Act
37+
localizableString.Add(_localizedString1);
2838

29-
var result = sut.Values.Single();
30-
Assert.Equal(s1.Text, result.Text);
31-
Assert.Contains(s1.Location, result.Locations);
39+
// Assert
40+
var result = Assert.Single(localizableString.Values);
41+
Assert.Equal(_localizedString1.Text, result.Text);
42+
Assert.Contains(_localizedString1.Location, result.Locations);
3243
}
3344

3445
[Fact]
3546
public void Add_AddsLocationToLocalizableString_IfTheCollectionContainsSameString()
3647
{
37-
var sut = new LocalizableStringCollection();
38-
39-
sut.Add(s1);
40-
sut.Add(s2);
48+
// Arrange
49+
var localizableString = new LocalizableStringCollection();
4150

42-
Assert.Single(sut.Values);
51+
// Act
52+
localizableString.Add(_localizedString1);
53+
localizableString.Add(_localizedString2);
4354

44-
var result = sut.Values.Single();
45-
Assert.Equal(s1.Text, result.Text);
46-
Assert.Contains(s1.Location, result.Locations);
47-
Assert.Contains(s2.Location, result.Locations);
55+
// Assert
56+
var result = Assert.Single(localizableString.Values);
57+
Assert.Equal(_localizedString1.Text, result.Text);
58+
Assert.Contains(_localizedString1.Location, result.Locations);
59+
Assert.Contains(_localizedString2.Location, result.Locations);
4860
}
4961

5062
[Fact]
5163
public void Add_CreatesNewLocalizableString_IfTheCollectionDoesntContainSameString()
5264
{
53-
var sut = new LocalizableStringCollection();
65+
// Arrange
66+
var localizableString = new LocalizableStringCollection();
5467

55-
sut.Add(s1);
56-
sut.Add(otherS);
68+
// Act
69+
localizableString.Add(_localizedString1);
70+
localizableString.Add(_localizedString3);
5771

58-
Assert.Contains(sut.Values, o => o.Text == s1.Text);
59-
Assert.Contains(sut.Values, o => o.Text == s2.Text);
72+
// Assert
73+
Assert.Contains(localizableString.Values, o => o.Text == _localizedString1.Text);
74+
Assert.Contains(localizableString.Values, o => o.Text == _localizedString2.Text);
6075
}
6176
}
6277
}

‎test/OrchardCoreContrib.PoExtractor.Core.Tests/LocalizableStringTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
using Xunit;
2-
3-
namespace OrchardCoreContrib.PoExtractor.Tests
1+
namespace OrchardCoreContrib.PoExtractor.Tests
42
{
53
public class LocalizableStringTests
64
{
75
[Fact]
86
public void Constructor_PopulatesProperties()
97
{
8+
// Arrange
109
var source = new LocalizableStringOccurence()
1110
{
1211
Context = "OrchardCoreContrib.PoExtractor",
@@ -20,12 +19,13 @@ public void Constructor_PopulatesProperties()
2019
}
2120
};
2221

22+
// Act
2323
var result = new LocalizableString(source);
2424

25+
// Assert
2526
Assert.Equal(source.Context, result.Context);
2627
Assert.Equal(source.Text, result.Text);
2728
Assert.Equal(source.TextPlural, result.TextPlural);
28-
2929
Assert.Single(result.Locations, source.Location);
3030
}
3131
}

test/OrchardCoreContrib.PoExtractor.Tests/Usings.cs renamed to test/OrchardCoreContrib.PoExtractor.Core.Tests/Usings.cs

File renamed without changes.

‎test/OrchardCoreContrib.PoExtractor.Liquid.Tests/LiquidProjectProcessorTests.cs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,27 @@ namespace OrchardCoreContrib.PoExtractor.Liquid.Tests
44
{
55
public class LiquidProjectProcessorTests
66
{
7-
readonly LiquidProjectProcessor processor = new();
8-
readonly LocalizableStringCollection strings = new();
7+
private readonly LiquidProjectProcessor _processor = new();
8+
private readonly LocalizableStringCollection _localizableStrings = new();
99

1010
[Fact]
1111
public void ExtractsStringFromLiquidProperty()
1212
{
13-
processor.Process("ProjectFiles", string.Empty, strings);
13+
// Act
14+
_processor.Process("ProjectFiles", string.Empty, _localizableStrings);
1415

15-
Assert.Contains(strings.Values, s => s.Text == "string in variable");
16+
// Assert
17+
Assert.Contains(_localizableStrings.Values, s => s.Text == "string in variable");
1618
}
1719

1820
[Fact]
1921
public void ExtractsStringFromLiquidExpression()
2022
{
21-
processor.Process("ProjectFiles", string.Empty, strings);
23+
// Act
24+
_processor.Process("ProjectFiles", string.Empty, _localizableStrings);
2225

23-
Assert.Contains(strings.Values, s => s.Text == "string in expression");
26+
// Assert
27+
Assert.Contains(_localizableStrings.Values, s => s.Text == "string in expression");
2428
}
2529
}
2630
}

0 commit comments

Comments
 (0)