Merge pull request dotnet-architecture#176 from dotnet-architecture/xamarin

Unit tests

Author: davidbritch

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/EventToCommandBehavior.cs

@@ -31,7 +31,7 @@ public class EventToCommandBehavior : BindableBehavior<View>
             BindableProperty.CreateAttached("EventArgsConverterParameter", typeof(object), typeof(EventToCommandBehavior), null,
                 BindingMode.OneWay);
 
-        private Delegate _handler;
+        protected Delegate _handler;
         private EventInfo _eventInfo;
 
         public string EventName

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs

@@ -16,8 +16,7 @@ public BasketService(IRequestProvider requestProvider)
         }
 
         public async Task<CustomerBasket> GetBasketAsync(string guidUser, string token)
-        {
-    
+        {    
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
 
             builder.Path = guidUser;
@@ -30,18 +29,17 @@ public async Task<CustomerBasket> GetBasketAsync(string guidUser, string token)
                 ServicesHelper.FixBasketItemPictureUri(basket?.Items);
 
             return basket;
-
         }
 
         public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token)
         {
-                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
+            UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
 
-                string uri = builder.ToString();
+            string uri = builder.ToString();
 
-                var result = await _requestProvider.PostAsync(uri, customerBasket, token);
+            var result = await _requestProvider.PostAsync(uri, customerBasket, token);
 
-                return result;
+            return result;
         }
 
         public async Task ClearBasketAsync(string guidUser, string token)

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogMockService.cs

@@ -61,12 +61,5 @@ public async Task<ObservableCollection<CatalogType>> GetCatalogTypeAsync()
 
             return MockCatalogType;
         }
-
-        public async Task<CatalogItem> GetCatalogItemAsync(string id)
-        {
-            await Task.Delay(500);
-
-            return MockCatalog.FirstOrDefault(c => c.Id == id);
-        }
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs

@@ -20,7 +20,6 @@ public CatalogService(IRequestProvider requestProvider)
 
         public async Task<ObservableCollection<CatalogItem>> FilterAsync(int catalogBrandId, int catalogTypeId)
         {
-
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
 
             builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId);
@@ -34,12 +33,10 @@ public async Task<ObservableCollection<CatalogItem>> FilterAsync(int catalogBran
                 return catalog?.Data.ToObservableCollection();
             else
                 return new ObservableCollection<CatalogItem>();
-
         }
 
         public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()
         {
-
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
 
             builder.Path = "api/v1/catalog/items";
@@ -56,37 +53,28 @@ public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()
                 return catalog?.Data.ToObservableCollection();
             }
             else
-                return new ObservableCollection<CatalogItem>();
-            
-        }
-
-        public Task<CatalogItem> GetCatalogItemAsync(string id)
-        {
-            throw new NotImplementedException();
+                return new ObservableCollection<CatalogItem>();            
         }
 
         public async Task<ObservableCollection<CatalogBrand>> GetCatalogBrandAsync()
         {
+            UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
 
-                UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
-
-                builder.Path = "api/v1/catalog/catalogbrands";
-
-                string uri = builder.ToString();
+            builder.Path = "api/v1/catalog/catalogbrands";
 
-                IEnumerable<CatalogBrand> brands =
-                       await _requestProvider.GetAsync<IEnumerable<CatalogBrand>>(uri);
+            string uri = builder.ToString();
 
-                if (brands != null)
-                    return brands?.ToObservableCollection();
-                else
-                    return new ObservableCollection<CatalogBrand>();
+            IEnumerable<CatalogBrand> brands =
+                   await _requestProvider.GetAsync<IEnumerable<CatalogBrand>>(uri);
 
+            if (brands != null)
+                return brands?.ToObservableCollection();
+            else
+                return new ObservableCollection<CatalogBrand>();
         }
 
         public async Task<ObservableCollection<CatalogType>> GetCatalogTypeAsync()
         {
-
             UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
 
             builder.Path = "api/v1/catalog/catalogtypes";
@@ -99,8 +87,7 @@ public async Task<ObservableCollection<CatalogType>> GetCatalogTypeAsync()
             if (types != null)
                 return types.ToObservableCollection();
             else
-                return new ObservableCollection<CatalogType>();
-            
+                return new ObservableCollection<CatalogType>();            
         }
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/ICatalogService.cs

@@ -10,6 +10,5 @@ public interface ICatalogService
         Task<ObservableCollection<CatalogItem>> FilterAsync(int catalogBrandId, int catalogTypeId);
         Task<ObservableCollection<CatalogType>> GetCatalogTypeAsync();
         Task<ObservableCollection<CatalogItem>> GetCatalogAsync();
-        Task<CatalogItem> GetCatalogItemAsync(string id);
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs

@@ -5,8 +5,6 @@
 using eShopOnContainers.Core.Models.Catalog;
 using eShopOnContainers.Core.Services.Catalog;
 using System.Windows.Input;
-using eShopOnContainers.Core.Services.Basket;
-using eShopOnContainers.Core.Services.User;
 
 namespace eShopOnContainers.Core.ViewModels
 {

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainActivity.cs

@@ -14,7 +14,7 @@ protected override void OnCreate(Bundle bundle)
             AddExecutionAssembly(typeof(ExtensibilityPointFactory).Assembly);
 
             // or in any reference assemblies getting the Assembly from any type/class	
-            AddTestAssembly(typeof(UnitTests.DummyTests).Assembly);
+			AddTestAssembly(typeof(UnitTests.CatalogViewModelTests).Assembly);
 
             base.OnCreate(bundle);
         }

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj

@@ -20,6 +20,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <AndroidTlsProvider></AndroidTlsProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/App.xaml.cs

@@ -12,7 +12,7 @@ protected override void OnInitializeRunner()
         {    
             // Otherwise you need to ensure that the test assemblies will 
             // become part of the app bundle
-            AddTestAssembly(typeof(UnitTests.DummyTests).GetTypeInfo().Assembly);
+            AddTestAssembly(typeof(UnitTests.CatalogViewModelTests).GetTypeInfo().Assembly);
         }
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/AppDelegate.cs

@@ -17,7 +17,7 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 
             // Otherwise you need to ensure that the test assemblies will 
             // become part of the app bundle
-            AddTestAssembly(typeof(UnitTests.DummyTests).Assembly);
+			AddTestAssembly(typeof(UnitTests.CatalogViewModelTests).Assembly);
 
             return base.FinishedLaunching(app, options);
         }