Skip to content

Commit 796bbc6

Browse files
RealDotNetDaveRealDotNetDave
committed
Code cleanup. Fixed a few minor bugs.
1 parent c869c72 commit 796bbc6

File tree

25 files changed

+498
-474
lines changed

25 files changed

+498
-474
lines changed

‎src/Benchmarking/dotNetTips.Utility.Benchmarks/dotNetTips.Utility.Benchmarks/Extensions/StringExtensionsPerfTestRunner.cs

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class StringExtensionsPerfTestRunner : PerfTestRunner
2626
private string _commaDelimitedString;
2727
private string _stringToTrim;
2828

29-
[Benchmark(Description = nameof(StringExtensions.ComputeSha256Hash))]
29+
[Benchmark(Description = nameof(StringExtensions.ComputeSHA256Hash))]
3030
public void ComputeMD5Hash()
3131
{
3232
var result = LongTestString.ComputeSha256Hash();
@@ -69,7 +69,7 @@ public void DefaultIfNullOrEmpty()
6969
[Benchmark(Description = nameof(StringExtensions.DelimitedStringToArray))]
7070
public void DelimitedStringToArray()
7171
{
72-
var result = _commaDelimitedString.DelimitedStringToArray();
72+
var result = this._commaDelimitedString.DelimitedStringToArray();
7373

7474
base.Consumer.Consume(result);
7575
}
@@ -90,6 +90,16 @@ public void EqualsOrBothNullOrEmpty()
9090
base.Consumer.Consume(result);
9191
}
9292

93+
[Benchmark(Description = nameof(StringExtensions.FromBase64) + ":" + nameof(StringExtensions.ToBase64))]
94+
public void FromBase64()
95+
{
96+
var base64 = RandomData.GenerateWord(100).ToBase64();
97+
98+
var result = base64.FromBase64();
99+
100+
base.Consumer.Consume(result);
101+
}
102+
93103
[Benchmark(Description = nameof(StringExtensions.HasValue))]
94104
public void HasValue()
95105
{
@@ -133,46 +143,46 @@ public void IsWhitespaceChar()
133143
[Benchmark(Description = nameof(StringExtensions.IsWhitespace) + ":String")]
134144
public void IsWhitespaceString()
135145
{
136-
var result = _stringToTrim.IsWhitespace();
146+
var result = this._stringToTrim.IsWhitespace();
137147

138148
base.Consumer.Consume(result);
139149
}
140150

141151
public override void Setup()
142152
{
143153
base.Setup();
144-
_commaDelimitedString = RandomData.GenerateWords(10, 5, 10).ToDelimitedString();
145-
_stringToTrim = " " + LongTestString + " ";
154+
this._commaDelimitedString = RandomData.GenerateWords(10, 5, 10).ToDelimitedString();
155+
this._stringToTrim = " " + LongTestString + " ";
146156
}
147157

148158
[Benchmark(Description = nameof(StringExtensions.Split) + ":Char Separator")]
149159
public void SplitCharSeparator()
150160
{
151-
var result = _commaDelimitedString.Split(ControlChars.Comma, StringSplitOptions.None);
161+
var result = this._commaDelimitedString.Split(ControlChars.Comma, StringSplitOptions.None);
152162

153163
base.Consumer.Consume(result);
154164
}
155165

156166
[Benchmark(Description = nameof(StringExtensions.Split) + ":Char Separator-Count")]
157167
public void SplitCharSeparatorCount()
158168
{
159-
var result = _commaDelimitedString.Split(ControlChars.Comma, 2, StringSplitOptions.None);
169+
var result = this._commaDelimitedString.Split(ControlChars.Comma, 2, StringSplitOptions.None);
160170

161171
base.Consumer.Consume(result);
162172
}
163173

164174
[Benchmark(Description = nameof(StringExtensions.Split) + ":Char Separator-RemoveEmptyEntries")]
165175
public void SplitCharSeparatorRemoveEmptyEntries()
166176
{
167-
var result = _commaDelimitedString.Split(ControlChars.Comma, StringSplitOptions.RemoveEmptyEntries);
177+
var result = this._commaDelimitedString.Split(ControlChars.Comma, StringSplitOptions.RemoveEmptyEntries);
168178

169179
base.Consumer.Consume(result);
170180
}
171181

172182
[Benchmark(Description = nameof(StringExtensions.Split) + ":Char Separator-Count-RemoveEmptyEntries")]
173183
public void SplitCharSeparatorRemoveEmptyEntriesCount()
174184
{
175-
var result = _commaDelimitedString.Split(ControlChars.Comma, 2, StringSplitOptions.RemoveEmptyEntries);
185+
var result = this._commaDelimitedString.Split(ControlChars.Comma, 2, StringSplitOptions.RemoveEmptyEntries);
176186

177187
base.Consumer.Consume(result);
178188
}
@@ -181,31 +191,31 @@ public void SplitCharSeparatorRemoveEmptyEntriesCount()
181191
[Benchmark(Description = nameof(StringExtensions.Split) + ":String Separator")]
182192
public void SplitStringSeparator()
183193
{
184-
var result = _commaDelimitedString.Split(",", StringSplitOptions.None);
194+
var result = this._commaDelimitedString.Split(",", StringSplitOptions.None);
185195

186196
base.Consumer.Consume(result);
187197
}
188198

189199
[Benchmark(Description = nameof(StringExtensions.Split) + ":String Separator-Count")]
190200
public void SplitStringSeparatorCount()
191201
{
192-
var result = _commaDelimitedString.Split(",", 2, StringSplitOptions.None);
202+
var result = this._commaDelimitedString.Split(",", 2, StringSplitOptions.None);
193203

194204
base.Consumer.Consume(result);
195205
}
196206

197207
[Benchmark(Description = nameof(StringExtensions.Split) + ":String Separator-RemoveEmptyEntries")]
198208
public void SplitStringSeparatorRemoveEmptyEntries()
199209
{
200-
var result = _commaDelimitedString.Split(",", StringSplitOptions.RemoveEmptyEntries);
210+
var result = this._commaDelimitedString.Split(",", StringSplitOptions.RemoveEmptyEntries);
201211

202212
base.Consumer.Consume(result);
203213
}
204214

205215
[Benchmark(Description = nameof(StringExtensions.Split) + ":String Separator-Count-RemoveEmptyEntries")]
206216
public void SplitStringSeparatorRemoveEmptyEntriesCount()
207217
{
208-
var result = _commaDelimitedString.Split(",", 2, StringSplitOptions.RemoveEmptyEntries);
218+
var result = this._commaDelimitedString.Split(",", 2, StringSplitOptions.RemoveEmptyEntries);
209219

210220
base.Consumer.Consume(result);
211221
}
@@ -234,24 +244,6 @@ public void SubstringTrim()
234244
base.Consumer.Consume(result);
235245
}
236246

