Skip to content

Commit 9f63e83

Browse files
David BritchDavid Britch
David Britch
authored and
David Britch
committed
Refactored unit tests.
1 parent 3692f99 commit 9f63e83

4 files changed

Lines changed: 20 additions & 50 deletions

File tree

‎src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs‎

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,101 +10,87 @@ namespace eShopOnContainers.UnitTests
1010
{
1111
public class CatalogViewModelTests
1212
{
13+
public CatalogViewModelTests()
14+
{
15+
ViewModelLocator.RegisterDependencies(true);
16+
}
17+
1318
[Fact]
1419
public void AddCatalogItemCommandIsNotNullTest()
1520
{
1621
var catalogService = new CatalogMockService();
17-
ViewModelLocator.RegisterDependencies(true);
1822
var catalogViewModel = new CatalogViewModel(catalogService);
19-
2023
Assert.NotNull(catalogViewModel.AddCatalogItemCommand);
2124
}
2225

2326
[Fact]
2427
public void FilterCommandIsNotNullTest()
2528
{
2629
var catalogService = new CatalogMockService();
27-
ViewModelLocator.RegisterDependencies(true);
2830
var catalogViewModel = new CatalogViewModel(catalogService);
29-
3031
Assert.NotNull(catalogViewModel.FilterCommand);
3132
}
3233

3334
[Fact]
3435
public void ClearFilterCommandIsNotNullTest()
3536
{
3637
var catalogService = new CatalogMockService();
37-
ViewModelLocator.RegisterDependencies(true);
3838
var catalogViewModel = new CatalogViewModel(catalogService);
39-
4039
Assert.NotNull(catalogViewModel.ClearFilterCommand);
4140
}
4241

4342
[Fact]
4443
public void ProductsPropertyIsNullWhenViewModelInstantiatedTest()
4544
{
4645
var catalogService = new CatalogMockService();
47-
ViewModelLocator.RegisterDependencies(true);
4846
var catalogViewModel = new CatalogViewModel(catalogService);
49-
5047
Assert.Null(catalogViewModel.Products);
5148
}
5249

5350
[Fact]
5451
public void BrandsPropertyuIsNullWhenViewModelInstantiatedTest()
5552
{
5653
var catalogService = new CatalogMockService();
57-
ViewModelLocator.RegisterDependencies(true);
5854
var catalogViewModel = new CatalogViewModel(catalogService);
59-
6055
Assert.Null(catalogViewModel.Brands);
6156
}
6257

6358
[Fact]
6459
public void BrandPropertyIsNullWhenViewModelInstantiatedTest()
6560
{
6661
var catalogService = new CatalogMockService();
67-
ViewModelLocator.RegisterDependencies(true);
6862
var catalogViewModel = new CatalogViewModel(catalogService);
69-
7063
Assert.Null(catalogViewModel.Brand);
7164
}
7265

7366
[Fact]
7467
public void TypesPropertyIsNullWhenViewModelInstantiatedTest()
7568
{
7669
var catalogService = new CatalogMockService();
77-
ViewModelLocator.RegisterDependencies(true);
7870
var catalogViewModel = new CatalogViewModel(catalogService);
79-
8071
Assert.Null(catalogViewModel.Types);
8172
}
8273

8374
[Fact]
8475
public void TypePropertyIsNullWhenViewModelInstantiatedTest()
8576
{
8677
var catalogService = new CatalogMockService();
87-
ViewModelLocator.RegisterDependencies(true);
8878
var catalogViewModel = new CatalogViewModel(catalogService);
89-
9079
Assert.Null(catalogViewModel.Type);
9180
}
9281

9382
[Fact]
9483
public void IsFilterPropertyIsFalseWhenViewModelInstantiatedTest()
9584
{
9685
var catalogService = new CatalogMockService();
97-
ViewModelLocator.RegisterDependencies(true);
9886
var catalogViewModel = new CatalogViewModel(catalogService);
99-
10087
Assert.False(catalogViewModel.IsFilter);
10188
}
10289

10390
[Fact]
10491
public async Task ProductsPropertyIsNotNullAfterViewModelInitializationTest()
10592
{
10693
var catalogService = new CatalogMockService();
107-
ViewModelLocator.RegisterDependencies(true);
10894
var catalogViewModel = new CatalogViewModel(catalogService);
10995

11096
await catalogViewModel.InitializeAsync(null);
@@ -116,7 +102,6 @@ public async Task ProductsPropertyIsNotNullAfterViewModelInitializationTest()
116102
public async Task BrandsPropertyIsNotNullAfterViewModelInitializationTest()
117103
{
118104
var catalogService = new CatalogMockService();
119-
ViewModelLocator.RegisterDependencies(true);
120105
var catalogViewModel = new CatalogViewModel(catalogService);
121106

122107
await catalogViewModel.InitializeAsync(null);
@@ -128,7 +113,6 @@ public async Task BrandsPropertyIsNotNullAfterViewModelInitializationTest()
128113
public async Task TypesPropertyIsNotNullAfterViewModelInitializationTest()
129114
{
130115
var catalogService = new CatalogMockService();
131-
ViewModelLocator.RegisterDependencies(true);
132116
var catalogViewModel = new CatalogViewModel(catalogService);
133117

134118
await catalogViewModel.InitializeAsync(null);
@@ -140,9 +124,7 @@ public async Task TypesPropertyIsNotNullAfterViewModelInitializationTest()
140124
public async Task SettingProductsPropertyShouldRaisePropertyChanged()
141125
{
142126
bool invoked = false;
143-
144127
var catalogService = new CatalogMockService();
145-
ViewModelLocator.RegisterDependencies(true);
146128
var catalogViewModel = new CatalogViewModel(catalogService);
147129

148130
catalogViewModel.PropertyChanged += (sender, e) =>
@@ -159,9 +141,7 @@ public async Task SettingProductsPropertyShouldRaisePropertyChanged()
159141
public async Task SettingBrandsPropertyShouldRaisePropertyChanged()
160142
{
161143
bool invoked = false;
162-
163144
var catalogService = new CatalogMockService();
164-
ViewModelLocator.RegisterDependencies(true);
165145
var catalogViewModel = new CatalogViewModel(catalogService);
166146

167147
catalogViewModel.PropertyChanged += (sender, e) =>
@@ -178,9 +158,7 @@ public async Task SettingBrandsPropertyShouldRaisePropertyChanged()
178158
public async Task SettingTypesPropertyShouldRaisePropertyChanged()
179159
{
180160
bool invoked = false;
181-
182161
var catalogService = new CatalogMockService();
183-
ViewModelLocator.RegisterDependencies(true);
184162
var catalogViewModel = new CatalogViewModel(catalogService);
185163

186164
catalogViewModel.PropertyChanged += (sender, e) =>
@@ -198,7 +176,6 @@ public void AddCatalogItemCommandSendsAddProductMessageTest()
198176
{
199177
bool messageReceived = false;
200178
var catalogService = new CatalogMockService();
201-
ViewModelLocator.RegisterDependencies(true);
202179
var catalogViewModel = new CatalogViewModel(catalogService);
203180

204181
Xamarin.Forms.MessagingCenter.Subscribe<CatalogViewModel, CatalogItem>(this, MessageKeys.AddProduct, (sender, arg) =>
@@ -215,7 +192,6 @@ public async Task FilterCommandSendsFilterMessageTest()
215192
{
216193
bool messageReceived = false;
217194
var catalogService = new CatalogMockService();
218-
ViewModelLocator.RegisterDependencies(true);
219195
var catalogViewModel = new CatalogViewModel(catalogService);
220196
await catalogViewModel.InitializeAsync(null);
221197
catalogViewModel.Brand = catalogViewModel.Brands.FirstOrDefault();
@@ -234,7 +210,6 @@ public async Task FilterCommandSendsFilterMessageTest()
234210
public async Task ClearFilterCommandResetsPropertiesTest()
235211
{
236212
var catalogService = new CatalogMockService();
237-
ViewModelLocator.RegisterDependencies(true);
238213
var catalogViewModel = new CatalogViewModel(catalogService);
239214

240215
await catalogViewModel.InitializeAsync(null);

‎src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@ namespace eShopOnContainers.UnitTests
88
{
99
public class MainViewModelTests
1010
{
11+
public MainViewModelTests()
12+
{
13+
ViewModelLocator.RegisterDependencies(true);
14+
}
15+
1116
[Fact]
1217
public void SettingsCommandIsNotNullWhenViewModelInstantiatedTest()
1318
{
14-
ViewModelLocator.RegisterDependencies(true);
1519
var mainViewModel = new MainViewModel();
16-
1720
Assert.NotNull(mainViewModel.SettingsCommand);
1821
}
1922

2023
[Fact]
2124
public async Task ViewModelInitializationSendsChangeTabMessageTest()
2225
{
2326
bool messageReceived = false;
24-
ViewModelLocator.RegisterDependencies(true);
2527
var mainViewModel = new MainViewModel();
2628
var tabParam = new TabParameter { TabIndex = 2 };
2729

@@ -37,19 +39,15 @@ public async Task ViewModelInitializationSendsChangeTabMessageTest()
3739
[Fact]
3840
public void IsBusyPropertyIsFalseWhenViewModelInstantiatedTest()
3941
{
40-
ViewModelLocator.RegisterDependencies(true);
4142
var mainViewModel = new MainViewModel();
4243
Assert.False(mainViewModel.IsBusy);
4344
}
4445

4546
[Fact]
4647
public async Task IsBusyPropertyIsTrueAfterViewModelInitializationTest()
4748
{
48-
ViewModelLocator.RegisterDependencies(true);
4949
var mainViewModel = new MainViewModel();
50-
5150
await mainViewModel.InitializeAsync(null);
52-
5351
Assert.True(mainViewModel.IsBusy);
5452
}
5553
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ namespace eShopOnContainers.UnitTests
55
{
66
public class MockViewModelTests
77
{
8+
public MockViewModelTests()
9+
{
10+
ViewModelLocator.RegisterDependencies(true);
11+
}
12+
813
[Fact]
914
public void CheckValidationFailsWhenPropertiesAreEmptyTest()
1015
{
11-
ViewModelLocator.RegisterDependencies(true);
1216
var mockViewModel = new MockViewModel();
1317

1418
bool isValid = mockViewModel.Validate();
@@ -25,7 +29,6 @@ public void CheckValidationFailsWhenPropertiesAreEmptyTest()
2529
[Fact]
2630
public void CheckValidationFailsWhenOnlyForenameHasDataTest()
2731
{
28-
ViewModelLocator.RegisterDependencies(true);
2932
var mockViewModel = new MockViewModel();
3033
mockViewModel.Forename.Value = "John";
3134

@@ -43,7 +46,6 @@ public void CheckValidationFailsWhenOnlyForenameHasDataTest()
4346
[Fact]
4447
public void CheckValidationPassesWhenOnlySurnameHasDataTest()
4548
{
46-
ViewModelLocator.RegisterDependencies(true);
4749
var mockViewModel = new MockViewModel();
4850
mockViewModel.Surname.Value = "Smith";
4951

@@ -61,7 +63,6 @@ public void CheckValidationPassesWhenOnlySurnameHasDataTest()
6163
[Fact]
6264
public void CheckValidationPassesWhenBothPropertiesHaveDataTest()
6365
{
64-
ViewModelLocator.RegisterDependencies(true);
6566
var mockViewModel = new MockViewModel();
6667
mockViewModel.Forename.Value = "John";
6768
mockViewModel.Surname.Value = "Smith";
@@ -81,8 +82,6 @@ public void CheckValidationPassesWhenBothPropertiesHaveDataTest()
8182
public void SettingForenamePropertyShouldRaisePropertyChanged()
8283
{
8384
bool invoked = false;
84-
85-
ViewModelLocator.RegisterDependencies(true);
8685
var mockViewModel = new MockViewModel();
8786

8887
mockViewModel.Forename.PropertyChanged += (sender, e) =>
@@ -99,8 +98,6 @@ public void SettingForenamePropertyShouldRaisePropertyChanged()
9998
public void SettingSurnamePropertyShouldRaisePropertyChanged()
10099
{
101100
bool invoked = false;
102-
103-
ViewModelLocator.RegisterDependencies(true);
104101
var mockViewModel = new MockViewModel();
105102

106103
mockViewModel.Surname.PropertyChanged += (sender, e) =>

‎src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,23 @@ namespace eShopOnContainers.UnitTests
99
{
1010
public class OrderViewModelTests
1111
{
12+
public OrderViewModelTests()
13+
{
14+
ViewModelLocator.RegisterDependencies(true);
15+
}
16+
1217
[Fact]
1318
public void OrderPropertyIsNullWhenViewModelInstantiatedTest()
1419
{
1520
var orderService = new OrderMockService();
16-
ViewModelLocator.RegisterDependencies(true);
1721
var orderViewModel = new OrderDetailViewModel(orderService);
18-
1922
Assert.Null(orderViewModel.Order);
2023
}
2124

2225
[Fact]
2326
public async Task OrderPropertyIsNotNullAfterViewModelInitializationTest()
2427
{
2528
var orderService = new OrderMockService();
26-
ViewModelLocator.RegisterDependencies(true);
2729
var orderViewModel = new OrderDetailViewModel(orderService);
2830

2931
var order = await orderService.GetOrderAsync(1, GlobalSetting.Instance.AuthToken);
@@ -36,9 +38,7 @@ public async Task OrderPropertyIsNotNullAfterViewModelInitializationTest()
3638
public async Task SettingOrderPropertyShouldRaisePropertyChanged()
3739
{
3840
bool invoked = false;
39-
4041
var orderService = new OrderMockService();
41-
ViewModelLocator.RegisterDependencies(true);
4242
var orderViewModel = new OrderDetailViewModel(orderService);
4343

4444
orderViewModel.PropertyChanged += (sender, e) =>

0 commit comments

Comments
 (0)