Skip to content

Commit 6122f6f

Browse files
OctobobOctobob
committed
Run ReSharper code cleanup
1 parent 477838b commit 6122f6f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2029
-2088
lines changed

‎build/Build.cs‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
using Nuke.Common;
2-
using Nuke.Common.Execution;
3-
using Nuke.Common.IO;
4-
using Nuke.Common.ProjectModel;
5-
using Nuke.Common.Tools.DotNet;
6-
using Nuke.Common.Tools.OctoVersion;
7-
using Nuke.Common.Utilities.Collections;
8-
using static Nuke.Common.IO.FileSystemTasks;
9-
using static Nuke.Common.Tools.DotNet.DotNetTasks;
1+
using System;
102

113
[UnsetVisualStudioEnvironmentVariables]
124
class Build : NukeBuild
@@ -16,15 +8,14 @@ class Build : NukeBuild
168
[Solution] readonly Solution Solution;
179

1810
[Parameter("Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable OCTOVERSION_CurrentBranch.",
19-
Name = "OCTOVERSION_CurrentBranch")]
20-
readonly string BranchName;
11+
Name = "OCTOVERSION_CurrentBranch")]
12+
readonly string BranchName;
2113

22-
[Parameter("Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI.")]
23-
readonly bool AutoDetectBranch = IsLocalBuild;
14+
[Parameter("Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI.")] readonly bool AutoDetectBranch = IsLocalBuild;
2415

25-
[OctoVersion(UpdateBuildNumber = true, BranchParameter = nameof(BranchName),
26-
AutoDetectBranchParameter = nameof(AutoDetectBranch), Framework = "net6.0")]
27-
readonly OctoVersionInfo OctoVersionInfo;
16+
[OctoVersion(UpdateBuildNumber = true, BranchParameter = nameof(BranchName),
17+
AutoDetectBranchParameter = nameof(AutoDetectBranch), Framework = "net6.0")]
18+
readonly OctoVersionInfo OctoVersionInfo;
2819

2920
AbsolutePath SourceDirectory => RootDirectory / "source";
3021
AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";

‎source/Tests/AssertionExtensions.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
using System;
22
using Octopus.Ocl;
33

4-
namespace Tests
4+
namespace Tests;
5+
6+
public static class AssertionExtensions
57
{
6-
public static class AssertionExtensions
7-
{
8-
public static OclBodyAssertions Should(this OclBody? subject)
9-
=> new OclBodyAssertions(subject);
10-
}
8+
public static OclBodyAssertions Should(this OclBody? subject) => new(subject);
119
}

‎source/Tests/Converters/BlockOclConverterFixture.cs‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,62 +5,61 @@
55
using Octopus.Ocl;
66
using Octopus.Ocl.Converters;
77

