Fixed tests
This commit is contained in:
Родитель
c4ce8cb8f3
Коммит
91ba1f234f
|
@ -1,14 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
<namespace name="Microsoft.Practices.Unity.TestSupport" />
|
||||
<namespace name="Microsoft.Practices.Unity.Configuration.Tests.TestObjects" />
|
||||
<assembly name="Unity.TestSupport" />
|
||||
<assembly name="Unity.Configuration.Tests" />
|
||||
<assembly name="Configuration.Tests" />
|
||||
|
||||
<container>
|
||||
<instance type="string" name="first" value="first" />
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity xmlns="http://schemas.microsoft.com/practices/2010/unity">
|
||||
<namespace name="Microsoft.Practices.Unity.TestSupport" />
|
||||
<assembly name="Unity.TestSupport" />
|
||||
<assembly name="Configuration.Tests" />
|
||||
|
||||
<container>
|
||||
<register type="ILogger" mapTo="MockLogger" />
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration" />
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration" />
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
<namespace name="Microsoft.Practices.Unity.TestSupport" />
|
||||
<assembly name="Unity.TestSupport" />
|
||||
<assembly name="Configuration.Tests" />
|
||||
|
||||
<container>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity />
|
||||
|
|
|
@ -3,14 +3,14 @@
|
|||
<configSections>
|
||||
<section name="unity"
|
||||
type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,
|
||||
Microsoft.Practices.Unity.Configuration" />
|
||||
Unity.Configuration" />
|
||||
</configSections>
|
||||
|
||||
<unity xmlns="http://schemas.microsoft.com/practices/2010/unity">
|
||||
|
||||
<namespace name="Microsoft.Practices.Unity.Configuration.Tests.TestObjects.MyGenericTypes" />
|
||||
<namespace name="Microsoft.Practices.Unity.Configuration.Tests.TestObjects" />
|
||||
<assembly name="Unity.Configuration.Tests" />
|
||||
<assembly name="Configuration.Tests" />
|
||||
|
||||
<container name="container1">
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
<namespace name="Microsoft.Practices.Unity.Configuration.Tests.TestObjects" />
|
||||
<assembly name="Unity.Configuration.Tests" />
|
||||
<assembly name="Configuration.Tests" />
|
||||
|
||||
<container>
|
||||
<instance type="string" value="a string" />
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
<aliases>
|
||||
<add alias="ILogger" type="Microsoft.Practices.Unity.TestSupport.ILogger, Unity.TestSupport" />
|
||||
<add alias="SpecialLogger" type="Microsoft.Practices.Unity.TestSupport.SpecialLogger, Unity.TestSupport" />
|
||||
<add alias="ObjectWithTwoProperties" type="Microsoft.Practices.Unity.TestSupport.ObjectWithTwoProperties, Unity.TestSupport" />
|
||||
<add alias="SpecialLogger" type="Microsoft.Practices.Unity.TestSupport.SpecialLogger, Unity.TestSupport" />
|
||||
<add alias="ILogger" type="Microsoft.Practices.Unity.TestSupport.ILogger, Configuration.Tests" />
|
||||
<add alias="SpecialLogger" type="Microsoft.Practices.Unity.TestSupport.SpecialLogger, Configuration.Tests" />
|
||||
<add alias="ObjectWithTwoProperties" type="Microsoft.Practices.Unity.TestSupport.ObjectWithTwoProperties, Configuration.Tests" />
|
||||
<add alias="SpecialLogger" type="Microsoft.Practices.Unity.TestSupport.SpecialLogger, Configuration.Tests" />
|
||||
</aliases>
|
||||
|
||||
<container>
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration" />
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration" />
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
<aliases>
|
||||
<add alias="session" type="Microsoft.Practices.Unity.TestSupport.SessionLifetimeManager, Unity.TestSupport" />
|
||||
<add alias="ILogger" type="Microsoft.Practices.Unity.TestSupport.ILogger, Unity.TestSupport" />
|
||||
<add alias="MockLogger" type="Microsoft.Practices.Unity.TestSupport.MockLogger, Unity.TestSupport" />
|
||||
<add alias="SpecialLogger" type="Microsoft.Practices.Unity.TestSupport.SpecialLogger, Unity.TestSupport" />
|
||||
<add alias="reversed" type="Microsoft.Practices.Unity.TestSupport.ReversedSessionKeyTypeConverter, Unity.TestSupport" />
|
||||
<add alias="session" type="Microsoft.Practices.Unity.TestSupport.SessionLifetimeManager, Configuration.Tests" />
|
||||
<add alias="ILogger" type="Microsoft.Practices.Unity.TestSupport.ILogger, Configuration.Tests" />
|
||||
<add alias="MockLogger" type="Microsoft.Practices.Unity.TestSupport.MockLogger, Configuration.Tests" />
|
||||
<add alias="SpecialLogger" type="Microsoft.Practices.Unity.TestSupport.SpecialLogger, Configuration.Tests" />
|
||||
<add alias="reversed" type="Microsoft.Practices.Unity.TestSupport.ReversedSessionKeyTypeConverter, Configuration.Tests" />
|
||||
</aliases>
|
||||
<container>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
|
@ -9,10 +9,10 @@
|
|||
<add alias="object" type="System.Object, mscorlib" />
|
||||
<add alias="int" type="System.Int32, mscorlib" />
|
||||
<add alias="string" type="System.String, mscorlib" />
|
||||
<add alias="ILogger" type="Microsoft.Practices.Unity.TestSupport.ILogger, Unity.TestSupport" />
|
||||
<add alias="MockLogger" type="Microsoft.Practices.Unity.TestSupport.MockLogger, Unity.TestSupport" />
|
||||
<add alias="ObjectWithInjectionMethod" type="Microsoft.Practices.Unity.TestSupport.ObjectWithInjectionMethod, Unity.TestSupport" />
|
||||
<add alias="ObjectWithOverloads" type="Microsoft.Practices.Unity.Configuration.Tests.TestObjects.ObjectWithOverloads, Unity.Configuration.Tests" />
|
||||
<add alias="ILogger" type="Microsoft.Practices.Unity.TestSupport.ILogger, Configuration.Tests" />
|
||||
<add alias="MockLogger" type="Microsoft.Practices.Unity.TestSupport.MockLogger, Configuration.Tests" />
|
||||
<add alias="ObjectWithInjectionMethod" type="Microsoft.Practices.Unity.TestSupport.ObjectWithInjectionMethod, Configuration.Tests" />
|
||||
<add alias="ObjectWithOverloads" type="Microsoft.Practices.Unity.Configuration.Tests.TestObjects.ObjectWithOverloads, Configuration.Tests" />
|
||||
</aliases>
|
||||
|
||||
<container>
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
<typeAliases>
|
||||
<typeAlias alias="string" type="System.String, mscorlib" />
|
||||
<typeAlias alias="int" type="System.Int32, mscorlib" />
|
||||
<typeAlias alias="ILogger" type="Microsoft.Practices.Unity.TestSupport.ILogger, Unity.TestSupport" />
|
||||
<typeAlias alias="MockLogger" type="Microsoft.Practices.Unity.TestSupport.MockLogger, Unity.TestSupport" />
|
||||
<typeAlias alias="SpecialLogger" type="Microsoft.Practices.Unity.TestSupport.SpecialLogger, Unity.TestSupport" />
|
||||
<typeAlias alias="DependentConstructor" type="Microsoft.Practices.Unity.TestSupport.ObjectWithOneConstructorDependency, Unity.TestSupport" />
|
||||
<typeAlias alias="TwoConstructorArgs" type="Microsoft.Practices.Unity.TestSupport.ObjectWithTwoConstructorParameters, Unity.TestSupport" />
|
||||
<typeAlias alias="MockDatabase" type="Microsoft.Practices.Unity.TestSupport.MockDatabase, Unity.TestSupport" />
|
||||
<typeAlias alias="ILogger" type="Microsoft.Practices.Unity.TestSupport.ILogger, Configuration.Tests" />
|
||||
<typeAlias alias="MockLogger" type="Microsoft.Practices.Unity.TestSupport.MockLogger, Configuration.Tests" />
|
||||
<typeAlias alias="SpecialLogger" type="Microsoft.Practices.Unity.TestSupport.SpecialLogger, Configuration.Tests" />
|
||||
<typeAlias alias="DependentConstructor" type="Microsoft.Practices.Unity.TestSupport.ObjectWithOneConstructorDependency, Configuration.Tests" />
|
||||
<typeAlias alias="TwoConstructorArgs" type="Microsoft.Practices.Unity.TestSupport.ObjectWithTwoConstructorParameters, Configuration.Tests" />
|
||||
<typeAlias alias="MockDatabase" type="Microsoft.Practices.Unity.TestSupport.MockDatabase, Configuration.Tests" />
|
||||
</typeAliases>
|
||||
|
||||
</unity>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration" />
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration" />
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
<namespace name="Microsoft.Practices.Unity.TestSupport" />
|
||||
<assembly name="Unity.TestSupport" />
|
||||
<assembly name="Configuration.Tests" />
|
||||
|
||||
<container>
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration" />
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration" />
|
||||
</configSections>
|
||||
<unity>
|
||||
<aliases>
|
||||
<add alias="negator" type="Microsoft.Practices.Unity.TestSupport.NegativeTypeConverter, Unity.TestSupport" />
|
||||
<add alias="negator" type="Microsoft.Practices.Unity.TestSupport.NegativeTypeConverter, Configuration.Tests" />
|
||||
<add alias="int" type="System.Int32" />
|
||||
</aliases>
|
||||
<container>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
<alias alias="TestSectionExtension" type="Microsoft.Practices.Unity.Configuration.Tests.TestObjects.TestSectionExtension, Unity.Configuration.Tests" />
|
||||
<alias alias="ObjectTakingScalars" type="Microsoft.Practices.Unity.Configuration.Tests.TestObjects.ObjectTakingScalars, Unity.Configuration.Tests" />
|
||||
<alias alias="TestSectionExtension" type="Microsoft.Practices.Unity.Configuration.Tests.TestObjects.TestSectionExtension, Configuration.Tests" />
|
||||
<alias alias="ObjectTakingScalars" type="Microsoft.Practices.Unity.Configuration.Tests.TestObjects.ObjectTakingScalars, Configuration.Tests" />
|
||||
<sectionExtension type="TestSectionExtension" />
|
||||
<sectionExtension type="TestSectionExtension" prefix="ext2" />
|
||||
<container>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
|
||||
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Unity.Configuration"/>
|
||||
</configSections>
|
||||
|
||||
<unity>
|
||||
<aliases>
|
||||
<add alias="MockDatabase" type="Microsoft.Practices.Unity.TestSupport.MockDatabase, Unity.TestSupport" />
|
||||
<add alias="ObjectTakingScalars" type="Microsoft.Practices.Unity.Configuration.Tests.TestObjects.ObjectTakingScalars, Unity.Configuration.Tests" />
|
||||
<add alias="negator" type="Microsoft.Practices.Unity.TestSupport.NegativeTypeConverter, Unity.TestSupport" />
|
||||
<add alias="MockDatabase" type="Microsoft.Practices.Unity.TestSupport.MockDatabase, Configuration.Tests" />
|
||||
<add alias="ObjectTakingScalars" type="Microsoft.Practices.Unity.Configuration.Tests.TestObjects.ObjectTakingScalars, Configuration.Tests" />
|
||||
<add alias="negator" type="Microsoft.Practices.Unity.TestSupport.NegativeTypeConverter, Configuration.Tests" />
|
||||
</aliases>
|
||||
|
||||
<container name="defaultConstructor">
|
||||
|
|
|
@ -6,6 +6,54 @@
|
|||
<RootNamespace>Microsoft.Practices.Unity.Configuration.Tests</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="ConfigFiles\ArrayInjection.config" />
|
||||
<None Remove="ConfigFiles\BasicTypeMapping.config" />
|
||||
<None Remove="ConfigFiles\Bootstrap.config" />
|
||||
<None Remove="ConfigFiles\ContainerExtensions.config" />
|
||||
<None Remove="ConfigFiles\EmptySection.config" />
|
||||
<None Remove="ConfigFiles\Generics.config" />
|
||||
<None Remove="ConfigFiles\InjectingGenerics.config" />
|
||||
<None Remove="ConfigFiles\InjectingProperties.config" />
|
||||
<None Remove="ConfigFiles\Lifetimes.config" />
|
||||
<None Remove="ConfigFiles\MethodInjection.config" />
|
||||
<None Remove="ConfigFiles\OldAliasesSyntax.config" />
|
||||
<None Remove="ConfigFiles\OldContainersSyntax.config" />
|
||||
<None Remove="ConfigFiles\OldTypeMappingSyntax.config" />
|
||||
<None Remove="ConfigFiles\OptionalDependency.config" />
|
||||
<None Remove="ConfigFiles\RegisteringInstances.config" />
|
||||
<None Remove="ConfigFiles\RegistrationWithConstructors.config" />
|
||||
<None Remove="ConfigFiles\SectionExtensions.config" />
|
||||
<None Remove="ConfigFiles\SingleSectionMultipleNamedContainers.config" />
|
||||
<None Remove="ConfigFiles\SingleSectionSingleContainer.config" />
|
||||
<None Remove="ConfigFiles\TwoContainersAndAliases.config" />
|
||||
<None Remove="ConfigFiles\VariousConstructors.config" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="ConfigFiles\ArrayInjection.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\BasicTypeMapping.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\Bootstrap.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\ContainerExtensions.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\EmptySection.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\Generics.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\InjectingGenerics.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\InjectingProperties.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\Lifetimes.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\MethodInjection.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\OldAliasesSyntax.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\OldContainersSyntax.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\OldTypeMappingSyntax.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\OptionalDependency.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\RegisteringInstances.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\RegistrationWithConstructors.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\SectionExtensions.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\SingleSectionMultipleNamedContainers.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\SingleSectionSingleContainer.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\TwoContainersAndAliases.config" />
|
||||
<EmbeddedResource Include="ConfigFiles\VariousConstructors.config" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
|
||||
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
|
||||
|
@ -21,4 +69,8 @@
|
|||
<Reference Include="System.Configuration" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -4,6 +4,7 @@ using System;
|
|||
using System.Configuration;
|
||||
using System.IO;
|
||||
using Microsoft.Practices.ObjectBuilder2;
|
||||
using System.Linq;
|
||||
|
||||
namespace Microsoft.Practices.Unity.TestSupport.Configuration
|
||||
{
|
||||
|
@ -49,9 +50,10 @@ namespace Microsoft.Practices.Unity.TestSupport.Configuration
|
|||
|
||||
private static Stream GetResourceStream(string configFileName)
|
||||
{
|
||||
string resourceName = Sequence.Collect(GetResourceNamespace(), configFileName, "config").JoinStrings(".");
|
||||
|
||||
var name = configFileName + ".config";
|
||||
var currentAssembly = typeof(TResourceLocator).Assembly;
|
||||
string resourceName = currentAssembly.GetManifestResourceNames().First(it => it.EndsWith(name));
|
||||
|
||||
return currentAssembly.GetManifestResourceStream(resourceName);
|
||||
}
|
||||
|
||||
|
|
|
@ -8,9 +8,9 @@ namespace Microsoft.Practices.Unity.TestSupport
|
|||
{
|
||||
public class RegistrationsToAssertOn
|
||||
{
|
||||
public readonly IEnumerable<ContainerRegistration> Registrations;
|
||||
public readonly IEnumerable<Registration> Registrations;
|
||||
|
||||
public RegistrationsToAssertOn(IEnumerable<ContainerRegistration> registrations)
|
||||
public RegistrationsToAssertOn(IEnumerable<Registration> registrations)
|
||||
{
|
||||
this.Registrations = registrations;
|
||||
}
|
||||
|
|
|
@ -22,11 +22,11 @@ namespace Microsoft.Practices.Unity.Configuration.Tests
|
|||
var aliases = new Dictionary<string, string>
|
||||
{
|
||||
{ "dict", typeof(Dictionary<,>).AssemblyQualifiedName },
|
||||
{ "ILogger", "Microsoft.Practices.Unity.TestSupport.ILogger, Unity.TestSupport" },
|
||||
{ "MockLogger", "Microsoft.Practices.Unity.TestSupport.MockLogger, Unity.TestSupport" }
|
||||
{ "ILogger", "Microsoft.Practices.Unity.TestSupport.ILogger, Configuration.Tests" },
|
||||
{ "MockLogger", "Microsoft.Practices.Unity.TestSupport.MockLogger, Configuration.Tests" }
|
||||
};
|
||||
|
||||
var namespaces = new[] { "System", "System.Collections.Generic", "Microsoft.Practices.Unity.TestSupport" };
|
||||
var namespaces = new[] { "System", "System.Collections.Generic", "Configuration.Tests" };
|
||||
var assemblies = new[] { "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "Unity.TestSupport", "an invalid assembly name", "invalid, invalid" };
|
||||
|
||||
typeResolver = new TypeResolverImpl(aliases, namespaces, assemblies);
|
||||
|
|
|
@ -22,12 +22,12 @@ namespace Microsoft.Practices.Unity.Configuration.Tests
|
|||
var aliases = new Dictionary<string, string>
|
||||
{
|
||||
{ "dict", typeof(Dictionary<,>).AssemblyQualifiedName },
|
||||
{ "ILogger", "Microsoft.Practices.Unity.TestSupport.ILogger, Unity.TestSupport" },
|
||||
{ "MockLogger", "Microsoft.Practices.Unity.TestSupport.MockLogger, Unity.TestSupport" }
|
||||
{ "ILogger", "Microsoft.Practices.Unity.TestSupport.ILogger, Configuration.Tests" },
|
||||
{ "MockLogger", "Microsoft.Practices.Unity.TestSupport.MockLogger, Configuration.Tests" }
|
||||
};
|
||||
|
||||
var namespaces = new string[0];
|
||||
var assemblies = new[] { "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "Unity.TestSupport", "an invalid assembly name", "invalid, invalid" };
|
||||
var assemblies = new[] { "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "Configuration.Tests", "an invalid assembly name", "invalid, invalid" };
|
||||
|
||||
typeResolver = new TypeResolverImpl(aliases, namespaces, assemblies);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче