diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index ab4924b8..71134959 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,7 @@ -### 6.0.0.0-alpha1 - Dec 12, 2023 -- Migrate to NUnit 4. +### 6.0.0.0-alpha2 - Dec 15, 2023 +- Migrate to NUnit v4. +- [BREAKING] FsUnit (NUnit v4 as dependency) drops netstandard2.0 as target framework. +- Update dependencies to MsTest v3. ### 5.6.1.0 - Nov 29, 2023 - Set NUnit dependency < 4.0.0 to prevent compatibility issues. - (https://github.com/fsprojects/FsUnit/pull/257) diff --git a/paket.dependencies b/paket.dependencies index 778a3d32..d8cdf2e8 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -17,5 +17,5 @@ nuget xunit ~> 2.5.3 nuget xunit.runner.visualstudio // MsTest -nuget MSTest.TestFramework -nuget MSTest.TestAdapter ~> 2.1.2 +nuget MSTest.TestFramework ~> 3.0.4 +nuget MSTest.TestAdapter ~> 3.0.4 diff --git a/paket.lock b/paket.lock index cf34234a..b8960d21 100644 --- a/paket.lock +++ b/paket.lock @@ -14,10 +14,8 @@ NUGET Microsoft.TestPlatform.TestHost (17.8) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) Microsoft.TestPlatform.ObjectModel (>= 17.8) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - MSTest.TestAdapter (2.1.2) - NETStandard.Library (>= 1.6.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - System.Diagnostics.TextWriterTraceListener (>= 4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - MSTest.TestFramework (3.1.1) + MSTest.TestAdapter (3.0.4) + MSTest.TestFramework (3.0.4) NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) @@ -25,14 +23,7 @@ NUGET NuGet.Frameworks (6.8) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) NUnit (4.0.1) NUnit3TestAdapter (4.5) - runtime.native.System (4.3.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) - System.Collections (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) System.Collections.Immutable (8.0) System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) @@ -47,23 +38,6 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Diagnostics.TextWriterTraceListener (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - System.Diagnostics.TraceSource (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) - System.Diagnostics.TraceSource (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System (>= 4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) System.Globalization (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -105,7 +79,7 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) System.Runtime (>= 4.3.1) - System.Text.Encoding (4.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp1.0)) + System.Text.Encoding (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) diff --git a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj index aad23efb..3998f4d6 100644 --- a/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj +++ b/src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj @@ -5,7 +5,7 @@ false - true + false diff --git a/src/FsUnit.NUnit/paket.template b/src/FsUnit.NUnit/paket.template index 3e81e058..5b3bd82b 100644 --- a/src/FsUnit.NUnit/paket.template +++ b/src/FsUnit.NUnit/paket.template @@ -26,5 +26,5 @@ files ../../src/install.ps1 ==> tools dependencies - NUnit >= LOCKEDVERSION < 4.0.0 + NUnit >= LOCKEDVERSION FSharp.Core >= LOCKEDVERSION diff --git a/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj b/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj index 8e64e038..94f8a21b 100644 --- a/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj +++ b/tests/FsUnit.MsTest.Test/FsUnit.MsTest.Test.fsproj @@ -5,14 +5,14 @@ true - + - + - + @@ -33,9 +33,9 @@ - - - + + + diff --git a/tests/FsUnit.MsTest.Test/NaNTests.fs b/tests/FsUnit.MsTest.Test/NaNTests.fs index 0ebc4645..5463d170 100644 --- a/tests/FsUnit.MsTest.Test/NaNTests.fs +++ b/tests/FsUnit.MsTest.Test/NaNTests.fs @@ -5,7 +5,8 @@ open FsUnit.MsTest open System [] -type ``Not a Number tests``() = +type ``NotANumberTests``() = + [] member _.``Number 1 should be a number``() = 1 |> should not' (be NaN) @@ -15,9 +16,9 @@ type ``Not a Number tests``() = Double.NaN |> should be NaN [] - member _.``float number 2[dot]0 should be a number``() = + member _.``float number 2.0 should be a number``() = 2.0 |> should not' (be NaN) [] - member _.``float number 2[dot]0 should fail to not be a number``() = + member _.``float number 2.0 should fail to not be a number``() = shouldFail(fun () -> 2.0 |> should be NaN) diff --git a/tests/FsUnit.MsTest.Test/beAscendingTests.fs b/tests/FsUnit.MsTest.Test/beAscendingTests.fs index b217732b..b16f7537 100644 --- a/tests/FsUnit.MsTest.Test/beAscendingTests.fs +++ b/tests/FsUnit.MsTest.Test/beAscendingTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be ascending tests``() = +type ``beAscendingTests``() = + [] member _.``Empty list should be ascending``() = [] |> should be ascending diff --git a/tests/FsUnit.MsTest.Test/beChoice.fs b/tests/FsUnit.MsTest.Test/beChoiceTests.fs similarity index 99% rename from tests/FsUnit.MsTest.Test/beChoice.fs rename to tests/FsUnit.MsTest.Test/beChoiceTests.fs index 3867bab7..de4ec311 100644 --- a/tests/FsUnit.MsTest.Test/beChoice.fs +++ b/tests/FsUnit.MsTest.Test/beChoiceTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be choice tests``() = +type ``beChoiceTests``() = + [] member _.``Choice1Of2 should be the first choice``() = Choice.Choice1Of2(1) |> should be (choice 1) diff --git a/tests/FsUnit.MsTest.Test/beDescendingTests.fs b/tests/FsUnit.MsTest.Test/beDescendingTests.fs index 3db0dead..4da394fe 100644 --- a/tests/FsUnit.MsTest.Test/beDescendingTests.fs +++ b/tests/FsUnit.MsTest.Test/beDescendingTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be descending tests``() = +type ``beDescendingTests``() = + [] member _.``Empty list should be descending``() = [] |> should be descending diff --git a/tests/FsUnit.MsTest.Test/beEmptyStringTests.fs b/tests/FsUnit.MsTest.Test/beEmptyStringTests.fs index 408a503b..6202a724 100644 --- a/tests/FsUnit.MsTest.Test/beEmptyStringTests.fs +++ b/tests/FsUnit.MsTest.Test/beEmptyStringTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be EmptyString tests``() = +type ``beEmptyStringTests``() = + [] member _.``empty string should be EmptyString``() = "" |> should be NullOrEmptyString diff --git a/tests/FsUnit.MsTest.Test/beEmptyTests.fs b/tests/FsUnit.MsTest.Test/beEmptyTests.fs index 99f3c6af..76fd531a 100644 --- a/tests/FsUnit.MsTest.Test/beEmptyTests.fs +++ b/tests/FsUnit.MsTest.Test/beEmptyTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be Empty tests``() = +type ``beEmptyTests``() = + [] member _.``empty List should be Empty``() = [] |> should be Empty diff --git a/tests/FsUnit.MsTest.Test/beFalseTests.fs b/tests/FsUnit.MsTest.Test/beFalseTests.fs index 774082c7..fbe6bbab 100644 --- a/tests/FsUnit.MsTest.Test/beFalseTests.fs +++ b/tests/FsUnit.MsTest.Test/beFalseTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be False tests``() = +type ``beFalseTests``() = + [] member _.``false should be False``() = false |> should be False @@ -19,4 +20,4 @@ type ``be False tests``() = [] member _.``false should fail to not be False``() = - false |> should be False + shouldFail(fun () -> false |> should not' (be False)) diff --git a/tests/FsUnit.MsTest.Test/beGreaterThanOrEqualTo.fs b/tests/FsUnit.MsTest.Test/beGreaterThanOrEqualToTests.fs similarity index 75% rename from tests/FsUnit.MsTest.Test/beGreaterThanOrEqualTo.fs rename to tests/FsUnit.MsTest.Test/beGreaterThanOrEqualToTests.fs index df55925a..44725cd9 100644 --- a/tests/FsUnit.MsTest.Test/beGreaterThanOrEqualTo.fs +++ b/tests/FsUnit.MsTest.Test/beGreaterThanOrEqualToTests.fs @@ -4,13 +4,14 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be greaterThanOrEqualTo tests``() = +type ``beGreaterThanOrEqualToTests``() = + [] member _.``11 should be greater than 10``() = 11 |> should be (greaterThanOrEqualTo 10) [] - member _.``11[dot]1 should be greater than 11[dot]0``() = + member _.``11.1 should be greater than 11.0``() = 11.1 |> should be (greaterThanOrEqualTo 11.0) [] @@ -18,11 +19,11 @@ type ``be greaterThanOrEqualTo tests``() = 9 |> should not' (be greaterThanOrEqualTo 10) [] - member _.``9[dot]1 should not be greater than 9[dot]2``() = + member _.``9.1 should not be greater than 9.2``() = 9.1 |> should not' (be greaterThanOrEqualTo 9.2) [] - member _.``9[dot]2 should be equal to 9[dot]2``() = + member _.``9.2 should be equal to 9.2``() = 9.2 |> should be (greaterThanOrEqualTo 9.2) [] diff --git a/tests/FsUnit.MsTest.Test/beGreaterThanTests.fs b/tests/FsUnit.MsTest.Test/beGreaterThanTests.fs index 5eda716f..2ad248f1 100644 --- a/tests/FsUnit.MsTest.Test/beGreaterThanTests.fs +++ b/tests/FsUnit.MsTest.Test/beGreaterThanTests.fs @@ -4,14 +4,14 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be greaterThan tests``() = +type ``beGreaterThanTests``() = [] member _.``11 should be greater than 10``() = 11 |> should be (greaterThan 10) [] - member _.``11[dot]1 should be greater than 11[dot]0``() = + member _.``11.1 should be greater than 11.0``() = 11.1 |> should be (greaterThan 11.0) [] @@ -19,15 +19,15 @@ type ``be greaterThan tests``() = 9 |> should not' (be greaterThan 10) [] - member _.``9[dot]1 should not be greater than 9[dot]2``() = + member _.``9.1 should not be greater than 9.2``() = 9.1 |> should not' (be greaterThan 9.2) [] - member _.``9[dot]2 should not be greater than 9[dot]2``() = + member _.``9.2 should not be greater than 9.2``() = 9.2 |> should not' (be greaterThan 9.2) [] - member _.``9[dot]2 should not be greater than 9[dot]2 but message should be equal``() = + member _.``9.2 should not be greater than 9.2 but message should be equal``() = (fun () -> 9.2 |> should be (greaterThan 9.2)) |> fun f -> Assert.ThrowsException(f) |> fun e -> e.Message diff --git a/tests/FsUnit.MsTest.Test/beInRangeTests.fs b/tests/FsUnit.MsTest.Test/beInRangeTests.fs index 2993b7ab..4f98dd9b 100644 --- a/tests/FsUnit.MsTest.Test/beInRangeTests.fs +++ b/tests/FsUnit.MsTest.Test/beInRangeTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be inRange tests``() = +type ``beInRangeTests``() = + [] member _.``25 should be in range from 5 to 30``() = 25 |> should be (inRange 5 30) diff --git a/tests/FsUnit.MsTest.Test/beLessThanOrEqualToTests.fs b/tests/FsUnit.MsTest.Test/beLessThanOrEqualToTests.fs index 78d319cd..6d46bae4 100644 --- a/tests/FsUnit.MsTest.Test/beLessThanOrEqualToTests.fs +++ b/tests/FsUnit.MsTest.Test/beLessThanOrEqualToTests.fs @@ -4,13 +4,14 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be lessThanOrEqualTo tests``() = +type ``beLessThanOrEqualToTests``() = + [] member _.``10 should be less than 11``() = 10 |> should be (lessThanOrEqualTo 11) [] - member _.``10[dot]0 should be less than 10[dot]1``() = + member _.``10.0 should be less than 10.1``() = 10.0 |> should be (lessThanOrEqualTo 10.1) [] @@ -18,9 +19,9 @@ type ``be lessThanOrEqualTo tests``() = 10 |> should not' (be lessThanOrEqualTo 9) [] - member _.``9[dot]2 should not be less than 9[dot]1``() = + member _.``9.2 should not be less than 9.1``() = 9.2 |> should not' (be lessThanOrEqualTo 9.1) [] - member _.``9[dot]1 should be less than or equal to 9[dot]1``() = + member _.``9.1 should be less than or equal to 9.1``() = 9.1 |> should be (lessThanOrEqualTo 9.1) diff --git a/tests/FsUnit.MsTest.Test/beLessThanTests.fs b/tests/FsUnit.MsTest.Test/beLessThanTests.fs index ab57b684..15dd3a7c 100644 --- a/tests/FsUnit.MsTest.Test/beLessThanTests.fs +++ b/tests/FsUnit.MsTest.Test/beLessThanTests.fs @@ -4,13 +4,14 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be lessThan tests``() = +type ``beLessThanTests``() = + [] member _.``10 should be less than 11``() = 10 |> should be (lessThan 11) [] - member _.``10[dot]0 should be less than 10[dot]1``() = + member _.``10.0 should be less than 10.1``() = 10.0 |> should be (lessThan 10.1) [] @@ -18,9 +19,9 @@ type ``be lessThan tests``() = 10 |> should not' (be lessThan 9) [] - member _.``9[dot]2 should not be less than 9[dot]1``() = + member _.``9.2 should not be less than 9.1``() = 9.2 |> should not' (be lessThan 9.1) [] - member _.``9[dot]1 should not be less than 9[dot]1``() = + member _.``9.1 should not be less than 9.1``() = 9.1 |> should not' (be lessThan 9.1) diff --git a/tests/FsUnit.MsTest.Test/beNullOrEmptyStringTests.fs b/tests/FsUnit.MsTest.Test/beNullOrEmptyStringTests.fs index 775d1371..c436e473 100644 --- a/tests/FsUnit.MsTest.Test/beNullOrEmptyStringTests.fs +++ b/tests/FsUnit.MsTest.Test/beNullOrEmptyStringTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be NullOrEmptyString tests``() = +type ``beNullOrEmptyStringTests``() = + [] member _.``empty string should be NullOrEmptyString``() = "" |> should be NullOrEmptyString diff --git a/tests/FsUnit.MsTest.Test/beNullTests.fs b/tests/FsUnit.MsTest.Test/beNullTests.fs index fc1e3b33..7798b58f 100644 --- a/tests/FsUnit.MsTest.Test/beNullTests.fs +++ b/tests/FsUnit.MsTest.Test/beNullTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be Null tests``() = +type ``beNullTests``() = + [] member _.``null should be Null``() = null |> should be Null diff --git a/tests/FsUnit.MsTest.Test/beOfExactTypeTests.fs b/tests/FsUnit.MsTest.Test/beOfExactTypeTests.fs index b56e0046..2f93e1a5 100644 --- a/tests/FsUnit.MsTest.Test/beOfExactTypeTests.fs +++ b/tests/FsUnit.MsTest.Test/beOfExactTypeTests.fs @@ -4,13 +4,14 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``should be of exact type tests``() = +type ``beOfExactTypeTests``() = + [] member _.``empty string should be of exact type String``() = "" |> should be ofExactType [] - member _.``0[dot]0 should be of exact type float``() = + member _.``0.0 should be of exact type float``() = 0.0 |> should be ofExactType [] diff --git a/tests/FsUnit.MsTest.Test/beSameAsTests.fs b/tests/FsUnit.MsTest.Test/beSameAsTests.fs index 6c7d2b52..c38ed37a 100644 --- a/tests/FsUnit.MsTest.Test/beSameAsTests.fs +++ b/tests/FsUnit.MsTest.Test/beSameAsTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be SameAs tests``() = +type ``beSameAsTests``() = + let anObj = obj() let otherObj = obj() diff --git a/tests/FsUnit.MsTest.Test/beSubsetOfTests.fs b/tests/FsUnit.MsTest.Test/beSubsetOfTests.fs index 88b633f7..8d540977 100644 --- a/tests/FsUnit.MsTest.Test/beSubsetOfTests.fs +++ b/tests/FsUnit.MsTest.Test/beSubsetOfTests.fs @@ -4,38 +4,38 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be subsetOf tests``() = +type ``beSubsetOfTests``() = [] - member _.``5, 3 and 8 should be subset of 1 to 10``() = + member _.``[ 5; 3; 8 ] should be subset of [ 1..10 ]``() = [ 5; 3; 8 ] |> should be (subsetOf [ 1..10 ]) [] - member _.``5 should be subset of 1 to 10``() = + member _.``[ 5 ] should be subset of [ 1..10 ]``() = [ 5 ] |> should be (subsetOf [ 1..10 ]) [] - member _.``4 to 8 should be subset of 1 to 10``() = + member _.``{ 4..8 } should be subset of { 1..10 }``() = { 4..8 } |> should be (subsetOf { 1..10 }) [] - member _.``1 to 10 should be subset of 4, 1 and 7``() = - [| 1..10 |] |> should be (supersetOf [| 4; 1; 7 |]) + member _.``[| 4; 1; 7 |] should be subset of [| 1..10 |]``() = + [| 4; 1; 7 |] |> should be (subsetOf [| 1..10 |]) [] - member _.``5, 1 and 11 should not be subset of 1 to 10``() = + member _.``[ 5; 1; 11 ] should not be subset of [| 1..10 |]``() = [ 5; 1; 11 ] |> should not' (be subsetOf [| 1..10 |]) [] - member _.``1 to 10 should not be subset of 5``() = + member _.``[ 1..10 ] should not be subset of 5``() = [ 1..10 ] |> should not' (be subsetOf [ 5 ]) [] - member _.``1 to 10 should be subset of 1 to 10``() = + member _.``[ 1..10 ] should be subset of [ 1..10 ]``() = [ 1..10 ] |> should be (subsetOf [ 1..10 ]) [] - member _.``should fail on '1 to 11 should be subset of 1 to 10'``() = + member _.``should fail on "[ 1..11 ] should be subset of [ 1..10 ]"``() = shouldFail(fun () -> [ 1..11 ] |> should be (subsetOf [ 1..10 ])) [] diff --git a/tests/FsUnit.MsTest.Test/beSupersetOfTests.fs b/tests/FsUnit.MsTest.Test/beSupersetOfTests.fs index 2e00d591..68e2ee6f 100644 --- a/tests/FsUnit.MsTest.Test/beSupersetOfTests.fs +++ b/tests/FsUnit.MsTest.Test/beSupersetOfTests.fs @@ -4,36 +4,36 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be supersetOf tests``() = +type ``beSupersetOfTests``() = [] - member _.``1 to 10 should be superset of 5, 3 and 8``() = + member _.``[ 1..10 ] should be superset of [ 5; 3; 8 ]``() = [ 1..10 ] |> should be (supersetOf [ 5; 3; 8 ]) [] - member _.``1 to 10 should be superset of 5``() = + member _.``[ 1..10 ] should be superset of 5``() = [ 1..10 ] |> should be (supersetOf [ 5 ]) [] - member _.``1 to 10 should be superset of 4 to 8``() = + member _.``[ 1..10 ] should be superset of { 4..8 }``() = { 1..10 } |> should be (supersetOf { 4..8 }) [] - member _.``1 to 10 should be superset of 4, 1 and 7``() = + member _.``[ 1..10 ] should be superset of [| 4; 1; 7 |]``() = [| 1..10 |] |> should be (supersetOf [| 4; 1; 7 |]) [] - member _.``1 to 10 should not be superset of 5, 1 and 11``() = + member _.``[ 1..10 ] should not be superset of [ 5; 1; 11 ]``() = [ 1..10 ] |> should not' (be supersetOf [ 5; 1; 11 ]) [] - member _.``5 should not be superset of 1 to 10``() = + member _.``5 should not be superset of [ 1..10 ]``() = [ 5 ] |> should not' (be supersetOf [ 1..10 ]) [] - member _.``1 to 10 should be superset of 1 to 10``() = + member _.``1 to 10 should be superset of [ 1..10 ]``() = [ 1..10 ] |> should be (supersetOf [ 1..10 ]) [] - member _.``should fail on '1 to 10 should be superset of 1 to 11'``() = + member _.``should fail on "[ 1..10 ] should be superset of [ 1..11 ]"``() = shouldFail(fun () -> [ 1..10 ] |> should be (supersetOf [ 1..11 ])) diff --git a/tests/FsUnit.MsTest.Test/beTrueTests.fs b/tests/FsUnit.MsTest.Test/beTrueTests.fs index 96c8db54..1ab8f3df 100644 --- a/tests/FsUnit.MsTest.Test/beTrueTests.fs +++ b/tests/FsUnit.MsTest.Test/beTrueTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``be True tests``() = +type ``beTrueTests``() = + [] member _.``true should be True``() = true |> should be True @@ -18,5 +19,5 @@ type ``be True tests``() = false |> should not' (be True) [] - member _.``true should fail to not be True``() = - true |> should be True + member _.``false should fail to not be False``() = + shouldFail(fun () -> true |> should not' (be True)) diff --git a/tests/FsUnit.MsTest.Test/beUniqueTests.fs b/tests/FsUnit.MsTest.Test/beUniqueTests.fs index a34a2a91..75e7ca2a 100644 --- a/tests/FsUnit.MsTest.Test/beUniqueTests.fs +++ b/tests/FsUnit.MsTest.Test/beUniqueTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``have unique items list tests``() = +type ``haveUniqueTests``() = + [] member _.``empty list should be considered as unique``() = [] |> should be unique diff --git a/tests/FsUnit.MsTest.Test/containTests.fs b/tests/FsUnit.MsTest.Test/containTests.fs index 957b546a..7ee3b3cf 100644 --- a/tests/FsUnit.MsTest.Test/containTests.fs +++ b/tests/FsUnit.MsTest.Test/containTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``contain tests``() = +type ``containTests``() = + [] member _.``List with item should contain item``() = [ 1 ] |> should contain 1 diff --git a/tests/FsUnit.MsTest.Test/shouldEndWithTests.fs b/tests/FsUnit.MsTest.Test/endWithTests.fs similarity index 92% rename from tests/FsUnit.MsTest.Test/shouldEndWithTests.fs rename to tests/FsUnit.MsTest.Test/endWithTests.fs index 86f42ad9..086727ac 100644 --- a/tests/FsUnit.MsTest.Test/shouldEndWithTests.fs +++ b/tests/FsUnit.MsTest.Test/endWithTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``should endWith tests``() = +type ``endWithTests``() = + [] member _.``empty string should end with ""``() = "" |> should endWith "" diff --git a/tests/FsUnit.MsTest.Test/equalSeqTests.fs b/tests/FsUnit.MsTest.Test/equalSeqTests.fs index a956630c..bb0fea9e 100644 --- a/tests/FsUnit.MsTest.Test/equalSeqTests.fs +++ b/tests/FsUnit.MsTest.Test/equalSeqTests.fs @@ -4,7 +4,7 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``equalSeq Tests``() = +type ``equalSeqTests``() = [] member _.``sequence should equal sequence``() = diff --git a/tests/FsUnit.MsTest.Test/equalTests.fs b/tests/FsUnit.MsTest.Test/equalTests.fs index 210eb071..ec328efd 100644 --- a/tests/FsUnit.MsTest.Test/equalTests.fs +++ b/tests/FsUnit.MsTest.Test/equalTests.fs @@ -14,7 +14,8 @@ type NeverEqual() = override this.GetHashCode() = 1 [] -type ``equal Tests``() = +type ``equalTests``() = + let anObj = obj() let otherObj = obj() let anImmutableArray = ImmutableArray.Create(1, 2, 3) @@ -50,7 +51,7 @@ type ``equal Tests``() = { 1..10 } |> should equivalent { 10..-1..1 } [] - member _.``collection should fail on '1 to 10 should not equivalent of 1 to 10'``() = + member _.``collection should fail on "[ 1..10 ] should not equivalent of [ 1..10 ]"``() = shouldFail(fun () -> [ 1..10 ] |> should not' (equivalent [ 1..10 ])) [] @@ -58,7 +59,7 @@ type ``equal Tests``() = [| 1; 4; 8 |] |> should equivalent [| 4; 8; 1 |] [] - member _.``equivalent should fail on '[1..10] |> should equivalent []'``() = + member _.``equivalent should fail on "[1..10] |> should equivalent []"``() = shouldFail(fun () -> [ 1..10 ] |> should equivalent []) [] diff --git a/tests/FsUnit.MsTest.Test/equalWithinTests.fs b/tests/FsUnit.MsTest.Test/equalWithinTests.fs index c5fd030b..e9d6227d 100644 --- a/tests/FsUnit.MsTest.Test/equalWithinTests.fs +++ b/tests/FsUnit.MsTest.Test/equalWithinTests.fs @@ -3,10 +3,9 @@ namespace FsUnit.Test open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest -(* Thanks to erdoll for this suggestion: https://fsunit.codeplex.com/discussions/269320 *) - [] -type ``equalWithin tests``() = +type ``equalWithinTests``() = + [] member _.``should equal within tolerance``() = 10.1 |> should (equalWithin 0.1) 10.11 diff --git a/tests/FsUnit.MsTest.Test/haveCountTests.fs b/tests/FsUnit.MsTest.Test/haveCountTests.fs index 8ac86333..5d1ac846 100644 --- a/tests/FsUnit.MsTest.Test/haveCountTests.fs +++ b/tests/FsUnit.MsTest.Test/haveCountTests.fs @@ -4,11 +4,10 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``have Count tests``() = - let emptyList = System.Collections.Generic.List() +type ``haveCountTests``() = + let emptyList = System.Collections.Generic.List() let singleItemList = System.Collections.Generic.List() - do singleItemList.Add(1) // Collection diff --git a/tests/FsUnit.MsTest.Test/haveLengthTests.fs b/tests/FsUnit.MsTest.Test/haveLengthTests.fs index 2696bb62..127df44e 100644 --- a/tests/FsUnit.MsTest.Test/haveLengthTests.fs +++ b/tests/FsUnit.MsTest.Test/haveLengthTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``haveLength tests``() = +type ``haveLengthTests``() = + // F# List [] member _.``List with 1 item should have Length 1``() = diff --git a/tests/FsUnit.MsTest.Test/shouldHaveSubstringTests.fs b/tests/FsUnit.MsTest.Test/haveSubstringTests.fs similarity index 91% rename from tests/FsUnit.MsTest.Test/shouldHaveSubstringTests.fs rename to tests/FsUnit.MsTest.Test/haveSubstringTests.fs index 4dd7397f..0b1f3e02 100644 --- a/tests/FsUnit.MsTest.Test/shouldHaveSubstringTests.fs +++ b/tests/FsUnit.MsTest.Test/haveSubstringTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``should haveSubstring tests``() = +type ``haveSubstringTests``() = + [] member _.``empty string should contain ""``() = "" |> should haveSubstring "" diff --git a/tests/FsUnit.MsTest.Test/instanceOfTests.fs b/tests/FsUnit.MsTest.Test/instanceOfTests.fs index a23da3bb..2bad7982 100644 --- a/tests/FsUnit.MsTest.Test/instanceOfTests.fs +++ b/tests/FsUnit.MsTest.Test/instanceOfTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``Instance Of tests``() = +type ``instanceOfTypeTests``() = + [] member _.``int should be instance of type Object``() = 1 |> should be instanceOfType diff --git a/tests/FsUnit.MsTest.Test/matchListTests.fs b/tests/FsUnit.MsTest.Test/matchListTests.fs index 78705e76..b0c357f3 100755 --- a/tests/FsUnit.MsTest.Test/matchListTests.fs +++ b/tests/FsUnit.MsTest.Test/matchListTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``match List tests``() = +type ``matchListTests``() = + [] member _.``Empty list should match itself``() = ([]: List) |> should matchList ([]: List) @@ -30,11 +31,11 @@ type ``match List tests``() = [ 10; 12; 25 ] |> should matchList [ 10; 12; 25 ] [] - member _.``Three element list should match it's permutation``() = + member _.``Three element list should match its permutation``() = [ 25; 12; 18 ] |> should matchList [ 18; 12; 25 ] [] - member _.``Lists with different lengths doesn't match``() = + member _.``Lists with different lengths doesnt match``() = [ "something", "is", "missed" ] |> should not' (matchList [ "something", "is", "missed", "here" ]) diff --git a/tests/FsUnit.MsTest.Test/ofCase.fs b/tests/FsUnit.MsTest.Test/ofCaseTests.fs similarity index 98% rename from tests/FsUnit.MsTest.Test/ofCase.fs rename to tests/FsUnit.MsTest.Test/ofCaseTests.fs index 2987b3b1..a398185e 100644 --- a/tests/FsUnit.MsTest.Test/ofCase.fs +++ b/tests/FsUnit.MsTest.Test/ofCaseTests.fs @@ -9,7 +9,7 @@ type TestUnion = | Third of string [] -type ``ofCase tests``() = +type ``ofCaseTests``() = [] member _.``Given a (parameterless) union case of matching case returns true``() = diff --git a/tests/FsUnit.MsTest.Test/raiseTests.fs b/tests/FsUnit.MsTest.Test/raiseTests.fs index 8b1abb35..7126a732 100644 --- a/tests/FsUnit.MsTest.Test/raiseTests.fs +++ b/tests/FsUnit.MsTest.Test/raiseTests.fs @@ -10,7 +10,7 @@ type ApplicationException(msg: string) = inherit Exception(msg) [] -type ``raise tests``() = +type ``raiseTests``() = [] member _.``should pass when exception of expected type is thrown``() = diff --git a/tests/FsUnit.MsTest.Test/shouldFailTests.fs b/tests/FsUnit.MsTest.Test/shouldFailTests.fs index d576cea8..40324799 100644 --- a/tests/FsUnit.MsTest.Test/shouldFailTests.fs +++ b/tests/FsUnit.MsTest.Test/shouldFailTests.fs @@ -5,7 +5,8 @@ open FsUnit.MsTest open System [] -type ``shouldFail tests``() = +type ``shouldFailTests``() = + [] member _.``empty List should fail to contain item``() = shouldFail(fun () -> [] |> should contain 1) diff --git a/tests/FsUnit.MsTest.Test/shouldStartWithTests.fs b/tests/FsUnit.MsTest.Test/startWithTests.fs similarity index 95% rename from tests/FsUnit.MsTest.Test/shouldStartWithTests.fs rename to tests/FsUnit.MsTest.Test/startWithTests.fs index 8baffe9d..ba2320ba 100644 --- a/tests/FsUnit.MsTest.Test/shouldStartWithTests.fs +++ b/tests/FsUnit.MsTest.Test/startWithTests.fs @@ -4,7 +4,8 @@ open Microsoft.VisualStudio.TestTools.UnitTesting open FsUnit.MsTest [] -type ``should startWith tests``() = +type ``startWithTests``() = + [] member _.``empty string should start with ""``() = "" |> should startWith ""