Refactoring

2020-01-19 13:05:29 -08:00 · 2020-01-19 13:05:29 -08:00 · a2fd762f72
--- a/tests/Specification/Diagnostic/Specification.Interception.Diagnostic.csproj
+++ b/tests/Specification/Diagnostic/Specification.Interception.Diagnostic.csproj
@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\src\package.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Specification\Interception\diagnostic\Interception.Diagnostic.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/tests/Specification/Optimized/Specification.Interception.csproj
+++ b/tests/Specification/Optimized/Specification.Interception.csproj
@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\src\package.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Specification\Interception\optimized\Interception.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/tests/Unit/AddInterfaceFixture.cs
+++ b/tests/Unit/AddInterfaceFixture.cs
--- a/tests/Unit/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs
+++ b/tests/Unit/AssortedParameterKindsAreProperlyHandledHelper.Desktop.cs
--- a/tests/Unit/AssortedParameterKindsAreProperlyHandledHelper.cs
+++ b/tests/Unit/AssortedParameterKindsAreProperlyHandledHelper.cs
--- a/tests/Unit/AttributeDrivenPolicyFixture.cs
+++ b/tests/Unit/AttributeDrivenPolicyFixture.cs
--- a/tests/Unit/CodeplexIssuesFixture.cs
+++ b/tests/Unit/CodeplexIssuesFixture.cs
--- a/tests/Unit/ConvenienceConfigurationFixture.cs
+++ b/tests/Unit/ConvenienceConfigurationFixture.cs
--- a/tests/Unit/EventInterceptionFixture.cs
+++ b/tests/Unit/EventInterceptionFixture.cs
--- a/tests/Unit/FakeObjects/FakeInterceptionBehavior.cs
+++ b/tests/Unit/FakeObjects/FakeInterceptionBehavior.cs
--- a/tests/Unit/FakeObjects/FakeMethodCallMessage.cs
+++ b/tests/Unit/FakeObjects/FakeMethodCallMessage.cs
--- a/tests/Unit/HandlerInvocationFixture.cs
+++ b/tests/Unit/HandlerInvocationFixture.cs
--- a/tests/Unit/InterceptFixture.cs
+++ b/tests/Unit/InterceptFixture.cs
--- a/tests/Unit/InterceptionConfigurationFixture.cs
+++ b/tests/Unit/InterceptionConfigurationFixture.cs
--- a/tests/Unit/InterceptionFixture.Desktop.cs
+++ b/tests/Unit/InterceptionFixture.Desktop.cs
--- a/tests/Unit/InterceptionFixture.cs
+++ b/tests/Unit/InterceptionFixture.cs
--- a/tests/Unit/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs
+++ b/tests/Unit/InterfaceInterception/ContainerInterfaceInterceptionFixture.cs
--- a/tests/Unit/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs
+++ b/tests/Unit/InterfaceInterception/InterfaceInterceptorFixture.Desktop.cs
--- a/tests/Unit/InterfaceInterception/InterfaceInterceptorFixture.cs
+++ b/tests/Unit/InterfaceInterception/InterfaceInterceptorFixture.cs
--- a/tests/Unit/Issues.cs
+++ b/tests/Unit/Issues.cs
--- a/tests/Unit/MatchingRuleSetFixture.cs
+++ b/tests/Unit/MatchingRuleSetFixture.cs
--- a/tests/Unit/MatchingRules/AssemblyMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/AssemblyMatchingRuleFixture.cs
--- a/tests/Unit/MatchingRules/CustomAttributeMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/CustomAttributeMatchingRuleFixture.cs
--- a/tests/Unit/MatchingRules/GlobFixture.cs
+++ b/tests/Unit/MatchingRules/GlobFixture.cs
--- a/tests/Unit/MatchingRules/MemberNameMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/MemberNameMatchingRuleFixture.cs
--- a/tests/Unit/MatchingRules/MethodSignatureMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/MethodSignatureMatchingRuleFixture.cs
--- a/tests/Unit/MatchingRules/NamespaceMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/NamespaceMatchingRuleFixture.cs
--- a/tests/Unit/MatchingRules/ParameterTypeMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/ParameterTypeMatchingRuleFixture.cs
--- a/tests/Unit/MatchingRules/PropertyMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/PropertyMatchingRuleFixture.cs
--- a/tests/Unit/MatchingRules/ReturnTypeMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/ReturnTypeMatchingRuleFixture.cs
--- a/tests/Unit/MatchingRules/TagAttributeMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/TagAttributeMatchingRuleFixture.cs
--- a/tests/Unit/MatchingRules/TypeMatchingRuleFixture.cs
+++ b/tests/Unit/MatchingRules/TypeMatchingRuleFixture.cs
--- a/tests/Unit/MethodSignatureFixture.cs
+++ b/tests/Unit/MethodSignatureFixture.cs
--- a/tests/Unit/ObjectsUnderTest/ClassWithGenericMethod.cs
+++ b/tests/Unit/ObjectsUnderTest/ClassWithGenericMethod.cs
--- a/tests/Unit/ObjectsUnderTest/CritialFakeDal.Desktop.cs
+++ b/tests/Unit/ObjectsUnderTest/CritialFakeDal.Desktop.cs
--- a/tests/Unit/ObjectsUnderTest/CriticalFakeDal.cs
+++ b/tests/Unit/ObjectsUnderTest/CriticalFakeDal.cs
--- a/tests/Unit/ObjectsUnderTest/ExceptionEatingHandler.cs
+++ b/tests/Unit/ObjectsUnderTest/ExceptionEatingHandler.cs
--- a/tests/Unit/ObjectsUnderTest/ExceptionSwizzlerHandler.cs
+++ b/tests/Unit/ObjectsUnderTest/ExceptionSwizzlerHandler.cs
--- a/tests/Unit/ObjectsUnderTest/IInterfaceWithGenericMethod.cs
+++ b/tests/Unit/ObjectsUnderTest/IInterfaceWithGenericMethod.cs
--- a/tests/Unit/ObjectsUnderTest/InterfacesOnlyDal.cs
+++ b/tests/Unit/ObjectsUnderTest/InterfacesOnlyDal.cs
--- a/tests/Unit/ObjectsUnderTest/MakeReturnNullHandler.cs
+++ b/tests/Unit/ObjectsUnderTest/MakeReturnNullHandler.cs
--- a/tests/Unit/ObjectsUnderTest/MockDal.Desktop.cs
+++ b/tests/Unit/ObjectsUnderTest/MockDal.Desktop.cs
--- a/tests/Unit/ObjectsUnderTest/MockDal.cs
+++ b/tests/Unit/ObjectsUnderTest/MockDal.cs
--- a/tests/Unit/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs
+++ b/tests/Unit/ObjectsUnderTest/MockDalWithOverloads.Desktop.cs
--- a/tests/Unit/ObjectsUnderTest/MockDalWithOverloads.cs
+++ b/tests/Unit/ObjectsUnderTest/MockDalWithOverloads.cs
--- a/tests/Unit/ObjectsUnderTest/PostCallCountHandler.cs
+++ b/tests/Unit/ObjectsUnderTest/PostCallCountHandler.cs
--- a/tests/Unit/ObjectsUnderTest/ShortcuttingHandler.cs
+++ b/tests/Unit/ObjectsUnderTest/ShortcuttingHandler.cs
--- a/tests/Unit/ObjectsUnderTest/TestHandler.cs
+++ b/tests/Unit/ObjectsUnderTest/TestHandler.cs
--- a/tests/Unit/ObjectsUnderTest/TestHandlerAttribute.cs
+++ b/tests/Unit/ObjectsUnderTest/TestHandlerAttribute.cs
--- a/tests/Unit/ObjectsUnderTest/TypeMatchingAssignmentRule.cs
+++ b/tests/Unit/ObjectsUnderTest/TypeMatchingAssignmentRule.cs
--- a/tests/Unit/ParameterCollectionFixture.cs
+++ b/tests/Unit/ParameterCollectionFixture.cs
--- a/tests/Unit/PipelineFixture.cs
+++ b/tests/Unit/PipelineFixture.cs
--- a/tests/Unit/PolicyFixture.cs
+++ b/tests/Unit/PolicyFixture.cs
--- a/tests/Unit/PolicyInjection/HandlerPipelineKeyFixture.cs
+++ b/tests/Unit/PolicyInjection/HandlerPipelineKeyFixture.cs
--- a/tests/Unit/PolicyInjection/PolicyInjectionBehaviorFixture.cs
+++ b/tests/Unit/PolicyInjection/PolicyInjectionBehaviorFixture.cs
--- a/tests/Unit/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs
+++ b/tests/Unit/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.Desktop.cs
--- a/tests/Unit/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs
+++ b/tests/Unit/PolicyInjection/PolicyInjectionWithGenericMethodsFixture.cs
--- a/tests/Unit/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs
+++ b/tests/Unit/PolicyInjection/VirtualMethodOverrideFixture.Desktop.cs
--- a/tests/Unit/PolicyInjection/VirtualMethodOverrideFixture.cs
+++ b/tests/Unit/PolicyInjection/VirtualMethodOverrideFixture.cs
--- a/tests/Unit/PolicySetFixture.cs
+++ b/tests/Unit/PolicySetFixture.cs
--- a/tests/Unit/TestSupport/AdditionalInterfaceBehavior.cs
+++ b/tests/Unit/TestSupport/AdditionalInterfaceBehavior.cs
--- a/tests/Unit/TestSupport/AlwaysMatchingRule.cs
+++ b/tests/Unit/TestSupport/AlwaysMatchingRule.cs
--- a/tests/Unit/TestSupport/AssertExtensions.cs
+++ b/tests/Unit/TestSupport/AssertExtensions.cs
--- a/tests/Unit/TestSupport/CallCountHandler.cs
+++ b/tests/Unit/TestSupport/CallCountHandler.cs
--- a/tests/Unit/TestSupport/CallCountInterceptionBehavior.cs
+++ b/tests/Unit/TestSupport/CallCountInterceptionBehavior.cs
--- a/tests/Unit/TestSupport/CollectionAssertExtensions.cs
+++ b/tests/Unit/TestSupport/CollectionAssertExtensions.cs
--- a/tests/Unit/TestSupport/DelegateInterceptionBehavior.cs
+++ b/tests/Unit/TestSupport/DelegateInterceptionBehavior.cs
--- a/tests/Unit/TestSupport/EnumerableAssertionExtensions.cs
+++ b/tests/Unit/TestSupport/EnumerableAssertionExtensions.cs
--- a/tests/Unit/TestSupport/ExtensibilityTestExtension.cs
+++ b/tests/Unit/TestSupport/ExtensibilityTestExtension.cs
--- a/tests/Unit/TestSupport/GlobalCountCallHandler.cs
+++ b/tests/Unit/TestSupport/GlobalCountCallHandler.cs
--- a/tests/Unit/TestSupport/GlobalCountInterceptionBehavior.cs
+++ b/tests/Unit/TestSupport/GlobalCountInterceptionBehavior.cs
--- a/tests/Unit/TestSupport/IAdditionalInterface.cs
+++ b/tests/Unit/TestSupport/IAdditionalInterface.cs
--- a/tests/Unit/TestSupport/ILogger.cs
+++ b/tests/Unit/TestSupport/ILogger.cs
--- a/tests/Unit/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; }
        }