237-
[Benchmark(Description = nameof(StringExtensions.ToTrimmed))]
238-
public void ToTrimmedString()
239-
{
240-
var result = _stringToTrim.ToTrimmed();
241-
242-
base.Consumer.Consume(result);
243-
}
244-
245-
[Benchmark(Description = nameof(StringExtensions.FromBase64) + ":" + nameof(StringExtensions.ToBase64))]
246-
public void FromBase64()
247-
{
248-
var base64 = RandomData.GenerateWord(100).ToBase64();
249-
250-
var result = base64.FromBase64();
251-
252-
base.Consumer.Consume(result);
253-
}
254-
255247
[Benchmark(Description = nameof(StringExtensions.ToTitleCase))]
256248
public void ToTitleCase()
257249
{
@@ -261,5 +253,13 @@ public void ToTitleCase()
261253
base.Consumer.Consume(words.ToTitleCase());
262254
}
263255

256+
[Benchmark(Description = nameof(StringExtensions.ToTrimmed))]
257+
public void ToTrimmedString()
258+
{
259+
var result = this._stringToTrim.ToTrimmed();
260+
261+
base.Consumer.Consume(result);
262+
}
263+
264264
}
265265
}

‎src/Benchmarking/dotNetTips.Utility.Benchmarks/dotNetTips.Utility.Benchmarks/IO/FileHelperPerfTestRunner.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.Threading.Tasks;
1919
using BenchmarkDotNet.Attributes;
2020
using BenchmarkDotNet.Loggers;
21-
using dotNetTips.Tips.Utility.Standard;
21+
using dotNetTips.Tips.Utility.Standard.Common;
2222
using dotNetTips.Utility.Standard.Extensions;
2323
using dotNetTips.Utility.Standard.IO;
2424
using dotNetTips.Utility.Standard.Tester;
@@ -32,52 +32,37 @@ public class FileHelperPerfTestRunner : PerfTestRunner
3232
private readonly int _fileCount = 100;
3333
private readonly int _fileLength = 1024;
3434