8-
namespace Tests.Converters
8+
namespace Tests.Converters;
9+
10+
public class BlockOclConverterFixture
911
{
10-
public class BlockOclConverterFixture
12+
[Test]
13+
public void NameCaseIsKept()
1114
{
12-
[Test]
13-
public void NameCaseIsKept()
14-
{
15-
var context = new OclConversionContext(new OclSerializerOptions());
16-
var data = new object();
17-
var result = (OclBlock)new DefaultBlockOclConverter().ToElements(context, typeof(WithIndexer).GetProperty(nameof(WithIndexer.MyProp))!, data).Single();
18-
result.Name.Should().Be("my_prop");
19-
}
15+
var context = new OclConversionContext(new OclSerializerOptions());
16+
var data = new object();
17+
var result = (OclBlock)new DefaultBlockOclConverter().ToElements(context, typeof(WithIndexer).GetProperty(nameof(WithIndexer.MyProp))!, data).Single();
18+
result.Name.Should().Be("my_prop");
19+
}
2020

21-
[Test]
22-
public void AttributesComeBeforeBlocks()
21+
[Test]
22+
public void AttributesComeBeforeBlocks()
23+
{
24+
var context = new OclConversionContext(new OclSerializerOptions());
25+
var data = new
2326
{
24-
var context = new OclConversionContext(new OclSerializerOptions());
25-
var data = new
27+
MyBlock = new { BlockProp = "OtherValue" },
28+
MyProp = "MyValue"
29+
};
30+
var result = (OclBlock)new DefaultBlockOclConverter().ToElements(context, typeof(WithIndexer).GetProperty(nameof(WithIndexer.MyProp)), data).Single();
31+
result.First()
32+
.Should()
33+
.BeEquivalentTo(new OclAttribute("my_prop", "MyValue"));
34+
}
35+
36+
[Test]
37+
public void IndexersAreIgnored()
38+
{
39+
var context = new OclConversionContext(new OclSerializerOptions());
40+
var data =
41+
new Dummy
2642
{
27-
MyBlock = new { BlockProp = "OtherValue" },
28-
MyProp = "MyValue"
43+
Foo = new WithIndexer()
2944
};
30-
var result = (OclBlock)new DefaultBlockOclConverter().ToElements(context, typeof(WithIndexer).GetProperty(nameof(WithIndexer.MyProp)), data).Single();
31-
result.First()
32-
.Should()
33-
.BeEquivalentTo(new OclAttribute("my_prop", "MyValue"));
34-
}
35-
36-
[Test]
37-
public void IndexersAreIgnored()
38-
{
39-
var context = new OclConversionContext(new OclSerializerOptions());
40-
var data =
41-
new Dummy
45+
var result = (OclBlock)new DefaultBlockOclConverter().ToElements(context, typeof(Dummy).GetProperty(nameof(Dummy.Foo)), data.Foo).Single();
46+
result.Should()
47+
.Be(
48+
new OclBlock("foo")
4249
{
43-
Foo = new WithIndexer()
44-
};
45-
var result = (OclBlock)new DefaultBlockOclConverter().ToElements(context, typeof(Dummy).GetProperty(nameof(Dummy.Foo)), data.Foo).Single();
46-
result.Should()
47-
.Be(
48-
new OclBlock("foo")
49-
{
50-
new OclAttribute("my_prop", "MyValue")
51-
}
52-
);
53-
}
50+
new OclAttribute("my_prop", "MyValue")
51+
}
52+
);
53+
}
5454

55-
class WithIndexer
56-
{
57-
public string MyProp => "MyValue";
58-
public string this[int index] => throw new NotImplementedException();
59-
}
55+
class WithIndexer
56+
{
57+
public string MyProp => "MyValue";
58+
public string this[int index] => throw new NotImplementedException();
59+
}
6060

61-
class Dummy
62-
{
63-
public object? Foo { get; set; }
64-
}
61+
class Dummy
62+
{
63+
public object? Foo { get; set; }
6564
}
6665
}

‎source/Tests/Converters/DefaultAttributeOclConverterFixture.cs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@
55
using Octopus.Ocl;
66
using Octopus.Ocl.Converters;
77

8-
namespace Tests.Converters
8+
namespace Tests.Converters;
9+
10+
public class DefaultAttributeOclConverterFixture
911
{
10-
public class DefaultAttributeOclConverterFixture
12+
[Test]
13+
public void NameCaseIsKept()
1114
{
12-
[Test]
13-
public void NameCaseIsKept()
14-
{
15-
var context = new OclConversionContext(new OclSerializerOptions());
16-
var result = (OclAttribute)new DefaultAttributeOclConverter().ToElements(context, typeof(Dummy).GetProperty(nameof(Dummy.Test))!, "Value").Single();
17-
result.Name.Should().Be("test");
18-
}
15+
var context = new OclConversionContext(new OclSerializerOptions());
16+
var result = (OclAttribute)new DefaultAttributeOclConverter().ToElements(context, typeof(Dummy).GetProperty(nameof(Dummy.Test))!, "Value").Single();
17+
result.Name.Should().Be("test");
18+
}
1919

20-
class Dummy
21-
{
22-
public string Test { get; } = "Value";
23-
}
20+
class Dummy
21+
{
22+
public string Test { get; } = "Value";
2423
}
2524
}

‎source/Tests/Converters/DefaultCollectionOclConverterFixture.cs‎

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,64 +5,63 @@
55
using Octopus.Ocl;
66
using Octopus.Ocl.Converters;
77

