1313
1414namespace Exceptionless . Tests . Serializer {
1515 public abstract class StorageSerializerTestBase {
16- private readonly IDependencyResolver _resolver ;
16+ protected readonly IDependencyResolver Resolver = new DefaultDependencyResolver ( ) ;
17+
1718 public StorageSerializerTestBase ( ) {
18- _resolver = new DefaultDependencyResolver ( ) ;
19- _resolver . Register < IObjectStorage , InMemoryObjectStorage > ( ) ;
20- _resolver . Register < IJsonSerializer , DefaultJsonSerializer > ( ) ;
21- _resolver . Register < IExceptionlessLog , InMemoryExceptionlessLog > ( ) ;
22- _resolver . Register < IEnvironmentInfoCollector , DefaultEnvironmentInfoCollector > ( ) ;
23- _resolver . Register < ExceptionlessConfiguration > ( new ExceptionlessConfiguration ( _resolver ) ) ;
24- Initialize ( _resolver ) ;
19+ Resolver . Register < IObjectStorage , InMemoryObjectStorage > ( ) ;
20+ Resolver . Register < IJsonSerializer , DefaultJsonSerializer > ( ) ;
21+ Resolver . Register < IExceptionlessLog , InMemoryExceptionlessLog > ( ) ;
22+ Resolver . Register < IEnvironmentInfoCollector , DefaultEnvironmentInfoCollector > ( ) ;
23+ Resolver . Register < ExceptionlessConfiguration > ( new ExceptionlessConfiguration ( Resolver ) ) ;
2524 }
2625
27- protected virtual void Initialize ( IDependencyResolver resolver ) { }
28-
29- protected abstract IStorageSerializer GetSerializer ( IDependencyResolver resolver ) ;
30-
3126 private Event CreateSimpleEvent ( ) {
3227 var ev = new Event {
3328 Date = DateTime . Now ,
@@ -47,17 +42,17 @@ private Event CreateSimpleEvent() {
4742 }
4843
4944 private void AssertEventSerialize ( Event evt ) {
50- var serializer = GetSerializer ( _resolver ) ;
45+ var serializer = Resolver . Resolve < IStorageSerializer > ( ) ;
5146 Event newEvent ;
5247 using ( var memory = new MemoryStream ( ) ) {
5348 serializer . Serialize ( evt , memory ) ;
5449 memory . Position = 0 ;
5550 newEvent = serializer . Deserialize < Event > ( memory ) ;
5651 }
5752
58- var jsonSerializer = _resolver . GetJsonSerializer ( ) ;
59- var expected = jsonSerializer . Serialize ( evt ) ;
60- var actual = jsonSerializer . Serialize ( newEvent ) ;
53+ var jsonSerializer = Resolver . GetJsonSerializer ( ) ;
54+ string expected = jsonSerializer . Serialize ( evt ) ;
55+ string actual = jsonSerializer . Serialize ( newEvent ) ;
6156
6257 Assert . Equal ( expected , actual ) ;
6358 }
@@ -78,13 +73,13 @@ public virtual void CanSerializeSimpleDataValues() {
7873
7974 public virtual void CanSerializeTags ( ) {
8075 var evt = CreateSimpleEvent ( ) ;
81- evt . AddTags ( "Critial " , "Startup" , "AspNetCore" ) ;
76+ evt . AddTags ( "Critical " , "Startup" , "AspNetCore" ) ;
8277 AssertEventSerialize ( evt ) ;
8378 }
8479
8580 public virtual void CanSerializeEnvironmentInfo ( ) {
8681 var evt = CreateSimpleEvent ( ) ;
87- evt . Data [ Event . KnownDataKeys . EnvironmentInfo ] = _resolver . Resolve < IEnvironmentInfoCollector > ( ) . GetEnvironmentInfo ( ) ;
82+ evt . Data [ Event . KnownDataKeys . EnvironmentInfo ] = Resolver . Resolve < IEnvironmentInfoCollector > ( ) . GetEnvironmentInfo ( ) ;
8883 AssertEventSerialize ( evt ) ;
8984 }
9085
@@ -142,7 +137,7 @@ public virtual void CanSerializeManualStackingInfo() {
142137 }
143138
144139 public virtual void CanSerializeSimpleError ( ) {
145- var client = new ExceptionlessClient ( new ExceptionlessConfiguration ( _resolver ) ) ;
140+ var client = new ExceptionlessClient ( new ExceptionlessConfiguration ( Resolver ) ) ;
146141 var exception = new ArgumentException ( "The argument cannot be null or empty" , "value" ) ;
147142
148143 var evt = CreateSimpleEvent ( ) ;
@@ -151,7 +146,7 @@ public virtual void CanSerializeSimpleError() {
151146 }
152147
153148 public virtual void CanSerializeError ( ) {
154- var client = new ExceptionlessClient ( new ExceptionlessConfiguration ( _resolver ) ) ;
149+ var client = new ExceptionlessClient ( new ExceptionlessConfiguration ( Resolver ) ) ;
155150 var exception = new ArgumentException ( "The argument cannot be null or empty" , "value" ) ;
156151
157152 var evt = CreateSimpleEvent ( ) ;
0 commit comments