@@ -41,68 +41,79 @@ private Configuration GetNondefaultConfig()
4141 [ TestMethod ]
4242 public void SaveConfigWorks ( )
4343 {
44+ var customConfig = GetNondefaultConfig ( ) ;
4445 var viewModel = new UnitTestSettingsViewModel ( GetNondefaultConfig ( ) ) ;
45- viewModel . UpdateConfig ( GetNondefaultConfig ( ) ) ;
4646
47- Assert . AreEqual ( BindingMode . EarlyBinding , viewModel . BindingMode ) ;
48- Assert . AreEqual ( AssertMode . PermissiveAssert , viewModel . AssertMode ) ;
49- Assert . AreEqual ( false , viewModel . ModuleInit ) ;
50- Assert . AreEqual ( false , viewModel . MethodInit ) ;
51- Assert . AreEqual ( true , viewModel . DefaultTestStubInNewModule ) ;
47+ var config = GetDefaultConfig ( ) ;
48+ viewModel . UpdateConfig ( config ) ;
49+
50+ MultiAssert . Aggregate (
51+ ( ) => Assert . AreEqual ( customConfig . UserSettings . UnitTestSettings . BindingMode , viewModel . BindingMode ) ,
52+ ( ) => Assert . AreEqual ( customConfig . UserSettings . UnitTestSettings . AssertMode , viewModel . AssertMode ) ,
53+ ( ) => Assert . AreEqual ( customConfig . UserSettings . UnitTestSettings . ModuleInit , viewModel . ModuleInit ) ,
54+ ( ) => Assert . AreEqual ( customConfig . UserSettings . UnitTestSettings . MethodInit , viewModel . MethodInit ) ,
55+ ( ) => Assert . AreEqual ( customConfig . UserSettings . UnitTestSettings . DefaultTestStubInNewModule , viewModel . DefaultTestStubInNewModule ) ) ;
5256 }
5357
5458 [ TestMethod ]
5559 public void SetDefaultsWorks ( )
5660 {
5761 var viewModel = new UnitTestSettingsViewModel ( GetNondefaultConfig ( ) ) ;
5862
59- viewModel . SetToDefaults ( GetDefaultConfig ( ) ) ;
63+ var defaultConfig = GetDefaultConfig ( ) ;
64+ viewModel . SetToDefaults ( defaultConfig ) ;
6065
61- Assert . AreEqual ( BindingMode . LateBinding , viewModel . BindingMode ) ;
62- Assert . AreEqual ( AssertMode . StrictAssert , viewModel . AssertMode ) ;
63- Assert . AreEqual ( true , viewModel . ModuleInit ) ;
64- Assert . AreEqual ( true , viewModel . MethodInit ) ;
65- Assert . AreEqual ( false , viewModel . DefaultTestStubInNewModule ) ;
66+ MultiAssert . Aggregate (
67+ ( ) => Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . BindingMode , viewModel . BindingMode ) ,
68+ ( ) => Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . AssertMode , viewModel . AssertMode ) ,
69+ ( ) => Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . ModuleInit , viewModel . ModuleInit ) ,
70+ ( ) => Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . MethodInit , viewModel . MethodInit ) ,
71+ ( ) => Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . DefaultTestStubInNewModule , viewModel . DefaultTestStubInNewModule ) ) ;
6672 }
6773
6874 [ TestMethod ]
6975 public void BindingModeIsSetInCtor ( )
7076 {
71- var viewModel = new UnitTestSettingsViewModel ( GetDefaultConfig ( ) ) ;
77+ var defaultConfig = GetDefaultConfig ( ) ;
78+ var viewModel = new UnitTestSettingsViewModel ( defaultConfig ) ;
7279
73- Assert . AreEqual ( BindingMode . LateBinding , viewModel . BindingMode ) ;
80+ Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . BindingMode , viewModel . BindingMode ) ;
7481 }
7582
7683 [ TestMethod ]
7784 public void AssertModeIsSetInCtor ( )
7885 {
79- var viewModel = new UnitTestSettingsViewModel ( GetDefaultConfig ( ) ) ;
86+ var defaultConfig = GetDefaultConfig ( ) ;
87+ var viewModel = new UnitTestSettingsViewModel ( defaultConfig ) ;
8088
81- Assert . AreEqual ( AssertMode . StrictAssert , viewModel . AssertMode ) ;
89+ Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . AssertMode , viewModel . AssertMode ) ;
8290 }
8391
8492 [ TestMethod ]
8593 public void ModuleInitIsSetInCtor ( )
8694 {
87- var viewModel = new UnitTestSettingsViewModel ( GetDefaultConfig ( ) ) ;
95+ var defaultConfig = GetDefaultConfig ( ) ;
96+ var viewModel = new UnitTestSettingsViewModel ( defaultConfig ) ;
8897
89- Assert . AreEqual ( true , viewModel . ModuleInit ) ;
98+ Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . ModuleInit , viewModel . ModuleInit ) ;
9099 }
91100
92101 [ TestMethod ]
93102 public void MethodInitIsSetInCtor ( )
94103 {
95- var viewModel = new UnitTestSettingsViewModel ( GetDefaultConfig ( ) ) ;
104+ var defaultConfig = GetDefaultConfig ( ) ;
105+ var viewModel = new UnitTestSettingsViewModel ( defaultConfig ) ;
96106
97- Assert . AreEqual ( true , viewModel . MethodInit ) ;
107+ Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . MethodInit , viewModel . MethodInit ) ;
98108 }
99109
100110 [ TestMethod ]
101111 public void DefaultTestStubInNewModuleIsSetInCtor ( )
102112 {
103- var viewModel = new UnitTestSettingsViewModel ( GetDefaultConfig ( ) ) ;
113+ var defaultConfig = GetDefaultConfig ( ) ;
114+ var viewModel = new UnitTestSettingsViewModel ( defaultConfig ) ;
104115
105- Assert . AreEqual ( false , viewModel . DefaultTestStubInNewModule ) ;
116+ Assert . AreEqual ( defaultConfig . UserSettings . UnitTestSettings . DefaultTestStubInNewModule , viewModel . DefaultTestStubInNewModule ) ;
106117 }
107118 }
108119}
0 commit comments