35-
private IEnumerable<FileInfo> _tempFiles;
36-
3735
private readonly DirectoryInfo _tempFolder = new DirectoryInfo(Path.Combine(Environment.GetEnvironmentVariable(EnvironmentKey.TMP.ToString()), "_dotNetTipsBenchmarkTest"));
3836

37+
private IEnumerable<FileInfo> _tempFiles;
38+
3939
public override void Cleanup()
4040
{
4141
base.Cleanup();
4242

4343
FileHelper.DeleteFiles(this._tempFiles.Select(p => p.FullName));
4444
}
4545

46-
public override void Setup()
47-
{
48-
base.Setup();
49-
50-
this._tempFolder.Create();
51-
52-
ConsoleLogger.Default.WriteLine(LogKind.Info, $"Temp Folder: {this._tempFolder}.");
53-
54-
// Copy files for test
55-
this._tempFiles = this.GenerateTempFiles();
56-
57-
ConsoleLogger.Default.WriteLine(LogKind.Info, $"Files Copied: {this._tempFiles.Count()}.");
58-
59-
}
60-
61-
[Benchmark(Description = nameof(FileHelper.CopyFile))]
62-
public void CopyFileTest()
46+
[Benchmark(Description = nameof(FileHelper.CopyFileAsync))]
47+
public async Task CopyFileAsyncTest()
6348
{
6449
DirectoryInfo destPath = this._tempFolder;
6550

6651
FileInfo tempFile = this._tempFiles.PickRandom();
6752

68-
var result = FileHelper.CopyFile(tempFile, destPath);
53+
var result = await FileHelper.CopyFileAsync(tempFile, destPath).ConfigureAwait(false);
6954

7055
base.Consumer.Consume(result);
7156
}
7257

73-
[Benchmark(Description = nameof(FileHelper.CopyFileAsync))]
74-
public async Task CopyFileAsyncTest()
58+
[Benchmark(Description = nameof(FileHelper.CopyFile))]
59+
public void CopyFileTest()
7560
{
7661
DirectoryInfo destPath = this._tempFolder;
7762

7863
FileInfo tempFile = this._tempFiles.PickRandom();
7964

80-
var result = await FileHelper.CopyFileAsync(tempFile, destPath).ConfigureAwait(false);
65+
var result = FileHelper.CopyFile(tempFile, destPath);
8166

8267
base.Consumer.Consume(result);
8368
}
@@ -93,6 +78,14 @@ public void DeleteFilesTest()
9378

9479
}
9580

81+
[Benchmark(Description = nameof(FileHelper.FileHasInvalidChars))]
82+
public void FileHasInvalidCharsTest()
83+
{
84+
var destFile = RandomData.GenerateRandomFileName();
85+
86+
base.Consumer.Consume(FileHelper.FileHasInvalidChars(destFile));
87+
}
88+
9689
[Benchmark(Description = nameof(FileHelper.MoveFile))]
9790
public void MoveFileTest()
9891
{
@@ -102,12 +95,19 @@ public void MoveFileTest()
10295
FileHelper.MoveFile(tempFile, destFile);
10396
}
10497

105-
[Benchmark(Description = nameof(FileHelper.FileHasInvalidChars))]
106-
public void FileHasInvalidCharsTest()
98+
public override void Setup()
10799
{
108-
var destFile = RandomData.GenerateRandomFileName();
100+
base.Setup();
101+
102+
this._tempFolder.Create();
103+
104+
ConsoleLogger.Default.WriteLine(LogKind.Info, $"Temp Folder: {this._tempFolder}.");
105+
106+
// Copy files for test
107+
this._tempFiles = this.GenerateTempFiles();
108+
109+
ConsoleLogger.Default.WriteLine(LogKind.Info, $"Files Copied: {this._tempFiles.Count()}.");
109110

110-
base.Consumer.Consume(FileHelper.FileHasInvalidChars(destFile));
111111
}
112112

113113
private IEnumerable<FileInfo> GenerateTempFiles()

0 commit comments

Comments
 (0)