Adjustments to test configurations for movement of features.

Ed-Fi-Alliance-OSS · Jan 7, 2025 · db5b32a · db5b32a
1 parent d087e16
commit db5b32a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 92 deletions.
diff --git a/Application/EdFi.Ods.Repositories.NHibernate.Tests/BaseDatabaseTest.cs b/Application/EdFi.Ods.Repositories.NHibernate.Tests/BaseDatabaseTest.cs
@@ -16,6 +16,7 @@
 using EdFi.Ods.Common.Security.Claims;
 using EdFi.Ods.Repositories.NHibernate.Tests.Modules;
 using Microsoft.Extensions.Configuration;
+using Microsoft.FeatureManagement;
 using NHibernate;
 using NHibernate.Cfg;
 using NUnit.Framework;
@@ -50,8 +51,11 @@ private void RegisterDependencies()
             {
                 Engine = OneTimeGlobalDatabaseSetup.Instance.DatabaseEngine.Value,
             };
-            builder.RegisterInstance(apiSettings).As<ApiSettings>()
-                .SingleInstance();
+
+            var fakeFeatureManager = new FakeFeatureManager();
+
+            builder.RegisterInstance(apiSettings).As<ApiSettings>().SingleInstance();
+            builder.RegisterInstance(fakeFeatureManager).As<IFeatureManager>().SingleInstance();
 
             builder.Register(c => apiSettings.GetDatabaseEngine()).As<DatabaseEngine>();
 
@@ -66,8 +70,8 @@ private void RegisterDependencies()
             builder.RegisterModule(new ContextStorageModule());
             builder.RegisterModule(new ContextProviderModule());
             builder.RegisterModule(new DbConnnectionStringBuilderAdapterFactoryModule());
-            builder.RegisterModule(new SqlServerSpecificModule(new FakeFeatureManager(), apiSettings.GetDatabaseEngine()));
-            builder.RegisterModule(new PostgresSpecificModule(new FakeFeatureManager(), apiSettings.GetDatabaseEngine()));
+            builder.RegisterModule(new SqlServerSpecificModule(fakeFeatureManager, apiSettings.GetDatabaseEngine()));
+            builder.RegisterModule(new PostgresSpecificModule(fakeFeatureManager, apiSettings.GetDatabaseEngine()));
 
             builder.RegisterType<AuthorizationContextProvider>()
                 .As<IAuthorizationContextProvider>()

diff --git a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/appsettings.json b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/appsettings.json
@@ -13,54 +13,24 @@
     "EdFi_Ods": "Server=(local); Database=EdFi_Ods_Populated_Template_Test; Trusted_Connection=True; Application Name=EdFi.Ods.WebApi.CompositeSpecFlowTests;",
     "EdFi_Master": "Server=(local); Database=master; Trusted_Connection=True; Application Name=EdFi.Ods.WebApi.CompositeSpecFlowTests;"
   },
+  "FeatureManagement": {
+    "Extensions": false,
+    "Profiles": false,
+    "ChangeQueries": false,
+    "OpenApiMetadata": true,
+    "Composites": true,
+    "IdentityManagement": false,
+    "OwnershipBasedAuthorization": false,
+    "UniqueIdValidation": false,
+    "AggregateDependencies": true,
+    "TokenInfo": true
+  },
   "ApiSettings": {
     "Mode": "Sandbox",
     "Engine": "SQLServer",
     "EncryptSecrets": false,
     "UseReverseProxyHeaders": false,
     "Years": [],
-    "Features": [
-      {
-        "Name": "Extensions",
-        "IsEnabled": false
-      },
-      {
-        "Name": "Profiles",
-        "IsEnabled": false
-      },
-      {
-        "Name": "ChangeQueries",
-        "IsEnabled": false
-      },
-      {
-        "Name": "OpenApiMetadata",
-        "IsEnabled": true
-      },
-      {
-        "Name": "Composites",
-        "IsEnabled": true
-      },
-      {
-        "Name": "IdentityManagement",
-        "IsEnabled": false
-      },
-      {
-        "Name": "OwnershipBasedAuthorization",
-        "IsEnabled": false
-      },
-      {
-        "Name": "UniqueIdValidation",
-        "IsEnabled": false
-      },
-      {
-        "Name": "AggregateDependencies",
-        "IsEnabled": true
-      },
-      {
-        "Name": "TokenInfo",
-        "IsEnabled": true
-      }
-    ],
     "ExcludedExtensions": [
     ]
   },

diff --git a/tests/EdFi.Ods.WebApi.IntegrationTests/appsettings.json b/tests/EdFi.Ods.WebApi.IntegrationTests/appsettings.json
@@ -12,57 +12,24 @@
     "EdFi_Security": "Server=(local); Database=EdFi_Security_Test; Trusted_Connection=True; Persist Security Info=True; Application Name=EdFi.Ods.WebApi.IntegrationTests;",
     "EdFi_Master": "Server=(local); Database=master; Trusted_Connection=True; Application Name=EdFi.Ods.WebApi.IntegrationTests;"
   },
+  "FeatureManagement": {
+    "Extensions": false,
+    "Profiles": false,
+    "ChangeQueries": false,
+    "OpenApiMetadata": true,
+    "Composites": true,
+    "IdentityManagement": true,
+    "OwnershipBasedAuthorization": false,
+    "UniqueIdValidation": false,
+    "AggregateDependencies": true,
+    "TokenInfo": true,
+    "XsdMetadata": true    
+  },
   "ApiSettings": {
     "Engine": "SQLServer",
     "EncryptSecrets": false,
     "UseReverseProxyHeaders": false,
     "Years": [],
-    "Features": [
-      {
-        "Name": "Extensions",
-        "IsEnabled": false
-      },
-      {
-        "Name": "Profiles",
-        "IsEnabled": false
-      },
-      {
-        "Name": "ChangeQueries",
-        "IsEnabled": false
-      },
-      {
-        "Name": "OpenApiMetadata",
-        "IsEnabled": true
-      },
-      {
-        "Name": "Composites",
-        "IsEnabled": true
-      },
-      {
-        "Name": "IdentityManagement",
-        "IsEnabled": true
-      },
-      {
-        "Name": "OwnershipBasedAuthorization",
-        "IsEnabled": false
-      },
-      {
-        "Name": "UniqueIdValidation",
-        "IsEnabled": false
-      },
-      {
-        "Name": "AggregateDependencies",
-        "IsEnabled": true
-      },
-      {
-        "Name": "TokenInfo",
-        "IsEnabled": true
-      },
-      {
-        "Name": "XsdMetadata",
-        "IsEnabled": true
-      }
-    ],
     "ExcludedExtensions": [
     ]
   },