--- a/tests/Unit/TestSupport/MockDatabase.cs
+++ b/tests/Unit/TestSupport/MockDatabase.cs
--- a/tests/Unit/TestSupport/MockLogger.cs
+++ b/tests/Unit/TestSupport/MockLogger.cs
--- a/tests/Unit/TestSupport/NaiveINotifyPropertyChangedInterceptionBehavior.cs
+++ b/tests/Unit/TestSupport/NaiveINotifyPropertyChangedInterceptionBehavior.cs
--- a/tests/Unit/TestSupport/NegativeTypeConverter.cs
+++ b/tests/Unit/TestSupport/NegativeTypeConverter.cs
--- a/tests/Unit/TestSupport/ObjectUsingLogger.cs
+++ b/tests/Unit/TestSupport/ObjectUsingLogger.cs
--- a/tests/Unit/TestSupport/ObjectWithInjectionMethod.cs
+++ b/tests/Unit/TestSupport/ObjectWithInjectionMethod.cs
--- a/tests/Unit/TestSupport/ObjectWithOneConstructorDependency.cs
+++ b/tests/Unit/TestSupport/ObjectWithOneConstructorDependency.cs
--- a/tests/Unit/TestSupport/ObjectWithTwoConstructorParameters.cs
+++ b/tests/Unit/TestSupport/ObjectWithTwoConstructorParameters.cs
--- a/tests/Unit/TestSupport/ObjectWithTwoProperties.cs
+++ b/tests/Unit/TestSupport/ObjectWithTwoProperties.cs
--- a/tests/Unit/TestSupport/SessionLifetimeManager.cs
+++ b/tests/Unit/TestSupport/SessionLifetimeManager.cs
--- a/tests/Unit/TestSupport/SpecialLogger.cs
+++ b/tests/Unit/TestSupport/SpecialLogger.cs
--- a/tests/Unit/TestSupport/TypeReflectionExtensions.cs
+++ b/tests/Unit/TestSupport/TypeReflectionExtensions.cs
--- a/tests/Unit/TestSupport/WrappableObjects.Desktop.cs
+++ b/tests/Unit/TestSupport/WrappableObjects.Desktop.cs
--- a/tests/Unit/TestSupport/WrappableObjects.cs
+++ b/tests/Unit/TestSupport/WrappableObjects.cs
--- a/tests/Unit/TransparentProxyInterception/IntegrationFixture.cs
+++ b/tests/Unit/TransparentProxyInterception/IntegrationFixture.cs
--- a/tests/Unit/TransparentProxyInterception/InterceptingRealProxyFixture.cs
+++ b/tests/Unit/TransparentProxyInterception/InterceptingRealProxyFixture.cs
--- a/tests/Unit/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs
+++ b/tests/Unit/TransparentProxyInterception/TransparentProxyInterceptorFixture.cs
--- a/tests/Unit/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs
+++ b/tests/Unit/TransparentProxyInterception/TransparentProxyMethodInvocationFixture.cs
--- a/tests/Unit/Unity.Interception.Tests.csproj
+++ b/tests/Unit/Unity.Interception.Tests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <Import Project="..\package.props" />
+  <Import Project="..\..\package.props" />

  <PropertyGroup>
    <TargetFramework>net47</TargetFramework>
