huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reacting to DependencyInjection changes

This commit is contained in:
Pranav K 2015-11-13 10:30:54 -08:00
parent 4c97cbb9b2
commit d09551af46
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.DataProtection.SystemWeb/DataProtectionStartup.cs
View File

@ -60,7 +60,7 @@ namespace Microsoft.AspNet.DataProtection.SystemWeb
// Configure the default implementation, passing in our custom discriminator // Configure the default implementation, passing in our custom discriminator
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddDataProtection(); services.AddDataProtection();
services.AddInstance<IApplicationDiscriminator>(new SystemWebApplicationDiscriminator()); services.AddSingleton<IApplicationDiscriminator>(new SystemWebApplicationDiscriminator());
// Run user-specified configuration and get an instance of the provider // Run user-specified configuration and get an instance of the provider
ConfigureServices(services); ConfigureServices(services);

2
src/Microsoft.AspNet.DataProtection/DataProtectionConfiguration.cs
View File

@ -79,7 +79,7 @@ namespace Microsoft.AspNet.DataProtection
throw new ArgumentNullException(nameof(sink)); throw new ArgumentNullException(nameof(sink));
} }
Services.AddInstance<IKeyEscrowSink>(sink); Services.AddSingleton<IKeyEscrowSink>(sink);
return this; return this;
} }

2
test/Microsoft.AspNet.DataProtection.Test/ActivatorTests.cs
View File

@ -72,7 +72,7 @@ namespace Microsoft.AspNet.DataProtection
// Arrange // Arrange
var expectedActivator = new Mock<IActivator>().Object; var expectedActivator = new Mock<IActivator>().Object;
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IActivator>(expectedActivator); serviceCollection.AddSingleton<IActivator>(expectedActivator);
// Act // Act
var actualActivator = serviceCollection.BuildServiceProvider().GetActivator(); var actualActivator = serviceCollection.BuildServiceProvider().GetActivator();

