Closes #5

Author: ENikS

tests/GitHubIssuesFixture.cs

@@ -0,0 +1,28 @@
+using CommonServiceLocator;
+using Microsoft.Practices.Unity.ServiceLocation.Tests.Components;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Unity;
+using Unity.Lifetime;
+using Unity.ServiceLocation;
+
+namespace ServiceLocation.Tests
+{
+    [TestClass]
+    public class GitHubIssuesFixture
+    {
+        [TestMethod]
+        public void Issue_5()
+        {
+            var container = new UnityContainer();
+            container.RegisterType<SimpleLogger>(new ContainerControlledLifetimeManager());
+            
+            var locator = new UnityServiceLocator(container);
+            ServiceLocator.SetLocatorProvider(() => locator);
+            
+            var logger = ServiceLocator.Current.GetInstance<SimpleLogger>();
+
+            Assert.IsNotNull(logger);
+            Assert.IsInstanceOfType(logger, typeof(SimpleLogger));
+        }
+    }
+}

tests/ServiceLocatorFixture.cs

@@ -1,11 +1,9 @@
-
-
+using CommonServiceLocator;
+using Microsoft.Practices.Unity.ServiceLocation.Tests.Components;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using CommonServiceLocator;
-using Microsoft.Practices.Unity.ServiceLocation.Tests.Components;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Unity.ServiceLocation.Tests
 {

tests/UnityServiceLocatorAdapterFixture.cs

@@ -1,10 +1,7 @@
-
-
-using System;
-using CommonServiceLocator;
-using Microsoft.Practices.Unity;
+using CommonServiceLocator;
 using Microsoft.Practices.Unity.ServiceLocation.Tests.Components;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
 
 namespace Unity.ServiceLocation.Tests
 {