From a2fd762f7293c092ecd01765f23007095d441733 Mon Sep 17 00:00:00 2001 From: Eugene Sadocoi Date: Sun, 19 Jan 2020 13:05:29 -0800 Subject: [PATCH] Refactoring --- ...ecification.Interception.Diagnostic.csproj | 21 +++++++++++++++++++ .../Specification.Interception.csproj | 21 +++++++++++++++++++ tests/{ => Unit}/AddInterfaceFixture.cs | 0 ...erKindsAreProperlyHandledHelper.Desktop.cs | 0 ...dParameterKindsAreProperlyHandledHelper.cs | 0 .../AttributeDrivenPolicyFixture.cs | 0 tests/{ => Unit}/CodeplexIssuesFixture.cs | 0 .../ConvenienceConfigurationFixture.cs | 0 tests/{ => Unit}/EventInterceptionFixture.cs | 0 .../FakeObjects/FakeInterceptionBehavior.cs | 0 .../FakeObjects/FakeMethodCallMessage.cs | 0 tests/{ => Unit}/HandlerInvocationFixture.cs | 0 tests/{ => Unit}/InterceptFixture.cs | 0 .../InterceptionConfigurationFixture.cs | 0 .../{ => Unit}/InterceptionFixture.Desktop.cs | 0 tests/{ => Unit}/InterceptionFixture.cs | 0 .../ContainerInterfaceInterceptionFixture.cs | 0 .../InterfaceInterceptorFixture.Desktop.cs | 0 .../InterfaceInterceptorFixture.cs | 0 tests/{ => Unit}/Issues.cs | 0 tests/{ => Unit}/MatchingRuleSetFixture.cs | 0 .../AssemblyMatchingRuleFixture.cs | 0 .../CustomAttributeMatchingRuleFixture.cs | 0 tests/{ => Unit}/MatchingRules/GlobFixture.cs | 0 .../MemberNameMatchingRuleFixture.cs | 0 .../MethodSignatureMatchingRuleFixture.cs | 0 .../NamespaceMatchingRuleFixture.cs | 0 .../ParameterTypeMatchingRuleFixture.cs | 0 .../PropertyMatchingRuleFixture.cs | 0 .../ReturnTypeMatchingRuleFixture.cs | 0 .../TagAttributeMatchingRuleFixture.cs | 0 .../MatchingRules/TypeMatchingRuleFixture.cs | 0 tests/{ => Unit}/MethodSignatureFixture.cs | 0 .../ClassWithGenericMethod.cs | 0 .../CritialFakeDal.Desktop.cs | 0 .../ObjectsUnderTest/CriticalFakeDal.cs | 0 .../ExceptionEatingHandler.cs | 0 .../ExceptionSwizzlerHandler.cs | 0 .../IInterfaceWithGenericMethod.cs | 0 .../ObjectsUnderTest/InterfacesOnlyDal.cs | 0 .../ObjectsUnderTest/MakeReturnNullHandler.cs | 0 .../ObjectsUnderTest/MockDal.Desktop.cs | 0 tests/{ => Unit}/ObjectsUnderTest/MockDal.cs | 0 .../MockDalWithOverloads.Desktop.cs | 0 .../ObjectsUnderTest/MockDalWithOverloads.cs | 0 .../ObjectsUnderTest/PostCallCountHandler.cs | 0 .../ObjectsUnderTest/ShortcuttingHandler.cs | 0 .../ObjectsUnderTest/TestHandler.cs | 0 .../ObjectsUnderTest/TestHandlerAttribute.cs | 0 .../TypeMatchingAssignmentRule.cs | 0 .../{ => Unit}/ParameterCollectionFixture.cs | 0 tests/{ => Unit}/PipelineFixture.cs | 0 tests/{ => Unit}/PolicyFixture.cs | 0 .../HandlerPipelineKeyFixture.cs | 0 .../PolicyInjectionBehaviorFixture.cs | 0 ...ectionWithGenericMethodsFixture.Desktop.cs | 0 ...olicyInjectionWithGenericMethodsFixture.cs | 0 .../VirtualMethodOverrideFixture.Desktop.cs | 0 .../VirtualMethodOverrideFixture.cs | 0 tests/{ => Unit}/PolicySetFixture.cs | 0 .../AdditionalInterfaceBehavior.cs | 0 .../TestSupport/AlwaysMatchingRule.cs | 0 .../TestSupport/AssertExtensions.cs | 0 .../TestSupport/CallCountHandler.cs | 0 .../CallCountInterceptionBehavior.cs | 0 .../TestSupport/CollectionAssertExtensions.cs | 0 .../DelegateInterceptionBehavior.cs | 0 .../EnumerableAssertionExtensions.cs | 0 .../TestSupport/ExtensibilityTestExtension.cs | 0 .../TestSupport/GlobalCountCallHandler.cs | 0 .../GlobalCountInterceptionBehavior.cs | 0 .../TestSupport/IAdditionalInterface.cs | 0 tests/{ => Unit}/TestSupport/ILogger.cs | 0 .../TestSupport/MockContainerExtension.cs | 2 +- tests/{ => Unit}/TestSupport/MockDatabase.cs | 0 tests/{ => Unit}/TestSupport/MockLogger.cs | 0 ...tifyPropertyChangedInterceptionBehavior.cs | 0 .../TestSupport/NegativeTypeConverter.cs | 0 .../TestSupport/ObjectUsingLogger.cs | 0 .../TestSupport/ObjectWithInjectionMethod.cs | 0 .../ObjectWithOneConstructorDependency.cs | 0 .../ObjectWithTwoConstructorParameters.cs | 0 .../TestSupport/ObjectWithTwoProperties.cs | 0 .../TestSupport/SessionLifetimeManager.cs | 0 tests/{ => Unit}/TestSupport/SpecialLogger.cs | 0 .../TestSupport/TypeReflectionExtensions.cs | 0 .../TestSupport/WrappableObjects.Desktop.cs | 0 .../TestSupport/WrappableObjects.cs | 0 .../IntegrationFixture.cs | 0 .../InterceptingRealProxyFixture.cs | 0 .../TransparentProxyInterceptorFixture.cs | 0 ...TransparentProxyMethodInvocationFixture.cs | 0 .../Unity.Interception.Tests.csproj | 4 ++-- ...ntainerVirtualMethodInterceptionFixture.cs | 0 ...erceptingClassGenerationFixture.Desktop.cs | 0 .../InterceptingClassGenerationFixture.cs | 0 .../InterceptingInterfaceMethodsFixture.cs | 0 ...VirtualMethodInterceptorFixture.Desktop.cs | 0 .../VirtualMethodInterceptorFixture.cs | 0 .../VirtualMethodInterception/WireupHelper.cs | 0 100 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 tests/Specification/Diagnostic/Specification.Interception.Diagnostic.csproj create mode 100644 tests/Specification/Optimized/Specification.Interception.csproj rename tests/{ => Unit}/AddInterfaceFixture.cs (100%) rename tests/{ => Unit}/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs (100%) rename tests/{ => Unit}/AssortedParameterKindsAreProperlyHandledHelper.cs (100%) rename tests/{ => Unit}/AttributeDrivenPolicyFixture.cs (100%) rename tests/{ => Unit}/CodeplexIssuesFixture.cs (100%) rename tests/{ => Unit}/ConvenienceConfigurationFixture.cs (100%) rename tests/{ => Unit}/EventInterceptionFixture.cs (100%) rename tests/{ => Unit}/FakeObjects/FakeInterceptionBehavior.cs (100%) rename tests/{ => Unit}/FakeObjects/FakeMethodCallMessage.cs (100%) rename tests/{ => Unit}/HandlerInvocationFixture.cs (100%) rename tests/{ => Unit}/InterceptFixture.cs (100%) rename tests/{ => Unit}/InterceptionConfigurationFixture.cs (100%) rename tests/{ => Unit}/InterceptionFixture.Desktop.cs (100%) rename tests/{ => Unit}/InterceptionFixture.cs (100%) rename tests/{ => Unit}/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs (100%) rename tests/{ => Unit}/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs (100%) rename tests/{ => Unit}/InterfaceInterception/InterfaceInterceptorFixture.cs (100%) rename tests/{ => Unit}/Issues.cs (100%) rename tests/{ => Unit}/MatchingRuleSetFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/AssemblyMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/CustomAttributeMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/GlobFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/MemberNameMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/MethodSignatureMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/NamespaceMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/ParameterTypeMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/PropertyMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/ReturnTypeMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/TagAttributeMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MatchingRules/TypeMatchingRuleFixture.cs (100%) rename tests/{ => Unit}/MethodSignatureFixture.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/ClassWithGenericMethod.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/CritialFakeDal.Desktop.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/CriticalFakeDal.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/ExceptionEatingHandler.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/ExceptionSwizzlerHandler.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/IInterfaceWithGenericMethod.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/InterfacesOnlyDal.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/MakeReturnNullHandler.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/MockDal.Desktop.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/MockDal.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/MockDalWithOverloads.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/PostCallCountHandler.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/ShortcuttingHandler.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/TestHandler.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/TestHandlerAttribute.cs (100%) rename tests/{ => Unit}/ObjectsUnderTest/TypeMatchingAssignmentRule.cs (100%) rename tests/{ => Unit}/ParameterCollectionFixture.cs (100%) rename tests/{ => Unit}/PipelineFixture.cs (100%) rename tests/{ => Unit}/PolicyFixture.cs (100%) rename tests/{ => Unit}/PolicyInjection/HandlerPipelineKeyFixture.cs (100%) rename tests/{ => Unit}/PolicyInjection/PolicyInjectionBehaviorFixture.cs (100%) rename tests/{ => Unit}/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs (100%) rename tests/{ => Unit}/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs (100%) rename tests/{ => Unit}/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs (100%) rename tests/{ => Unit}/PolicyInjection/VirtualMethodOverrideFixture.cs (100%) rename tests/{ => Unit}/PolicySetFixture.cs (100%) rename tests/{ => Unit}/TestSupport/AdditionalInterfaceBehavior.cs (100%) rename tests/{ => Unit}/TestSupport/AlwaysMatchingRule.cs (100%) rename tests/{ => Unit}/TestSupport/AssertExtensions.cs (100%) rename tests/{ => Unit}/TestSupport/CallCountHandler.cs (100%) rename tests/{ => Unit}/TestSupport/CallCountInterceptionBehavior.cs (100%) rename tests/{ => Unit}/TestSupport/CollectionAssertExtensions.cs (100%) rename tests/{ => Unit}/TestSupport/DelegateInterceptionBehavior.cs (100%) rename tests/{ => Unit}/TestSupport/EnumerableAssertionExtensions.cs (100%) rename tests/{ => Unit}/TestSupport/ExtensibilityTestExtension.cs (100%) rename tests/{ => Unit}/TestSupport/GlobalCountCallHandler.cs (100%) rename tests/{ => Unit}/TestSupport/GlobalCountInterceptionBehavior.cs (100%) rename tests/{ => Unit}/TestSupport/IAdditionalInterface.cs (100%) rename tests/{ => Unit}/TestSupport/ILogger.cs (100%) rename tests/{ => Unit}/TestSupport/MockContainerExtension.cs (93%) rename tests/{ => Unit}/TestSupport/MockDatabase.cs (100%) rename tests/{ => Unit}/TestSupport/MockLogger.cs (100%) rename tests/{ => Unit}/TestSupport/NaiveINotifyPropertyChangedInterceptionBehavior.cs (100%) rename tests/{ => Unit}/TestSupport/NegativeTypeConverter.cs (100%) rename tests/{ => Unit}/TestSupport/ObjectUsingLogger.cs (100%) rename tests/{ => Unit}/TestSupport/ObjectWithInjectionMethod.cs (100%) rename tests/{ => Unit}/TestSupport/ObjectWithOneConstructorDependency.cs (100%) rename tests/{ => Unit}/TestSupport/ObjectWithTwoConstructorParameters.cs (100%) rename tests/{ => Unit}/TestSupport/ObjectWithTwoProperties.cs (100%) rename tests/{ => Unit}/TestSupport/SessionLifetimeManager.cs (100%) rename tests/{ => Unit}/TestSupport/SpecialLogger.cs (100%) rename tests/{ => Unit}/TestSupport/TypeReflectionExtensions.cs (100%) rename tests/{ => Unit}/TestSupport/WrappableObjects.Desktop.cs (100%) rename tests/{ => Unit}/TestSupport/WrappableObjects.cs (100%) rename tests/{ => Unit}/TransparentProxyInterception/IntegrationFixture.cs (100%) rename tests/{ => Unit}/TransparentProxyInterception/InterceptingRealProxyFixture.cs (100%) rename tests/{ => Unit}/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs (100%) rename tests/{ => Unit}/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs (100%) rename tests/{ => Unit}/Unity.Interception.Tests.csproj (91%) rename tests/{ => Unit}/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs (100%) rename tests/{ => Unit}/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs (100%) rename tests/{ => Unit}/VirtualMethodInterception/InterceptingClassGenerationFixture.cs (100%) rename tests/{ => Unit}/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs (100%) rename tests/{ => Unit}/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs (100%) rename tests/{ => Unit}/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs (100%) rename tests/{ => Unit}/VirtualMethodInterception/WireupHelper.cs (100%) diff --git a/tests/Specification/Diagnostic/Specification.Interception.Diagnostic.csproj b/tests/Specification/Diagnostic/Specification.Interception.Diagnostic.csproj new file mode 100644 index 0000000..4c452c4 --- /dev/null +++ b/tests/Specification/Diagnostic/Specification.Interception.Diagnostic.csproj @@ -0,0 +1,21 @@ + + + + net48 + false + true + ..\..\..\src\package.snk + false + + + + + + + + + + + + + diff --git a/tests/Specification/Optimized/Specification.Interception.csproj b/tests/Specification/Optimized/Specification.Interception.csproj new file mode 100644 index 0000000..38d445c --- /dev/null +++ b/tests/Specification/Optimized/Specification.Interception.csproj @@ -0,0 +1,21 @@ + + + + net48 + false + true + ..\..\..\src\package.snk + false + + + + + + + + + + + + + diff --git a/tests/AddInterfaceFixture.cs b/tests/Unit/AddInterfaceFixture.cs similarity index 100% rename from tests/AddInterfaceFixture.cs rename to tests/Unit/AddInterfaceFixture.cs diff --git a/tests/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs b/tests/Unit/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs similarity index 100% rename from tests/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs rename to tests/Unit/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs diff --git a/tests/AssortedParameterKindsAreProperlyHandledHelper.cs b/tests/Unit/AssortedParameterKindsAreProperlyHandledHelper.cs similarity index 100% rename from tests/AssortedParameterKindsAreProperlyHandledHelper.cs rename to tests/Unit/AssortedParameterKindsAreProperlyHandledHelper.cs diff --git a/tests/AttributeDrivenPolicyFixture.cs b/tests/Unit/AttributeDrivenPolicyFixture.cs similarity index 100% rename from tests/AttributeDrivenPolicyFixture.cs rename to tests/Unit/AttributeDrivenPolicyFixture.cs diff --git a/tests/CodeplexIssuesFixture.cs b/tests/Unit/CodeplexIssuesFixture.cs similarity index 100% rename from tests/CodeplexIssuesFixture.cs rename to tests/Unit/CodeplexIssuesFixture.cs diff --git a/tests/ConvenienceConfigurationFixture.cs b/tests/Unit/ConvenienceConfigurationFixture.cs similarity index 100% rename from tests/ConvenienceConfigurationFixture.cs rename to tests/Unit/ConvenienceConfigurationFixture.cs diff --git a/tests/EventInterceptionFixture.cs b/tests/Unit/EventInterceptionFixture.cs similarity index 100% rename from tests/EventInterceptionFixture.cs rename to tests/Unit/EventInterceptionFixture.cs diff --git a/tests/FakeObjects/FakeInterceptionBehavior.cs b/tests/Unit/FakeObjects/FakeInterceptionBehavior.cs similarity index 100% rename from tests/FakeObjects/FakeInterceptionBehavior.cs rename to tests/Unit/FakeObjects/FakeInterceptionBehavior.cs diff --git a/tests/FakeObjects/FakeMethodCallMessage.cs b/tests/Unit/FakeObjects/FakeMethodCallMessage.cs similarity index 100% rename from tests/FakeObjects/FakeMethodCallMessage.cs rename to tests/Unit/FakeObjects/FakeMethodCallMessage.cs diff --git a/tests/HandlerInvocationFixture.cs b/tests/Unit/HandlerInvocationFixture.cs similarity index 100% rename from tests/HandlerInvocationFixture.cs rename to tests/Unit/HandlerInvocationFixture.cs diff --git a/tests/InterceptFixture.cs b/tests/Unit/InterceptFixture.cs similarity index 100% rename from tests/InterceptFixture.cs rename to tests/Unit/InterceptFixture.cs diff --git a/tests/InterceptionConfigurationFixture.cs b/tests/Unit/InterceptionConfigurationFixture.cs similarity index 100% rename from tests/InterceptionConfigurationFixture.cs rename to tests/Unit/InterceptionConfigurationFixture.cs diff --git a/tests/InterceptionFixture.Desktop.cs b/tests/Unit/InterceptionFixture.Desktop.cs similarity index 100% rename from tests/InterceptionFixture.Desktop.cs rename to tests/Unit/InterceptionFixture.Desktop.cs diff --git a/tests/InterceptionFixture.cs b/tests/Unit/InterceptionFixture.cs similarity index 100% rename from tests/InterceptionFixture.cs rename to tests/Unit/InterceptionFixture.cs diff --git a/tests/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs b/tests/Unit/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs similarity index 100% rename from tests/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs rename to tests/Unit/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs diff --git a/tests/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs b/tests/Unit/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs similarity index 100% rename from tests/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs rename to tests/Unit/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs diff --git a/tests/InterfaceInterception/InterfaceInterceptorFixture.cs b/tests/Unit/InterfaceInterception/InterfaceInterceptorFixture.cs similarity index 100% rename from tests/InterfaceInterception/InterfaceInterceptorFixture.cs rename to tests/Unit/InterfaceInterception/InterfaceInterceptorFixture.cs diff --git a/tests/Issues.cs b/tests/Unit/Issues.cs similarity index 100% rename from tests/Issues.cs rename to tests/Unit/Issues.cs diff --git a/tests/MatchingRuleSetFixture.cs b/tests/Unit/MatchingRuleSetFixture.cs similarity index 100% rename from tests/MatchingRuleSetFixture.cs rename to tests/Unit/MatchingRuleSetFixture.cs diff --git a/tests/MatchingRules/AssemblyMatchingRuleFixture.cs b/tests/Unit/MatchingRules/AssemblyMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/AssemblyMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/AssemblyMatchingRuleFixture.cs diff --git a/tests/MatchingRules/CustomAttributeMatchingRuleFixture.cs b/tests/Unit/MatchingRules/CustomAttributeMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/CustomAttributeMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/CustomAttributeMatchingRuleFixture.cs diff --git a/tests/MatchingRules/GlobFixture.cs b/tests/Unit/MatchingRules/GlobFixture.cs similarity index 100% rename from tests/MatchingRules/GlobFixture.cs rename to tests/Unit/MatchingRules/GlobFixture.cs diff --git a/tests/MatchingRules/MemberNameMatchingRuleFixture.cs b/tests/Unit/MatchingRules/MemberNameMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/MemberNameMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/MemberNameMatchingRuleFixture.cs diff --git a/tests/MatchingRules/MethodSignatureMatchingRuleFixture.cs b/tests/Unit/MatchingRules/MethodSignatureMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/MethodSignatureMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/MethodSignatureMatchingRuleFixture.cs diff --git a/tests/MatchingRules/NamespaceMatchingRuleFixture.cs b/tests/Unit/MatchingRules/NamespaceMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/NamespaceMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/NamespaceMatchingRuleFixture.cs diff --git a/tests/MatchingRules/ParameterTypeMatchingRuleFixture.cs b/tests/Unit/MatchingRules/ParameterTypeMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/ParameterTypeMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/ParameterTypeMatchingRuleFixture.cs diff --git a/tests/MatchingRules/PropertyMatchingRuleFixture.cs b/tests/Unit/MatchingRules/PropertyMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/PropertyMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/PropertyMatchingRuleFixture.cs diff --git a/tests/MatchingRules/ReturnTypeMatchingRuleFixture.cs b/tests/Unit/MatchingRules/ReturnTypeMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/ReturnTypeMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/ReturnTypeMatchingRuleFixture.cs diff --git a/tests/MatchingRules/TagAttributeMatchingRuleFixture.cs b/tests/Unit/MatchingRules/TagAttributeMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/TagAttributeMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/TagAttributeMatchingRuleFixture.cs diff --git a/tests/MatchingRules/TypeMatchingRuleFixture.cs b/tests/Unit/MatchingRules/TypeMatchingRuleFixture.cs similarity index 100% rename from tests/MatchingRules/TypeMatchingRuleFixture.cs rename to tests/Unit/MatchingRules/TypeMatchingRuleFixture.cs diff --git a/tests/MethodSignatureFixture.cs b/tests/Unit/MethodSignatureFixture.cs similarity index 100% rename from tests/MethodSignatureFixture.cs rename to tests/Unit/MethodSignatureFixture.cs diff --git a/tests/ObjectsUnderTest/ClassWithGenericMethod.cs b/tests/Unit/ObjectsUnderTest/ClassWithGenericMethod.cs similarity index 100% rename from tests/ObjectsUnderTest/ClassWithGenericMethod.cs rename to tests/Unit/ObjectsUnderTest/ClassWithGenericMethod.cs diff --git a/tests/ObjectsUnderTest/CritialFakeDal.Desktop.cs b/tests/Unit/ObjectsUnderTest/CritialFakeDal.Desktop.cs similarity index 100% rename from tests/ObjectsUnderTest/CritialFakeDal.Desktop.cs rename to tests/Unit/ObjectsUnderTest/CritialFakeDal.Desktop.cs diff --git a/tests/ObjectsUnderTest/CriticalFakeDal.cs b/tests/Unit/ObjectsUnderTest/CriticalFakeDal.cs similarity index 100% rename from tests/ObjectsUnderTest/CriticalFakeDal.cs rename to tests/Unit/ObjectsUnderTest/CriticalFakeDal.cs diff --git a/tests/ObjectsUnderTest/ExceptionEatingHandler.cs b/tests/Unit/ObjectsUnderTest/ExceptionEatingHandler.cs similarity index 100% rename from tests/ObjectsUnderTest/ExceptionEatingHandler.cs rename to tests/Unit/ObjectsUnderTest/ExceptionEatingHandler.cs diff --git a/tests/ObjectsUnderTest/ExceptionSwizzlerHandler.cs b/tests/Unit/ObjectsUnderTest/ExceptionSwizzlerHandler.cs similarity index 100% rename from tests/ObjectsUnderTest/ExceptionSwizzlerHandler.cs rename to tests/Unit/ObjectsUnderTest/ExceptionSwizzlerHandler.cs diff --git a/tests/ObjectsUnderTest/IInterfaceWithGenericMethod.cs b/tests/Unit/ObjectsUnderTest/IInterfaceWithGenericMethod.cs similarity index 100% rename from tests/ObjectsUnderTest/IInterfaceWithGenericMethod.cs rename to tests/Unit/ObjectsUnderTest/IInterfaceWithGenericMethod.cs diff --git a/tests/ObjectsUnderTest/InterfacesOnlyDal.cs b/tests/Unit/ObjectsUnderTest/InterfacesOnlyDal.cs similarity index 100% rename from tests/ObjectsUnderTest/InterfacesOnlyDal.cs rename to tests/Unit/ObjectsUnderTest/InterfacesOnlyDal.cs diff --git a/tests/ObjectsUnderTest/MakeReturnNullHandler.cs b/tests/Unit/ObjectsUnderTest/MakeReturnNullHandler.cs similarity index 100% rename from tests/ObjectsUnderTest/MakeReturnNullHandler.cs rename to tests/Unit/ObjectsUnderTest/MakeReturnNullHandler.cs diff --git a/tests/ObjectsUnderTest/MockDal.Desktop.cs b/tests/Unit/ObjectsUnderTest/MockDal.Desktop.cs similarity index 100% rename from tests/ObjectsUnderTest/MockDal.Desktop.cs rename to tests/Unit/ObjectsUnderTest/MockDal.Desktop.cs diff --git a/tests/ObjectsUnderTest/MockDal.cs b/tests/Unit/ObjectsUnderTest/MockDal.cs similarity index 100% rename from tests/ObjectsUnderTest/MockDal.cs rename to tests/Unit/ObjectsUnderTest/MockDal.cs diff --git a/tests/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs b/tests/Unit/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs similarity index 100% rename from tests/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs rename to tests/Unit/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs diff --git a/tests/ObjectsUnderTest/MockDalWithOverloads.cs b/tests/Unit/ObjectsUnderTest/MockDalWithOverloads.cs similarity index 100% rename from tests/ObjectsUnderTest/MockDalWithOverloads.cs rename to tests/Unit/ObjectsUnderTest/MockDalWithOverloads.cs diff --git a/tests/ObjectsUnderTest/PostCallCountHandler.cs b/tests/Unit/ObjectsUnderTest/PostCallCountHandler.cs similarity index 100% rename from tests/ObjectsUnderTest/PostCallCountHandler.cs rename to tests/Unit/ObjectsUnderTest/PostCallCountHandler.cs diff --git a/tests/ObjectsUnderTest/ShortcuttingHandler.cs b/tests/Unit/ObjectsUnderTest/ShortcuttingHandler.cs similarity index 100% rename from tests/ObjectsUnderTest/ShortcuttingHandler.cs rename to tests/Unit/ObjectsUnderTest/ShortcuttingHandler.cs diff --git a/tests/ObjectsUnderTest/TestHandler.cs b/tests/Unit/ObjectsUnderTest/TestHandler.cs similarity index 100% rename from tests/ObjectsUnderTest/TestHandler.cs rename to tests/Unit/ObjectsUnderTest/TestHandler.cs diff --git a/tests/ObjectsUnderTest/TestHandlerAttribute.cs b/tests/Unit/ObjectsUnderTest/TestHandlerAttribute.cs similarity index 100% rename from tests/ObjectsUnderTest/TestHandlerAttribute.cs rename to tests/Unit/ObjectsUnderTest/TestHandlerAttribute.cs diff --git a/tests/ObjectsUnderTest/TypeMatchingAssignmentRule.cs b/tests/Unit/ObjectsUnderTest/TypeMatchingAssignmentRule.cs similarity index 100% rename from tests/ObjectsUnderTest/TypeMatchingAssignmentRule.cs rename to tests/Unit/ObjectsUnderTest/TypeMatchingAssignmentRule.cs diff --git a/tests/ParameterCollectionFixture.cs b/tests/Unit/ParameterCollectionFixture.cs similarity index 100% rename from tests/ParameterCollectionFixture.cs rename to tests/Unit/ParameterCollectionFixture.cs diff --git a/tests/PipelineFixture.cs b/tests/Unit/PipelineFixture.cs similarity index 100% rename from tests/PipelineFixture.cs rename to tests/Unit/PipelineFixture.cs diff --git a/tests/PolicyFixture.cs b/tests/Unit/PolicyFixture.cs similarity index 100% rename from tests/PolicyFixture.cs rename to tests/Unit/PolicyFixture.cs diff --git a/tests/PolicyInjection/HandlerPipelineKeyFixture.cs b/tests/Unit/PolicyInjection/HandlerPipelineKeyFixture.cs similarity index 100% rename from tests/PolicyInjection/HandlerPipelineKeyFixture.cs rename to tests/Unit/PolicyInjection/HandlerPipelineKeyFixture.cs diff --git a/tests/PolicyInjection/PolicyInjectionBehaviorFixture.cs b/tests/Unit/PolicyInjection/PolicyInjectionBehaviorFixture.cs similarity index 100% rename from tests/PolicyInjection/PolicyInjectionBehaviorFixture.cs rename to tests/Unit/PolicyInjection/PolicyInjectionBehaviorFixture.cs diff --git a/tests/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs b/tests/Unit/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs similarity index 100% rename from tests/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs rename to tests/Unit/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs diff --git a/tests/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs b/tests/Unit/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs similarity index 100% rename from tests/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs rename to tests/Unit/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs diff --git a/tests/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs b/tests/Unit/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs similarity index 100% rename from tests/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs rename to tests/Unit/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs diff --git a/tests/PolicyInjection/VirtualMethodOverrideFixture.cs b/tests/Unit/PolicyInjection/VirtualMethodOverrideFixture.cs similarity index 100% rename from tests/PolicyInjection/VirtualMethodOverrideFixture.cs rename to tests/Unit/PolicyInjection/VirtualMethodOverrideFixture.cs diff --git a/tests/PolicySetFixture.cs b/tests/Unit/PolicySetFixture.cs similarity index 100% rename from tests/PolicySetFixture.cs rename to tests/Unit/PolicySetFixture.cs diff --git a/tests/TestSupport/AdditionalInterfaceBehavior.cs b/tests/Unit/TestSupport/AdditionalInterfaceBehavior.cs similarity index 100% rename from tests/TestSupport/AdditionalInterfaceBehavior.cs rename to tests/Unit/TestSupport/AdditionalInterfaceBehavior.cs diff --git a/tests/TestSupport/AlwaysMatchingRule.cs b/tests/Unit/TestSupport/AlwaysMatchingRule.cs similarity index 100% rename from tests/TestSupport/AlwaysMatchingRule.cs rename to tests/Unit/TestSupport/AlwaysMatchingRule.cs diff --git a/tests/TestSupport/AssertExtensions.cs b/tests/Unit/TestSupport/AssertExtensions.cs similarity index 100% rename from tests/TestSupport/AssertExtensions.cs rename to tests/Unit/TestSupport/AssertExtensions.cs diff --git a/tests/TestSupport/CallCountHandler.cs b/tests/Unit/TestSupport/CallCountHandler.cs similarity index 100% rename from tests/TestSupport/CallCountHandler.cs rename to tests/Unit/TestSupport/CallCountHandler.cs diff --git a/tests/TestSupport/CallCountInterceptionBehavior.cs b/tests/Unit/TestSupport/CallCountInterceptionBehavior.cs similarity index 100% rename from tests/TestSupport/CallCountInterceptionBehavior.cs rename to tests/Unit/TestSupport/CallCountInterceptionBehavior.cs diff --git a/tests/TestSupport/CollectionAssertExtensions.cs b/tests/Unit/TestSupport/CollectionAssertExtensions.cs similarity index 100% rename from tests/TestSupport/CollectionAssertExtensions.cs rename to tests/Unit/TestSupport/CollectionAssertExtensions.cs diff --git a/tests/TestSupport/DelegateInterceptionBehavior.cs b/tests/Unit/TestSupport/DelegateInterceptionBehavior.cs similarity index 100% rename from tests/TestSupport/DelegateInterceptionBehavior.cs rename to tests/Unit/TestSupport/DelegateInterceptionBehavior.cs diff --git a/tests/TestSupport/EnumerableAssertionExtensions.cs b/tests/Unit/TestSupport/EnumerableAssertionExtensions.cs similarity index 100% rename from tests/TestSupport/EnumerableAssertionExtensions.cs rename to tests/Unit/TestSupport/EnumerableAssertionExtensions.cs diff --git a/tests/TestSupport/ExtensibilityTestExtension.cs b/tests/Unit/TestSupport/ExtensibilityTestExtension.cs similarity index 100% rename from tests/TestSupport/ExtensibilityTestExtension.cs rename to tests/Unit/TestSupport/ExtensibilityTestExtension.cs diff --git a/tests/TestSupport/GlobalCountCallHandler.cs b/tests/Unit/TestSupport/GlobalCountCallHandler.cs similarity index 100% rename from tests/TestSupport/GlobalCountCallHandler.cs rename to tests/Unit/TestSupport/GlobalCountCallHandler.cs diff --git a/tests/TestSupport/GlobalCountInterceptionBehavior.cs b/tests/Unit/TestSupport/GlobalCountInterceptionBehavior.cs similarity index 100% rename from tests/TestSupport/GlobalCountInterceptionBehavior.cs rename to tests/Unit/TestSupport/GlobalCountInterceptionBehavior.cs diff --git a/tests/TestSupport/IAdditionalInterface.cs b/tests/Unit/TestSupport/IAdditionalInterface.cs similarity index 100% rename from tests/TestSupport/IAdditionalInterface.cs rename to tests/Unit/TestSupport/IAdditionalInterface.cs diff --git a/tests/TestSupport/ILogger.cs b/tests/Unit/TestSupport/ILogger.cs similarity index 100% rename from tests/TestSupport/ILogger.cs rename to tests/Unit/TestSupport/ILogger.cs diff --git a/tests/TestSupport/MockContainerExtension.cs b/tests/Unit/TestSupport/MockContainerExtension.cs similarity index 93% rename from tests/TestSupport/MockContainerExtension.cs rename to tests/Unit/TestSupport/MockContainerExtension.cs index fec840e..cc18a24 100644 --- a/tests/TestSupport/MockContainerExtension.cs +++ b/tests/Unit/TestSupport/MockContainerExtension.cs @@ -13,7 +13,7 @@ namespace Microsoft.Practices.Unity.TestSupport get { return this.initializeWasCalled; } } - public new IExtensionContext Context + public new ExtensionContext Context { get { return base.Context; } } diff --git a/tests/TestSupport/MockDatabase.cs b/tests/Unit/TestSupport/MockDatabase.cs similarity index 100% rename from tests/TestSupport/MockDatabase.cs rename to tests/Unit/TestSupport/MockDatabase.cs diff --git a/tests/TestSupport/MockLogger.cs b/tests/Unit/TestSupport/MockLogger.cs similarity index 100% rename from tests/TestSupport/MockLogger.cs rename to tests/Unit/TestSupport/MockLogger.cs diff --git a/tests/TestSupport/NaiveINotifyPropertyChangedInterceptionBehavior.cs b/tests/Unit/TestSupport/NaiveINotifyPropertyChangedInterceptionBehavior.cs similarity index 100% rename from tests/TestSupport/NaiveINotifyPropertyChangedInterceptionBehavior.cs rename to tests/Unit/TestSupport/NaiveINotifyPropertyChangedInterceptionBehavior.cs diff --git a/tests/TestSupport/NegativeTypeConverter.cs b/tests/Unit/TestSupport/NegativeTypeConverter.cs similarity index 100% rename from tests/TestSupport/NegativeTypeConverter.cs rename to tests/Unit/TestSupport/NegativeTypeConverter.cs diff --git a/tests/TestSupport/ObjectUsingLogger.cs b/tests/Unit/TestSupport/ObjectUsingLogger.cs similarity index 100% rename from tests/TestSupport/ObjectUsingLogger.cs rename to tests/Unit/TestSupport/ObjectUsingLogger.cs diff --git a/tests/TestSupport/ObjectWithInjectionMethod.cs b/tests/Unit/TestSupport/ObjectWithInjectionMethod.cs similarity index 100% rename from tests/TestSupport/ObjectWithInjectionMethod.cs rename to tests/Unit/TestSupport/ObjectWithInjectionMethod.cs diff --git a/tests/TestSupport/ObjectWithOneConstructorDependency.cs b/tests/Unit/TestSupport/ObjectWithOneConstructorDependency.cs similarity index 100% rename from tests/TestSupport/ObjectWithOneConstructorDependency.cs rename to tests/Unit/TestSupport/ObjectWithOneConstructorDependency.cs diff --git a/tests/TestSupport/ObjectWithTwoConstructorParameters.cs b/tests/Unit/TestSupport/ObjectWithTwoConstructorParameters.cs similarity index 100% rename from tests/TestSupport/ObjectWithTwoConstructorParameters.cs rename to tests/Unit/TestSupport/ObjectWithTwoConstructorParameters.cs diff --git a/tests/TestSupport/ObjectWithTwoProperties.cs b/tests/Unit/TestSupport/ObjectWithTwoProperties.cs similarity index 100% rename from tests/TestSupport/ObjectWithTwoProperties.cs rename to tests/Unit/TestSupport/ObjectWithTwoProperties.cs diff --git a/tests/TestSupport/SessionLifetimeManager.cs b/tests/Unit/TestSupport/SessionLifetimeManager.cs similarity index 100% rename from tests/TestSupport/SessionLifetimeManager.cs rename to tests/Unit/TestSupport/SessionLifetimeManager.cs diff --git a/tests/TestSupport/SpecialLogger.cs b/tests/Unit/TestSupport/SpecialLogger.cs similarity index 100% rename from tests/TestSupport/SpecialLogger.cs rename to tests/Unit/TestSupport/SpecialLogger.cs diff --git a/tests/TestSupport/TypeReflectionExtensions.cs b/tests/Unit/TestSupport/TypeReflectionExtensions.cs similarity index 100% rename from tests/TestSupport/TypeReflectionExtensions.cs rename to tests/Unit/TestSupport/TypeReflectionExtensions.cs diff --git a/tests/TestSupport/WrappableObjects.Desktop.cs b/tests/Unit/TestSupport/WrappableObjects.Desktop.cs similarity index 100% rename from tests/TestSupport/WrappableObjects.Desktop.cs rename to tests/Unit/TestSupport/WrappableObjects.Desktop.cs diff --git a/tests/TestSupport/WrappableObjects.cs b/tests/Unit/TestSupport/WrappableObjects.cs similarity index 100% rename from tests/TestSupport/WrappableObjects.cs rename to tests/Unit/TestSupport/WrappableObjects.cs diff --git a/tests/TransparentProxyInterception/IntegrationFixture.cs b/tests/Unit/TransparentProxyInterception/IntegrationFixture.cs similarity index 100% rename from tests/TransparentProxyInterception/IntegrationFixture.cs rename to tests/Unit/TransparentProxyInterception/IntegrationFixture.cs diff --git a/tests/TransparentProxyInterception/InterceptingRealProxyFixture.cs b/tests/Unit/TransparentProxyInterception/InterceptingRealProxyFixture.cs similarity index 100% rename from tests/TransparentProxyInterception/InterceptingRealProxyFixture.cs rename to tests/Unit/TransparentProxyInterception/InterceptingRealProxyFixture.cs diff --git a/tests/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs b/tests/Unit/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs similarity index 100% rename from tests/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs rename to tests/Unit/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs diff --git a/tests/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs b/tests/Unit/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs similarity index 100% rename from tests/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs rename to tests/Unit/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs diff --git a/tests/Unity.Interception.Tests.csproj b/tests/Unit/Unity.Interception.Tests.csproj similarity index 91% rename from tests/Unity.Interception.Tests.csproj rename to tests/Unit/Unity.Interception.Tests.csproj index 2ef4960..b42338d 100644 --- a/tests/Unity.Interception.Tests.csproj +++ b/tests/Unit/Unity.Interception.Tests.csproj @@ -1,6 +1,6 @@  - + net47 @@ -15,7 +15,7 @@ - + diff --git a/tests/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs b/tests/Unit/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs similarity index 100% rename from tests/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs rename to tests/Unit/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs diff --git a/tests/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs b/tests/Unit/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs similarity index 100% rename from tests/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs rename to tests/Unit/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs diff --git a/tests/VirtualMethodInterception/InterceptingClassGenerationFixture.cs b/tests/Unit/VirtualMethodInterception/InterceptingClassGenerationFixture.cs similarity index 100% rename from tests/VirtualMethodInterception/InterceptingClassGenerationFixture.cs rename to tests/Unit/VirtualMethodInterception/InterceptingClassGenerationFixture.cs diff --git a/tests/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs b/tests/Unit/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs similarity index 100% rename from tests/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs rename to tests/Unit/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs diff --git a/tests/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs b/tests/Unit/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs similarity index 100% rename from tests/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs rename to tests/Unit/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs diff --git a/tests/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs b/tests/Unit/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs similarity index 100% rename from tests/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs rename to tests/Unit/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs diff --git a/tests/VirtualMethodInterception/WireupHelper.cs b/tests/Unit/VirtualMethodInterception/WireupHelper.cs similarity index 100% rename from tests/VirtualMethodInterception/WireupHelper.cs rename to tests/Unit/VirtualMethodInterception/WireupHelper.cs