6
test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyEscrowServiceProviderExtensionsTests.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
}); });
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IKeyEscrowSink>(mockKeyEscrowSink.Object); serviceCollection.AddSingleton<IKeyEscrowSink>(mockKeyEscrowSink.Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
// Act // Act
@ -75,8 +75,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
}); });
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IKeyEscrowSink>(mockKeyEscrowSink1.Object); serviceCollection.AddSingleton<IKeyEscrowSink>(mockKeyEscrowSink1.Object);
serviceCollection.AddInstance<IKeyEscrowSink>(mockKeyEscrowSink2.Object); serviceCollection.AddSingleton<IKeyEscrowSink>(mockKeyEscrowSink2.Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
// Act // Act

4
test/Microsoft.AspNet.DataProtection.Test/KeyManagement/KeyRingProviderTests.cs
View File

@ -588,7 +588,7 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
private static KeyRingProvider CreateKeyRingProvider(ICacheableKeyRingProvider cacheableKeyRingProvider) private static KeyRingProvider CreateKeyRingProvider(ICacheableKeyRingProvider cacheableKeyRingProvider)
{ {
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<ICacheableKeyRingProvider>(cacheableKeyRingProvider); serviceCollection.AddSingleton<ICacheableKeyRingProvider>(cacheableKeyRingProvider);
return new KeyRingProvider( return new KeyRingProvider(
keyManager: null, keyManager: null,
keyManagementOptions: null, keyManagementOptions: null,
@ -598,7 +598,7 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
private static ICacheableKeyRingProvider CreateKeyRingProvider(IKeyManager keyManager, IDefaultKeyResolver defaultKeyResolver, KeyManagementOptions keyManagementOptions= null) private static ICacheableKeyRingProvider CreateKeyRingProvider(IKeyManager keyManager, IDefaultKeyResolver defaultKeyResolver, KeyManagementOptions keyManagementOptions= null)
{ {
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IDefaultKeyResolver>(defaultKeyResolver); serviceCollection.AddSingleton<IDefaultKeyResolver>(defaultKeyResolver);
return new KeyRingProvider( return new KeyRingProvider(
keyManager: keyManager, keyManager: keyManager,
keyManagementOptions: keyManagementOptions, keyManagementOptions: keyManagementOptions,

48
test/Microsoft.AspNet.DataProtection.Test/KeyManagement/XmlKeyManagerTests.cs
View File

@ -37,8 +37,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
mockFallback.Setup(o => o.GetKeyRepository()).Returns(expectedRepository); mockFallback.Setup(o => o.GetKeyRepository()).Returns(expectedRepository);
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IDefaultKeyServices>(mockFallback.Object); serviceCollection.AddSingleton<IDefaultKeyServices>(mockFallback.Object);
serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object); serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
// Act // Act
@ -58,9 +58,9 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
mockFallback.Setup(o => o.GetKeyRepository()).Returns(new Mock<IXmlRepository>().Object); mockFallback.Setup(o => o.GetKeyRepository()).Returns(new Mock<IXmlRepository>().Object);
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IDefaultKeyServices>(mockFallback.Object); serviceCollection.AddSingleton<IDefaultKeyServices>(mockFallback.Object);
serviceCollection.AddInstance<IXmlEncryptor>(new Mock<IXmlEncryptor>().Object); serviceCollection.AddSingleton<IXmlEncryptor>(new Mock<IXmlEncryptor>().Object);
serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object); serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
// Act & assert - we don't care about exception type, only exception message // Act & assert - we don't care about exception type, only exception message
@ -97,8 +97,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
// Arrange - services // Arrange - services
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object); serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(mockConfiguration.Object); serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(mockConfiguration.Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var keyManager = new XmlKeyManager(services); var keyManager = new XmlKeyManager(services);
@ -188,9 +188,9 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
// Arrange - services // Arrange - services
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object); serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(mockConfiguration.Object); serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(mockConfiguration.Object);
serviceCollection.AddInstance<IKeyEscrowSink>(mockKeyEscrow.Object); serviceCollection.AddSingleton<IKeyEscrowSink>(mockKeyEscrow.Object);
serviceCollection.AddSingleton<IXmlEncryptor, NullXmlEncryptor>(); serviceCollection.AddSingleton<IXmlEncryptor, NullXmlEncryptor>();
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var keyManager = new XmlKeyManager(services); var keyManager = new XmlKeyManager(services);
@ -288,9 +288,9 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
// Arrange - services // Arrange - services
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IXmlRepository>(new Mock<IXmlRepository>().Object); serviceCollection.AddSingleton<IXmlRepository>(new Mock<IXmlRepository>().Object);
serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object); serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
serviceCollection.AddInstance<IInternalXmlKeyManager>(mockInternalKeyManager.Object); serviceCollection.AddSingleton<IInternalXmlKeyManager>(mockInternalKeyManager.Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var keyManager = new XmlKeyManager(services); var keyManager = new XmlKeyManager(services);
@ -584,12 +584,12 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
// Arrange - services // Arrange - services
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object); serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
serviceCollection.AddInstance<IActivator>(activator); serviceCollection.AddSingleton<IActivator>(activator);
serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object); serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
if (loggerFactory != null) if (loggerFactory != null)
{ {
serviceCollection.AddInstance<ILoggerFactory>(loggerFactory); serviceCollection.AddSingleton<ILoggerFactory>(loggerFactory);
} }
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var keyManager = new XmlKeyManager(services); var keyManager = new XmlKeyManager(services);
@ -615,8 +615,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
// Arrange - services // Arrange - services
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object); serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object); serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var keyManager = new XmlKeyManager(services); var keyManager = new XmlKeyManager(services);
@ -664,8 +664,8 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
// Arrange - services // Arrange - services
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IXmlRepository>(mockXmlRepository.Object); serviceCollection.AddSingleton<IXmlRepository>(mockXmlRepository.Object);
serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object); serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var keyManager = new XmlKeyManager(services); var keyManager = new XmlKeyManager(services);
@ -716,9 +716,9 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
// Arrange - services // Arrange - services
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IXmlRepository>(new Mock<IXmlRepository>().Object); serviceCollection.AddSingleton<IXmlRepository>(new Mock<IXmlRepository>().Object);
serviceCollection.AddInstance<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object); serviceCollection.AddSingleton<IAuthenticatedEncryptorConfiguration>(new Mock<IAuthenticatedEncryptorConfiguration>().Object);
serviceCollection.AddInstance<IInternalXmlKeyManager>(mockInternalKeyManager.Object); serviceCollection.AddSingleton<IInternalXmlKeyManager>(mockInternalKeyManager.Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var keyManager = new XmlKeyManager(services); var keyManager = new XmlKeyManager(services);

4
test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/CertificateXmlEncryptionTests.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption
encryptedXml.AddKeyNameMapping("theKey", symmetricAlgorithm); // use symmetric encryption encryptedXml.AddKeyNameMapping("theKey", symmetricAlgorithm); // use symmetric encryption
return encryptedXml.Encrypt(element, "theKey"); return encryptedXml.Encrypt(element, "theKey");
}); });
serviceCollection.AddInstance<IInternalCertificateXmlEncryptor>(mockInternalEncryptor.Object); serviceCollection.AddSingleton<IInternalCertificateXmlEncryptor>(mockInternalEncryptor.Object);
var mockInternalDecryptor = new Mock<IInternalEncryptedXmlDecryptor>(); var mockInternalDecryptor = new Mock<IInternalEncryptedXmlDecryptor>();
mockInternalDecryptor.Setup(o => o.PerformPreDecryptionSetup(It.IsAny<EncryptedXml>())) mockInternalDecryptor.Setup(o => o.PerformPreDecryptionSetup(It.IsAny<EncryptedXml>()))
@ -37,7 +37,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption
{ {
encryptedXml.AddKeyNameMapping("theKey", symmetricAlgorithm); // use symmetric encryption encryptedXml.AddKeyNameMapping("theKey", symmetricAlgorithm); // use symmetric encryption
}); });
serviceCollection.AddInstance<IInternalEncryptedXmlDecryptor>(mockInternalDecryptor.Object); serviceCollection.AddSingleton<IInternalEncryptedXmlDecryptor>(mockInternalDecryptor.Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var encryptor = new CertificateXmlEncryptor(services); var encryptor = new CertificateXmlEncryptor(services);

4
test/Microsoft.AspNet.DataProtection.Test/XmlEncryption/XmlEncryptionExtensionsTests.cs
View File

@ -39,7 +39,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption
mockActivator.ReturnDecryptedElementGivenDecryptorTypeNameAndInput("theDecryptor", "<node />", "<newNode />"); mockActivator.ReturnDecryptedElementGivenDecryptorTypeNameAndInput("theDecryptor", "<node />", "<newNode />");
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IActivator>(mockActivator.Object); serviceCollection.AddSingleton<IActivator>(mockActivator.Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var activator = services.GetActivator(); var activator = services.GetActivator();
@ -89,7 +89,7 @@ namespace Microsoft.AspNet.DataProtection.XmlEncryption
mockActivator.Setup(o => o.CreateInstance(typeof(IXmlDecryptor), "myDecryptor")).Returns(mockDecryptor.Object); mockActivator.Setup(o => o.CreateInstance(typeof(IXmlDecryptor), "myDecryptor")).Returns(mockDecryptor.Object);
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IActivator>(mockActivator.Object); serviceCollection.AddSingleton<IActivator>(mockActivator.Object);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var activator = services.GetActivator(); var activator = services.GetActivator();