@ -15,7 +15,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\src\Unity.Interception.csproj" />
+    <ProjectReference Include="..\..\src\Unity.Interception.csproj" />
  </ItemGroup>
  

--- a/tests/Unit/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs
+++ b/tests/Unit/VirtualMethodInterception/ContainerVirtualMethodInterceptionFixture.cs
--- a/tests/Unit/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs
+++ b/tests/Unit/VirtualMethodInterception/InterceptingClassGenerationFixture.Desktop.cs
--- a/tests/Unit/VirtualMethodInterception/InterceptingClassGenerationFixture.cs
+++ b/tests/Unit/VirtualMethodInterception/InterceptingClassGenerationFixture.cs
--- a/tests/Unit/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs
+++ b/tests/Unit/VirtualMethodInterception/InterceptingInterfaceMethodsFixture.cs
--- a/tests/Unit/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs
+++ b/tests/Unit/VirtualMethodInterception/VirtualMethodInterceptorFixture.Desktop.cs
--- a/tests/Unit/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs
+++ b/tests/Unit/VirtualMethodInterception/VirtualMethodInterceptorFixture.cs
--- a/tests/Unit/VirtualMethodInterception/WireupHelper.cs
+++ b/tests/Unit/VirtualMethodInterception/WireupHelper.cs