Migrating IntegratedContextTesterHelper.csproj as part of issue #58

NeutroniumCore · Jun 14, 2018 · 9d077ac · 9d077ac
1 parent 72f7c02
commit 9d077ac
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 249 deletions.
diff --git a/Neutronium.sln b/Neutronium.sln
@@ -501,16 +501,16 @@ Global
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|x64.ActiveCfg = Debug|x64
-		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|x64.Build.0 = Debug|x64
+		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|x64.Build.0 = Debug|Any CPU
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|x86.ActiveCfg = Debug|x86
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|x86.Build.0 = Debug|x86
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|Mixed Platforms.Build.0 = Release|x86
-		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|x64.ActiveCfg = Release|x64
-		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|x64.Build.0 = Release|x64
+		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|x64.ActiveCfg = Release|Any CPU
+		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|x64.Build.0 = Release|Any CPU
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|x86.ActiveCfg = Release|x86
 		{614BBB6D-D7C4-494A-929E-067EE62573CE}.Release|x86.Build.0 = Release|x86
 		{D1B3B964-4EF6-4986-9F30-E87ABA37D11D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/...fra/Tests.Infra.IntegratedContextTesterHelper.Window/IntegratedContextTesterHelper.csproj b/...fra/Tests.Infra.IntegratedContextTesterHelper.Window/IntegratedContextTesterHelper.csproj
@@ -1,154 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk"> 
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{614BBB6D-D7C4-494A-929E-067EE62573CE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tests.Infra.IntegratedContextTesterHelper</RootNamespace>
-    <AssemblyName>Tests.Infra.IntegratedContextTesterHelper</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>net452</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+
+    <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.dotnet, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\netstandard1.1\xunit.execution.dotnet.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Windowless\IntegratedTestBase.cs" />
-    <Compile Include="Windowless\IWindowLessHTMLEngineProvider.cs" />
-    <Compile Include="Windowless\TestContextBase.cs" />
-    <Compile Include="Windowless\TestInContext.cs" />
-    <Compile Include="Windowless\TestInContextAsync.cs" />
-    <Compile Include="Windowless\WindowLessHTMLEngineProvider.cs" />
-    <Compile Include="Window\IWindowContextProvider.cs" />
-    <Compile Include="Window\WindowContextProvider.cs" />
-    <Compile Include="Window\WindowTest.cs" />
-    <Compile Include="Window\WindowTestContext.cs" />
-    <Compile Include="Window\WindowTestEnvironment.cs" />
+    <PackageReference Include="AutoFixture.Xunit2" Version="4.4.0" />
+    <PackageReference Include="FluentAssertions">
+      <Version>5.3.2</Version>
+    </PackageReference>
+    <PackageReference Include="FsCheck.Xunit" Version="2.10.10" />
+    <PackageReference Include="NSubstitute">
+      <Version>3.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
+
+
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Neutronium.WPF\Neutronium.WPF.csproj">
-      <Project>{dcfc58e7-4d5b-43c5-827e-5d6f975f4995}</Project>
-      <Name>Neutronium.WPF</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Neutronium.Core\Neutronium.Core.csproj">
-      <Project>{9b18b122-a2fc-4537-ab68-5e1ec9959db8}</Project>
-      <Name>Neutronium.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Tests.Infra.HTMLEngineTesterHelper\WebBrowserEngineTesterHelper.csproj">
-      <Project>{335a20f1-f421-4eb1-9961-ee487350818e}</Project>
-      <Name>WebBrowserEngineTesterHelper</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Tests.Infra.JavascriptEngineTesterHelper\JavascriptFrameworkTesterHelper.csproj">
-      <Project>{25ec8826-104c-4346-b648-cf7ab591399a}</Project>
-      <Name>JavascriptFrameworkTesterHelper</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\..\Neutronium.WPF\Neutronium.WPF.csproj" />
+	  <ProjectReference Include="..\..\..\Neutronium.Core\Neutronium.Core.csproj" />
+	  <ProjectReference Include="..\Tests.Infra.HTMLEngineTesterHelper\WebBrowserEngineTesterHelper.csproj" />
+	  <ProjectReference Include="..\Tests.Infra.JavascriptEngineTesterHelper\JavascriptFrameworkTesterHelper.csproj" />
   </ItemGroup>
+
+
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System.Xaml" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
-  </Target>
-  <Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
diff --git a/Tests/Infra/Tests.Infra.IntegratedContextTesterHelper.Window/Properties/AssemblyInfo.cs b/Tests/Infra/Tests.Infra.IntegratedContextTesterHelper.Window/Properties/AssemblyInfo.cs
diff --git a/Tests/Infra/Tests.Infra.IntegratedContextTesterHelper.Window/app.config b/Tests/Infra/Tests.Infra.IntegratedContextTesterHelper.Window/app.config
diff --git a/Tests/Infra/Tests.Infra.IntegratedContextTesterHelper.Window/packages.config b/Tests/Infra/Tests.Infra.IntegratedContextTesterHelper.Window/packages.config
diff --git a/Tests/UniversalTests/NavigationTests/DoubleNavigationTests.cs b/Tests/UniversalTests/NavigationTests/DoubleNavigationTests.cs
@@ -32,16 +32,16 @@ protected override HTMLWindow GetNewHTMLControlBase(bool iDebug)
 
         internal void TestNavigation(Action<INavigationBuilder, HTMLWindow> test, bool iDebug = false, bool iManageLifeCycle = true)
         {
-            Action<HTMLWindow> simpleTest = (windowHtml) => test(windowHtml.NavigationBuilder, windowHtml);
+            void SimpleTest(HTMLWindow windowHtml) => test(windowHtml.NavigationBuilder, windowHtml);
 
-            base.Test(simpleTest, iDebug, iManageLifeCycle);
+            base.Test(SimpleTest, iDebug, iManageLifeCycle);
         }
 
         internal async Task TestNavigation(Func<INavigationBuilder, HTMLWindow, Task> test, bool iDebug = false, bool iManageLifeCycle = true)
         {
-            Func<HTMLWindow, WindowTest, Task> simpleTest = (windowHtml, windowTest) => test(windowHtml.NavigationBuilder, windowHtml);
+            Task SimpleTest(HTMLWindow windowHtml, WindowTest windowTest) => test(windowHtml.NavigationBuilder, windowHtml);
 
-            await base.Test(simpleTest, iDebug, iManageLifeCycle);
+            await base.Test(SimpleTest, iDebug, iManageLifeCycle);
         }
 
         private void SetUpRoute(INavigationBuilder builder, HTMLWindow wpfnav)
@@ -629,7 +629,7 @@ public void NavigateAsync_WhenNoMatchIsFound_ThrowException()
                 wpfnav.UseINavigable = true;
                 var a1 = new A2();
 
-                Func<Task> wf = () => wpfnav.NavigateAsync(a1);
+                Action wf = () =>  wpfnav.NavigateAsync(a1).Wait();
                 wf.Should().Throw<NeutroniumException>();
             });
         }
@@ -735,7 +735,7 @@ public void NavigateAsync_WhenTypeIsNotRegistered_ShouldThrowException()
                 wpfnav.UseINavigable = true;
                 var a1 = new object();
 
-                Func<Task> wf = async () => await wpfnav.NavigateAsync(a1);
+                Action wf = () => wpfnav.NavigateAsync(a1).Wait();
                 wf.Should().Throw<NeutroniumException>();
             });
         }