File tree Expand file tree Collapse file tree 2 files changed +22
-7
lines changed
Expand file tree Collapse file tree 2 files changed +22
-7
lines changed Original file line number Diff line number Diff line change @@ -59,15 +59,9 @@ public static void ResetDefaults()
5959 {
6060 lock ( ConfigureLock )
6161 {
62- if ( ! _isConfigured )
63- return ;
64-
6562 Configuration . ResetDefaults ( ) ;
66-
67- ConfigureJson ( ) ;
68-
63+ JsonConvert . DefaultSettings = ( ) => new JsonSerializerSettings ( ) ;
6964 FlurlHttp . Configuration . ResetDefaults ( ) ;
70- ConfigureFlurl ( ) ;
7165
7266 _isConfigured = false ;
7367 }
Original file line number Diff line number Diff line change 11using System ;
22using System . Net . Http . Headers ;
33using Flurl . Http ;
4+ using Newtonsoft . Json ;
5+ using Newtonsoft . Json . Serialization ;
6+ using OpenStack . Serialization ;
47using OpenStack . Testing ;
58using Xunit ;
69
@@ -18,6 +21,24 @@ public void Dispose()
1821 OpenStackNet . ResetDefaults ( ) ;
1922 }
2023
24+ [ Fact ]
25+ public void ResetDefaults_ResetsJsonNetConfiguration ( )
26+ {
27+ OpenStackNet . Configure ( ) ;
28+ Assert . IsType < OpenStackContractResolver > ( JsonSerializer . CreateDefault ( ) . ContractResolver ) ;
29+ OpenStackNet . ResetDefaults ( ) ;
30+ Assert . IsType < DefaultContractResolver > ( JsonSerializer . CreateDefault ( ) . ContractResolver ) ;
31+ }
32+
33+ [ Fact ]
34+ public void ResetDefaults_ResetsFlurlConfiguration ( )
35+ {
36+ OpenStackNet . Configure ( ) ;
37+ Assert . NotNull ( FlurlHttp . Configuration . BeforeCall ) ;
38+ OpenStackNet . ResetDefaults ( ) ;
39+ Assert . Null ( FlurlHttp . Configuration . BeforeCall ) ;
40+ }
41+
2142 [ Fact ]
2243 public async void UserAgentTest ( )
2344 {
You can’t perform that action at this time.
0 commit comments