8-
namespace Tests.Converters
8+
namespace Tests.Converters;
9+
10+
public class DefaultCollectionOclConverterFixture
911
{
10-
public class DefaultCollectionOclConverterFixture
11-
{
12-
const string Value = "Daffy";
12+
const string Value = "Daffy";
1313

14-
readonly OclConversionContext context = new OclConversionContext(new OclSerializerOptions());
14+
readonly OclConversionContext context = new(new OclSerializerOptions());
1515

16-
[Test]
17-
public void FromElement_IEnumerableTargetWithCurrentAsNullReturnsAList()
18-
=> ExecuteFromElement<IEnumerable<string>>(null)
19-
.Should()
20-
.BeOfType<List<string>>()
21-
.And
22-
.BeEquivalentTo(new[] { Value });
16+
[Test]
17+
public void FromElement_IEnumerableTargetWithCurrentAsNullReturnsAList()
18+
=> ExecuteFromElement<IEnumerable<string>>(null)
19+
.Should()
20+
.BeOfType<List<string>>()
21+
.And
22+
.BeEquivalentTo(new[] { Value });
2323

24-
[Test]
25-
public void FromElement_IListTargetWithCurrentAsNullReturnsAList()
26-
=> ExecuteFromElement<IEnumerable<string>>(null)
27-
.Should()
28-
.BeOfType<List<string>>()
29-
.And
30-
.BeEquivalentTo(new[] { Value });
24+
[Test]
25+
public void FromElement_IListTargetWithCurrentAsNullReturnsAList()
26+
=> ExecuteFromElement<IEnumerable<string>>(null)
27+
.Should()
28+
.BeOfType<List<string>>()
29+
.And
30+
.BeEquivalentTo(new[] { Value });
3131

32-
[Test]
33-
public void FromElement_HashSetTargetWithCurrentAsNullReturnsAHashSet()
34-
=> ExecuteFromElement<HashSet<string>>(null)
35-
.Should()
36-
.BeOfType<HashSet<string>>()
37-
.And
38-
.BeEquivalentTo(new[] { Value });
32+
[Test]
33+
public void FromElement_HashSetTargetWithCurrentAsNullReturnsAHashSet()
34+
=> ExecuteFromElement<HashSet<string>>(null)
35+
.Should()
36+
.BeOfType<HashSet<string>>()
37+
.And
38+
.BeEquivalentTo(new[] { Value });
3939

40-
[Test]
41-
public void FromElement_CustomCollectionIsSupported()
42-
=> ExecuteFromElement<MyCollection>(null)
43-
.Should()
44-
.BeOfType<MyCollection>()
45-
.And
46-
.BeEquivalentTo(new[] { Value });
40+
[Test]
41+
public void FromElement_CustomCollectionIsSupported()
42+
=> ExecuteFromElement<MyCollection>(null)
43+
.Should()
44+
.BeOfType<MyCollection>()
45+
.And
46+
.BeEquivalentTo(new[] { Value });
4747

48-
[Test]
49-
public void FromElement_ReusesCurrentCollection()
50-
{
51-
var existing = new HashSet<string>
52-
{ "ExistingItem" };
53-
ExecuteFromElement<HashSet<string>>(existing)
54-
.Should()
55-
.BeSameAs(existing)
56-
.And
57-
.BeEquivalentTo(new[] { "ExistingItem", Value });
58-
}
48+
[Test]
49+
public void FromElement_ReusesCurrentCollection()
50+
{
51+
var existing = new HashSet<string>
52+
{ "ExistingItem" };
53+
ExecuteFromElement<HashSet<string>>(existing)
54+
.Should()
55+
.BeSameAs(existing)
56+
.And
57+
.BeEquivalentTo(new[] { "ExistingItem", Value });
58+
}
5959

60-
object? ExecuteFromElement<TTarget>(object? currentValue)
61-
=> new DefaultCollectionOclConverter()
62-
.FromElement(context, typeof(TTarget), new OclAttribute("Test", Value), currentValue);
60+
object? ExecuteFromElement<TTarget>(object? currentValue)
61+
=> new DefaultCollectionOclConverter()
62+
.FromElement(context, typeof(TTarget), new OclAttribute("Test", Value), currentValue);
6363

64-
class MyCollection : HashSet<string>
65-
{
66-
}
64+
class MyCollection : HashSet<string>
65+
{
6766
}
6867
}

0 commit comments

Comments
 (0)