From 4eb92e63ec042bd0c202b35457dfce58bb3c054f Mon Sep 17 00:00:00 2001
From: Suha Can <Suha.Can@microsoft.com>
Date: Mon, 26 Apr 2010 16:21:06 -0700
Subject: [PATCH] - IExtensionManager refactoring: LoadFeature is obsoleted and
 internal in favor of LoadFeatures. - Related changes to callers.

--HG--
branch : dev
---
 .../Environment/DefaultOrchardHostTests.cs       |  4 ----
 .../Extensions/ExtensionManagerTests.cs          | 16 ++++++++++------
 .../StandardExtensionRouteProviderTests.cs       |  9 ---------
 .../Environment/Extensions/ExtensionManager.cs   |  2 +-
 .../Environment/Extensions/IExtensionManager.cs  |  1 -
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
index 44d183c15..f85ed9f31 100644
--- a/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
+++ b/src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
@@ -105,10 +105,6 @@ namespace Orchard.Tests.Environment {
                 }
             }
 
-            public Feature LoadFeature(FeatureDescriptor featureDescriptor) {
-                throw new NotImplementedException();
-            }
-
             public IEnumerable<ExtensionEntry> ActiveExtensions_Obsolete() {
                 throw new NotImplementedException();
             }
diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
index bdfdc8356..0e5026b09 100644
--- a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
+++ b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
@@ -256,7 +256,7 @@ features:
         [Test]
         public void ExtensionManagerShouldThrowIfFeatureDoesNotExist() {
             var featureDescriptor = new FeatureDescriptor { Name = "NoSuchFeature" };
-            Assert.Throws<ArgumentException>(() => _manager.LoadFeature(featureDescriptor));
+            Assert.Throws<ArgumentException>(() => _manager.LoadFeatures(new [] { featureDescriptor }));
         }
 
         [Test]
@@ -302,8 +302,10 @@ features:
                 .SelectMany(x => x.Features)
                 .Single(x => x.Name == "TestFeature");
 
-            foreach (var type in extensionManager.LoadFeature(testFeature).ExportedTypes) {
-                Assert.That(type == typeof(Phi));
+            foreach (var feature in extensionManager.LoadFeatures(new[] { testFeature })) {
+                foreach (var type in feature.ExportedTypes) {
+                    Assert.That(type == typeof(Phi));
+                }
             }
         }
 
@@ -328,9 +330,11 @@ features:
                 .SelectMany(x => x.Features)
                 .Single(x => x.Name == "TestModule");
 
-            foreach (var type in extensionManager.LoadFeature(testModule).ExportedTypes) {
-                Assert.That(type != typeof(Phi));
-                Assert.That((type == typeof(Alpha) || (type == typeof(Beta))));
+            foreach (var feature in extensionManager.LoadFeatures(new [] { testModule })) {
+                foreach (var type in feature.ExportedTypes) {
+                    Assert.That(type != typeof(Phi));
+                    Assert.That((type == typeof(Alpha) || (type == typeof(Beta))));
+                }
             }
         }
 
diff --git a/src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs b/src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs
index bb67e703b..b272e06e6 100644
--- a/src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs
+++ b/src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs
@@ -68,10 +68,6 @@ namespace Orchard.Tests.Mvc.Routes {
                 throw new NotImplementedException();
             }
 
-            public Feature LoadFeature(FeatureDescriptor featureDescriptor) {
-                throw new NotImplementedException();
-            }
-
             public IEnumerable<ExtensionEntry> ActiveExtensions_Obsolete() {
                 yield return new ExtensionEntry {
                     Descriptor = new ExtensionDescriptor {
@@ -87,11 +83,6 @@ namespace Orchard.Tests.Mvc.Routes {
                 };
             }
 
-            public Feature LoadFeature(string featureName) {
-                throw new NotImplementedException();
-            }
-
-
             public void InstallExtension(string extensionType, HttpPostedFileBase extensionBundle) {
                 throw new NotImplementedException();
             }
diff --git a/src/Orchard/Environment/Extensions/ExtensionManager.cs b/src/Orchard/Environment/Extensions/ExtensionManager.cs
index 697116307..fdf3edeaa 100644
--- a/src/Orchard/Environment/Extensions/ExtensionManager.cs
+++ b/src/Orchard/Environment/Extensions/ExtensionManager.cs
@@ -119,7 +119,7 @@ namespace Orchard.Environment.Extensions {
             return featureDescriptors;
         }
 
-        public Feature LoadFeature(FeatureDescriptor featureDescriptor) {
+        private Feature LoadFeature(FeatureDescriptor featureDescriptor) {
             var featureName = featureDescriptor.Name;
             string extensionName = GetExtensionForFeature(featureName);
             if (extensionName == null) throw new ArgumentException(T("Feature ") + featureName + T(" was not found in any of the installed extensions"));
diff --git a/src/Orchard/Environment/Extensions/IExtensionManager.cs b/src/Orchard/Environment/Extensions/IExtensionManager.cs
index feb59ebc1..e982c69d6 100644
--- a/src/Orchard/Environment/Extensions/IExtensionManager.cs
+++ b/src/Orchard/Environment/Extensions/IExtensionManager.cs
@@ -6,7 +6,6 @@ namespace Orchard.Environment.Extensions {
     public interface IExtensionManager {
         IEnumerable<ExtensionDescriptor> AvailableExtensions();
         IEnumerable<Feature> LoadFeatures(IEnumerable<FeatureDescriptor> featureDescriptors);
-        Feature LoadFeature(FeatureDescriptor featureDescriptor);
 
         IEnumerable<ExtensionEntry> ActiveExtensions_Obsolete();
         void InstallExtension(string extensionType, HttpPostedFileBase extensionBundle);