Skip to content

Commit e46241a

Browse files
niemyjskiniemyjski
committed
Cleaned up the test warnings
1 parent a87083b commit e46241a

File tree

10 files changed

+92
-89
lines changed

10 files changed

+92
-89
lines changed

‎src/Platforms/Exceptionless.Extensions.Logging/ExceptionlessLogger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
9595
// The logging framework passes in FormattedLogValues, which implements IEnumerable<KeyValuePair<string, object>>;
9696
// add each property and value as individual objects for proper visibility in Exceptionless
9797
if (state is IEnumerable<KeyValuePair<string, object>> stateProps) {
98-
foreach (KeyValuePair<string, object> prop in stateProps) {
98+
foreach (var prop in stateProps) {
9999
// Logging the message template is superfluous
100100
if (prop.Key != "{OriginalFormat}")
101101
builder.SetProperty(prop.Key, prop.Value);

‎test/Exceptionless.Tests/Configuration/ConfigurationTests.cs

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public void CanReadFromAttributes() {
5050
var config = new ExceptionlessConfiguration(DependencyResolver.CreateDefault());
5151
Assert.Null(config.ApiKey);
5252
Assert.Equal("https://collector.exceptionless.io", config.ServerUrl);
53-
Assert.Equal(0, config.Settings.Count);
53+
Assert.Empty(config.Settings);
5454

5555
config.ReadFromAttributes(typeof(ConfigurationTests).GetTypeInfo().Assembly);
5656
Assert.Equal("LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw", config.ApiKey);
5757
Assert.Equal("http://localhost:45000", config.ServerUrl);
58-
Assert.Equal(1, config.Settings.Count);
58+
Assert.Single(config.Settings);
5959
Assert.Equal("configuration", config.Settings["testing"]);
6060
}
6161

@@ -71,10 +71,13 @@ public void WillLockConfig() {
7171

7272
[Fact]
7373
public void CanUpdateSettingsFromServer() {
74-
var config = new ExceptionlessConfiguration(DependencyResolver.Default);
75-
config.ApiKey = "LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw";
76-
config.Settings["LocalSetting"] = "1";
77-
config.Settings["LocalSettingToOverride"] = "1";
74+
var config = new ExceptionlessConfiguration(DependencyResolver.Default) {
75+
ApiKey = "LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw",
76+
Settings = {
77+
["LocalSetting"] = "1",
78+
["LocalSettingToOverride"] = "1"
79+
}
80+
};
7881

7982
var submissionClient = new Mock<ISubmissionClient>();
8083
submissionClient.Setup(m => m.PostEvents(It.IsAny<IEnumerable<Event>>(), config, It.IsAny<IJsonSerializer>()))
@@ -126,12 +129,13 @@ public void CanGetSettingsMultithreaded() {
126129

127130
[Fact]
128131
public void CanGetLogSettingsMultithreaded() {
129-
var settings = new SettingsDictionary();
130-
settings.Add("@@log:*", "Info");
131-
settings.Add("@@log:Source1", "Trace");
132-
settings.Add("@@log:Source2", "Debug");
133-
settings.Add("@@log:Source3", "Info");
134-
settings.Add("@@log:Source4", "Info");
132+
var settings = new SettingsDictionary {
133+
{ "@@log:*", "Info" },
134+
{ "@@log:Source1", "Trace" },
135+
{ "@@log:Source2", "Debug" },
136+
{ "@@log:Source3", "Info" },
137+
{ "@@log:Source4", "Info" }
138+
};
135139

136140
var result = Parallel.For(0, 100, index => {
137141
var level = settings.GetMinLogLevel("Source1");

‎test/Exceptionless.Tests/EventBuilderTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ private ExceptionlessClient CreateClient() {
1515
public void CanCreateEventWithNoDuplicateTags() {
1616
var client = CreateClient();
1717
var builder = client.CreateLog("Tag Example");
18-
Assert.Equal(builder.Target.Tags.Count, 0);
18+
Assert.Empty(builder.Target.Tags);
1919

2020
builder.AddTags("Exceptionless", null, "");
21-
Assert.Equal(builder.Target.Tags.Count, 1);
21+
Assert.Single(builder.Target.Tags);
2222

2323
builder.AddTags("Exceptionless");
24-
Assert.Equal(builder.Target.Tags.Count, 1);
24+
Assert.Single(builder.Target.Tags);
2525

2626
builder.AddTags("test", "Exceptionless", "exceptionless");
27-
Assert.Equal(builder.Target.Tags.Count, 2);
27+
Assert.Equal(2, builder.Target.Tags.Count);
2828
}
2929
}
3030
}

‎test/Exceptionless.Tests/ExceptionlessClientTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ public void CanAddMultipleDataObjectsToEvent() {
2828
ev.AddObject(new Person { Name = "Blake" });
2929
ev.AddObject(new Person { Name = "Eric" });
3030
ev.AddObject(new Person { Name = "Ryan" });
31-
Assert.Equal(ev.Target.Data.Count, 3);
31+
Assert.Equal(3, ev.Target.Data.Count);
3232

3333
ev.Target.Data.Clear();
34-
Assert.Equal(ev.Target.Data.Count, 0);
34+
Assert.Empty(ev.Target.Data);
3535

3636
// The last one in wins.
3737
ev.AddObject(new Person { Name = "Eric" }, "Blake");
3838
ev.AddObject(new Person { Name = "Blake" }, "Blake");
39-
Assert.Equal(ev.Target.Data.Count, 1);
39+
Assert.Single(ev.Target.Data);
4040

41-
var person = ev.Target.Data["Blake"].ToString();
42-
Assert.True(person.Contains("Blake"));
41+
string person = ev.Target.Data["Blake"].ToString();
42+
Assert.Contains("Blake", person);
4343
}
4444

4545
[Fact]
@@ -53,7 +53,7 @@ public void CanFireOnSubmittingEvent() {
5353
};
5454

5555
new EventBuilder(ev, client).Submit();
56-
Assert.Equal(1, submittingEventArgs.Count);
56+
Assert.Single(submittingEventArgs);
5757

5858
new EventBuilder(ev, client, new ContextData()).Submit();
5959
Assert.Equal(2, submittingEventArgs.Count);
@@ -91,7 +91,7 @@ public void WillNotThrowStackOverflowExceptionDuringOnSubmitting() {
9191
var contextData = new ContextData();
9292
contextData.MarkAsUnhandledError();
9393
new Exception("Test").ToExceptionless(contextData, client).Submit();
94-
Assert.Equal(1, submittingEventArgs.Count);
94+
Assert.Single(submittingEventArgs);
9595
}
9696

9797
private class Person {

‎test/Exceptionless.Tests/LastReferenceIdManager/DefaultLastReferenceIdManagerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public void VerfiyGetSetAndClear() {
99
var lastReferenceIdManager = DependencyResolver.Default.GetLastReferenceIdManager();
1010
Assert.Null(lastReferenceIdManager.GetLast());
1111

12-
var key = Guid.NewGuid().ToString();
12+
string key = Guid.NewGuid().ToString();
1313
lastReferenceIdManager.SetLast(key);
1414
Assert.Equal(key, lastReferenceIdManager.GetLast());
1515

‎test/Exceptionless.Tests/Log/FileExceptionlessLogTestBase.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public abstract class FileExceptionlessLogTestBase {
1111
public virtual void CanWriteToLogFile() {
1212
DeleteLog();
1313

14-
using (FileExceptionlessLog log = GetLog(LOG_FILE)) {
14+
using (var log = GetLog(LOG_FILE)) {
1515
log.Info("Test");
1616
log.Flush();
1717

@@ -25,7 +25,7 @@ public virtual void CanWriteToLogFile() {
2525
public virtual void LogFlushTimerWorks() {
2626
DeleteLog();
2727

28-
using (FileExceptionlessLog log = GetLog(LOG_FILE)) {
28+
using (var log = GetLog(LOG_FILE)) {
2929
log.Info("Test");
3030

3131
string contents = log.GetFileContents();
@@ -43,7 +43,7 @@ public virtual void LogFlushTimerWorks() {
4343
public virtual void LogResetsAfter5mb() {
4444
DeleteLog();
4545

46-
using (FileExceptionlessLog log = GetLog(LOG_FILE)) {
46+
using (var log = GetLog(LOG_FILE)) {
4747
// write 3mb of content to the log
4848
for (int i = 0; i < 1024 * 3; i++)
4949
log.Info(new string('0', 1024));
@@ -74,15 +74,15 @@ public virtual void LogResetsAfter5mb() {
7474
}
7575

7676
public virtual void CheckSizeDoesNotFailIfLogIsMissing() {
77-
using (FileExceptionlessLog log = GetLog(LOG_FILE + ".doesnotexist")) {
77+
using (var log = GetLog(LOG_FILE + ".doesnotexist")) {
7878
log.CheckFileSize();
7979
}
8080
}
8181

8282
public virtual void LogIsThreadSafe() {
8383
DeleteLog();
8484

85-
using (FileExceptionlessLog log = GetLog(LOG_FILE)) {
85+
using (var log = GetLog(LOG_FILE)) {
8686
// write 3mb of content to the log in multiple threads
8787
Parallel.For(0, 1024 * 3, i => log.Info(new string('0', 1024)));
8888

‎test/Exceptionless.Tests/Plugins/PluginTests.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ public void ConfigurationDefaults_EnsureNoDuplicateTagsOrData() {
4343

4444
var plugin = new ConfigurationDefaultsPlugin();
4545
plugin.Run(context);
46-
Assert.Equal(0, context.Event.Tags.Count);
46+
Assert.Empty(context.Event.Tags);
4747

4848
client.Configuration.DefaultTags.Add(Event.KnownTags.Critical);
4949
plugin.Run(context);
50-
Assert.Equal(1, context.Event.Tags.Count);
51-
Assert.Equal(0, context.Event.Data.Count);
50+
Assert.Single(context.Event.Tags);
51+
Assert.Empty(context.Event.Data);
5252

5353
client.Configuration.DefaultData.Add("Message", new { Exceptionless = "Is Awesome!" });
5454
for (int index = 0; index < 2; index++) {
5555
plugin.Run(context);
56-
Assert.Equal(1, context.Event.Tags.Count);
57-
Assert.Equal(1, context.Event.Data.Count);
56+
Assert.Single(context.Event.Tags);
57+
Assert.Single(context.Event.Data);
5858
}
5959
}
6060

@@ -66,13 +66,13 @@ public void ConfigurationDefaults_IgnoredProperties() {
6666
var context = new EventPluginContext(client, new Event());
6767
var plugin = new ConfigurationDefaultsPlugin();
6868
plugin.Run(context);
69-
Assert.Equal(1, context.Event.Data.Count);
69+
Assert.Single(context.Event.Data);
7070
Assert.Equal("Test", context.Event.Data["Message"]);
7171

7272
client.Configuration.AddDataExclusions("Ignore*");
7373
client.Configuration.DefaultData.Add("Ignored", "Test");
7474
plugin.Run(context);
75-
Assert.Equal(1, context.Event.Data.Count);
75+
Assert.Single(context.Event.Data);
7676
Assert.Equal("Test", context.Event.Data["Message"]);
7777
}
7878

@@ -402,7 +402,7 @@ public void ErrorPlugin_DiscardDuplicates() {
402402
plugin.Run(context);
403403
Assert.False(context.Cancel);
404404

405-
IData error = context.Event.GetError() as IData ?? context.Event.GetSimpleError();
405+
var error = context.Event.GetError() as IData ?? context.Event.GetSimpleError();
406406
Assert.NotNull(error);
407407

408408
context = new EventPluginContext(client, new Event());
@@ -441,7 +441,7 @@ public static IEnumerable<object[]> DifferentExceptionDataDictionaryTypes {
441441
}
442442

443443
[Theory]
444-
[MemberData("DifferentExceptionDataDictionaryTypes")]
444+
[MemberData(nameof(DifferentExceptionDataDictionaryTypes))]
445445
public void ErrorPlugin_CanProcessDifferentExceptionDataDictionaryTypes(IDictionary data, bool canMarkAsProcessed, int processedDataItemCount) {
446446
var errorPlugins = new List<IEventPlugin> {
447447
new ErrorPlugin(),
@@ -462,7 +462,7 @@ public void ErrorPlugin_CanProcessDifferentExceptionDataDictionaryTypes(IDiction
462462

463463
Assert.Equal(canMarkAsProcessed, exception.Data != null && exception.Data.Contains("@exceptionless"));
464464

465-
IData error = context.Event.GetError() as IData ?? context.Event.GetSimpleError();
465+
var error = context.Event.GetError() as IData ?? context.Event.GetSimpleError();
466466
Assert.NotNull(error);
467467
Assert.Equal(processedDataItemCount, error.Data.Count);
468468
}
@@ -492,7 +492,7 @@ public void ErrorPlugin_CopyExceptionDataToRootErrorData() {
492492
plugin.Run(context);
493493
Assert.False(context.Cancel);
494494

495-
IData error = context.Event.GetError() as IData ?? context.Event.GetSimpleError();
495+
var error = context.Event.GetError() as IData ?? context.Event.GetSimpleError();
496496
Assert.NotNull(error);
497497
Assert.Equal(5, error.Data.Count);
498498
}
@@ -516,10 +516,10 @@ public void ErrorPlugin_IgnoredProperties() {
516516
context.ContextData.SetException(exception);
517517

518518
plugin.Run(context);
519-
IData error = context.Event.GetError() as IData ?? context.Event.GetSimpleError();
519+
var error = context.Event.GetError() as IData ?? context.Event.GetSimpleError();
520520
Assert.NotNull(error);
521521
Assert.True(error.Data.ContainsKey(Error.KnownDataKeys.ExtraProperties));
522-
var json = error.Data[Error.KnownDataKeys.ExtraProperties] as string;
522+
string json = error.Data[Error.KnownDataKeys.ExtraProperties] as string;
523523
Assert.Equal("{\"IgnoredProperty\":\"Test\",\"RandomValue\":\"Test\"}", json);
524524

525525
client.Configuration.AddDataExclusions("Ignore*");
@@ -541,15 +541,15 @@ public void CanAddPluginConcurrently() {
541541
foreach (var plugin in client.Configuration.Plugins)
542542
client.Configuration.RemovePlugin(plugin.Key);
543543

544-
Assert.Equal(0, client.Configuration.Plugins.Count());
544+
Assert.Empty(client.Configuration.Plugins);
545545

546546
Parallel.For(0, 1000, i => {
547547
client.Configuration.AddPlugin<EnvironmentInfoPlugin>();
548548
});
549549

550-
Assert.Equal(1, client.Configuration.Plugins.Count());
550+
Assert.Single(client.Configuration.Plugins);
551551
client.Configuration.RemovePlugin<EnvironmentInfoPlugin>();
552-
Assert.Equal(0, client.Configuration.Plugins.Count());
552+
Assert.Empty(client.Configuration.Plugins);
553553
}
554554

555555
[Fact]
@@ -561,7 +561,7 @@ public void EnvironmentInfo_CanRunInParallel() {
561561
Parallel.For(0, 10000, i => {
562562
var context = new EventPluginContext(client, ev);
563563
plugin.Run(context);
564-
Assert.Equal(1, context.Event.Data.Count);
564+
Assert.Single(context.Event.Data);
565565
Assert.NotNull(context.Event.Data[Event.KnownDataKeys.EnvironmentInfo]);
566566
});
567567
}
@@ -573,7 +573,7 @@ public void EnvironmentInfo_ShouldAddSessionStart() {
573573

574574
var plugin = new EnvironmentInfoPlugin();
575575
plugin.Run(context);
576-
Assert.Equal(1, context.Event.Data.Count);
576+
Assert.Single(context.Event.Data);
577577
Assert.NotNull(context.Event.Data[Event.KnownDataKeys.EnvironmentInfo]);
578578
}
579579

@@ -589,7 +589,7 @@ public void CanCancel() {
589589
var context = new EventPluginContext(client, new Event());
590590
EventPluginManager.Run(context);
591591
Assert.True(context.Cancel);
592-
Assert.Equal(0, context.Event.Tags.Count);
592+
Assert.Empty(context.Event.Tags);
593593
}
594594

595595
[Fact]
@@ -725,7 +725,7 @@ public void VerifyPriority() {
725725
foreach (var plugin in config.Plugins)
726726
config.RemovePlugin(plugin.Key);
727727

728-
Assert.Equal(0, config.Plugins.Count());
728+
Assert.Empty(config.Plugins);
729729
config.AddPlugin<EnvironmentInfoPlugin>();
730730
config.AddPlugin<PluginWithPriority11>();
731731
config.AddPlugin(new PluginWithNoPriority());
@@ -887,7 +887,7 @@ public void RunBenchmark() {
887887
foreach (var report in summary.Reports) {
888888
_writer.WriteLine(report.ToString());
889889

890-
var benchmarkMedianMilliseconds = report.ResultStatistics != null ? report.ResultStatistics.Median / 1000000 : 0;
890+
double benchmarkMedianMilliseconds = report.ResultStatistics != null ? report.ResultStatistics.Median / 1000000 : 0;
891891
_writer.WriteLine(String.Format("{0} - {1:0.00}ms", report.Benchmark.DisplayInfo, benchmarkMedianMilliseconds));
892892
}
893893
}

0 commit comments

Comments
 (0)