throwing exception for bad open/closed registration issue #216

ipjohnson · Apr 23, 2019 · aa61d7a · aa61d7a
1 parent 5218810
commit aa61d7a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/src/Grace/DependencyInjection/Impl/FluentExportStrategyConfiguration.cs b/src/Grace/DependencyInjection/Impl/FluentExportStrategyConfiguration.cs
@@ -43,11 +43,17 @@ public FluentExportStrategyConfiguration(IConfigurableActivationStrategy exportC
  /// Export as a specific type
  /// </summary>
  /// <param name="type">type to export as</param>
- /// <returns>configuraiton object</returns>
+ /// <returns>configuration object</returns>
  public IFluentExportStrategyConfiguration As(Type type)
  {
  if (type == null) throw new ArgumentNullException(nameof(type));
 
+ if (type.GetTypeInfo().IsGenericTypeDefinition &&
+ !_exportConfiguration.ActivationType.GetTypeInfo().IsGenericTypeDefinition)
+ {
+ throw new ArgumentException("Exported type is not open generic but As type is open");
+ }
+
  _exportConfiguration.AddExportAs(type);
 
  return this;
@@ -64,6 +70,12 @@ public IFluentExportStrategyConfiguration AsKeyed(Type type, object key)
  if (type == null) throw new ArgumentNullException(nameof(type));
  if (key == null) throw new ArgumentNullException(nameof(key));
 
+ if (type.GetTypeInfo().IsGenericTypeDefinition &&
+ !_exportConfiguration.ActivationType.GetTypeInfo().IsGenericTypeDefinition)
+ {
+ throw new ArgumentException("Exported type is not open generic but As type is open");
+ }
+
  _exportConfiguration.AddExportAsKeyed(type, key);
 
  return this;

diff --git a/tests/Grace.Tests/DependencyInjection/Registration/FluentExportStrategyConfigurationTests.cs b/tests/Grace.Tests/DependencyInjection/Registration/FluentExportStrategyConfigurationTests.cs
@@ -143,6 +143,22 @@ public void FluentExportStrategyConfiguration_With_Metadata()
  Assert.Equal("Value", metadata.Metadata["Data"]);
  }
 
+ [Fact]
+ public void FluentExportStrategyConfiguration_As_Throws_Exception_Open_Closed()
+ {
+ var container = new DependencyInjectionContainer();
+
+ Assert.Throws<ArgumentException>(() => container.Configure(c => c.Export(typeof(DependentService<IBasicService>)).As(typeof(IDependentService<>))));
+ }
+
+
+ [Fact]
+ public void FluentExportStrategyConfiguration_AsKeyed_Throws_Exception_Open_Closed()
+ {
+ var container = new DependencyInjectionContainer();
+
+ Assert.Throws<ArgumentException>(() => container.Configure(c => c.Export(typeof(DependentService<IBasicService>)).AsKeyed(typeof(IDependentService<>), 1)));
+ }
  #endregion
 
  #region ImportAttribute tests
@@ -164,7 +180,7 @@ public void ImportAttribute_Honored_On_Constructor()
  Assert.NotNull(classA);
  Assert.NotNull(classA.BasicService);
  Assert.Equal(10, classA.BasicService.Count);
- 
+
  var classB = container.Locate<ImportClassB>();
 
  Assert.NotNull(classB);