#483 ninject now tryget service (#485)

reactiveui · Mar 29, 2020 · 63452b4 · 63452b4 · Micha-kun · Mar 30, 2020
1 parent 232b0c4
commit 63452b4
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/src/Splat.Ninject.Tests/DependencyResolverTests.cs b/src/Splat.Ninject.Tests/DependencyResolverTests.cs
@@ -38,6 +38,34 @@ public void NinjectDependencyResolver_Should_Resolve_Views()
             viewTwo.ShouldBeOfType<ViewTwo>();
         }
 
+        /// <summary>
+        /// Should resolve views.
+        /// </summary>
+        [Fact]
+        public void NinjectDependencyResolver_Should_Return_Null()
+        {
+            var container = new StandardKernel();
+            container.UseNinjectDependencyResolver();
+
+            var viewOne = Locator.Current.GetService(typeof(IViewFor<ViewModelOne>));
+
+            viewOne.ShouldBeNull();
+        }
+
+        /// <summary>
+        /// Should resolve views.
+        /// </summary>
+        [Fact]
+        public void NinjectDependencyResolver_GetServices_Should_Return_Empty_Collection()
+        {
+            var container = new StandardKernel();
+            container.UseNinjectDependencyResolver();
+
+            var viewOne = Locator.Current.GetServices(typeof(IViewFor<ViewModelOne>));
+
+            viewOne.ShouldBeEmpty();
+        }
+
         /// <summary>
         /// Should resolve views.
         /// </summary>
@@ -120,10 +148,8 @@ public void NinjectDependencyResolver_Should_UnregisterAll()
 
             Locator.CurrentMutable.UnregisterAll(typeof(IScreen));
 
-            var result = Record.Exception(() => Locator.Current.GetService<IScreen>());
-
-            result.ShouldBeOfType<ActivationException>();
-            result.Message.ShouldStartWith("Error activating IScreen");
+            var result = Locator.Current.GetService<IScreen>();
+            result.ShouldBeNull();
         }
 
         /// <summary>

diff --git a/src/Splat.Ninject/NinjectDependencyResolver.cs b/src/Splat.Ninject/NinjectDependencyResolver.cs
@@ -29,8 +29,8 @@ public NinjectDependencyResolver(IKernel kernel)
         /// <inheritdoc />
         public virtual object GetService(Type serviceType, string contract = null) =>
             string.IsNullOrEmpty(contract)
-                ? _kernel.Get(serviceType)
-                : _kernel.Get(serviceType, contract);
+                ? _kernel.TryGet(serviceType)
+                : _kernel.TryGet(serviceType, contract);
 
         /// <inheritdoc />
         public virtual IEnumerable<object> GetServices(Type serviceType, string contract = null) =>