Skip to content

Commit

Permalink
Upgraded test projects to target .NET 4.5, FsCheck 2.0.6, and NUnit 2…
Browse files Browse the repository at this point in the history
….6.4.

In Reggie.Tests, implemented some FsCheck-based tests for Regex; however, these are currently ignored because they seem to run into an FsCheck memoization bug which causes FsCheck to crash and the tests to fail.
  • Loading branch information
jack-pappas committed Aug 16, 2015
1 parent b073cc8 commit ff3d97b
Show file tree
Hide file tree
Showing 17 changed files with 341 additions and 198 deletions.
9 changes: 5 additions & 4 deletions FSharpLex.Tests/FSharpLex.Tests.fsproj
Expand Up @@ -9,11 +9,12 @@
<OutputType>Library</OutputType>
<RootNamespace>FSharpLex.Tests</RootNamespace>
<AssemblyName>FSharpLex.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<Name>FSharpLex.Tests</Name>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -58,7 +59,7 @@
<Private>True</Private>
</Reference>
<Reference Include="FsCheck">
<HintPath>..\packages\FsCheck.0.9.2.0\lib\net40-Client\FsCheck.dll</HintPath>
<HintPath>..\packages\FsCheck.2.0.6.0\lib\net45\FsCheck.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Expand All @@ -70,7 +71,7 @@
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
6 changes: 4 additions & 2 deletions FSharpLex.Tests/app.config
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.1.0" />
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.1.0" />
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
Expand Down
4 changes: 2 additions & 2 deletions FSharpLex.Tests/packages.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ExtCore" version="0.8.43" targetFramework="net40" />
<package id="FsCheck" version="0.9.2.0" targetFramework="net40" />
<package id="FsCheck" version="2.0.6.0" targetFramework="net45" />
<package id="FsUnit" version="1.2.1.0" targetFramework="net40" />
<package id="NUnit" version="2.6.3" targetFramework="net40" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
</packages>
5 changes: 3 additions & 2 deletions FSharpYacc.Tests/FSharpYacc.Tests.fsproj
Expand Up @@ -9,11 +9,12 @@
<OutputType>Library</OutputType>
<RootNamespace>FSharpYacc.Tests</RootNamespace>
<AssemblyName>FSharpYacc.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<Name>FSharpYacc.Tests</Name>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -66,7 +67,7 @@
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
6 changes: 4 additions & 2 deletions FSharpYacc.Tests/app.config
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0" />
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0" />
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
Expand Down
2 changes: 1 addition & 1 deletion FSharpYacc.Tests/packages.config
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="ExtCore" version="0.8.43" targetFramework="net40" />
<package id="FsUnit" version="1.2.1.0" targetFramework="net40" />
<package id="NUnit" version="2.6.3" targetFramework="net40" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
</packages>
8 changes: 4 additions & 4 deletions Facio.Utilities.Testing/Facio.Utilities.Testing.fsproj
Expand Up @@ -9,11 +9,11 @@
<OutputType>Library</OutputType>
<RootNamespace>Facio.Utilities.Testing</RootNamespace>
<AssemblyName>Facio.Utilities.Testing</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<Name>Facio.Utilities.Testing</Name>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -54,15 +54,15 @@
</ItemGroup>
<ItemGroup>
<Reference Include="FsCheck">
<HintPath>..\packages\FsCheck.0.9.2.0\lib\net40-Client\FsCheck.dll</HintPath>
<HintPath>..\packages\FsCheck.2.0.6.0\lib\net45\FsCheck.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions Facio.Utilities.Testing/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FsCheck" version="0.9.2.0" targetFramework="net40" />
<package id="NUnit" version="2.6.3" targetFramework="net40" />
<package id="FsCheck" version="2.0.6.0" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
</packages>
5 changes: 3 additions & 2 deletions Graham.Tests/Graham.Tests.fsproj
Expand Up @@ -9,11 +9,12 @@
<OutputType>Library</OutputType>
<RootNamespace>Graham.Tests</RootNamespace>
<AssemblyName>Graham.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<Name>Graham.Tests</Name>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -71,7 +72,7 @@
</Reference>
<Reference Include="mscorlib" />
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
8 changes: 5 additions & 3 deletions Graham.Tests/app.config
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0" />
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0" />
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
Expand Down
2 changes: 1 addition & 1 deletion Graham.Tests/packages.config
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="ExtCore" version="0.8.43" targetFramework="net40" />
<package id="FsUnit" version="1.2.1.0" targetFramework="net40" />
<package id="NUnit" version="2.6.3" targetFramework="net40" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
</packages>

0 comments on commit ff3d97b

Please sign in to comment.