Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .justfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ clean:

test-platform: pack
cd test/mtp && dotnet clean ../Sample.Test/Sample.Test.fsproj -v:quiet
cd test/mtp && dotnet test ../Sample.Test/Sample.Test.fsproj -p:EnableExpectoTestingPlatformIntegration=true -p:IncludeFailingTests=false
cd test/mtp && dotnet test --project ../Sample.Test/Sample.Test.fsproj -p:EnableExpectoTestingPlatformIntegration=true -p:IncludeFailingTests=false

test-platform-failing: pack
cd test/mtp && dotnet clean ../Sample.Test/Sample.Test.fsproj -v:quiet
cd test/mtp && dotnet test ../Sample.Test/Sample.Test.fsproj -p:EnableExpectoTestingPlatformIntegration=true -p:IncludeFailingTests=true
cd test/mtp && dotnet test --project ../Sample.Test/Sample.Test.fsproj -p:EnableExpectoTestingPlatformIntegration=true -p:IncludeFailingTests=true

test-legacy: pack
dotnet clean ./test/Sample.Test/Sample.Test.fsproj -v:quiet
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.301",
"version": "10.0.109",
"rollForward": "latestMajor"
},
"msbuild-sdks": {
Expand Down
1 change: 1 addition & 0 deletions src/YoloDev.Expecto.TestSdk/YoloDev.Expecto.TestSdk.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<OutputType>Exe</OutputType>
<PackageId>$(MSBuildProjectName)</PackageId>
<IsTestingPlatformApplication>false</IsTestingPlatformApplication>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 3 additions & 4 deletions src/YoloDev.Expecto.TestSdk/adapter.fs
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ type VsTestAdapter() =
let logger = Logger(frameworkHandle, stopwatch)

let runSettings =
Option.ofObj runContext
|> Option.bind (fun c -> Option.ofObj c.RunSettings)
runContext.RunSettings |> Option.ofObj
|> Option.map (RunSettings.read logger)
|> Option.defaultValue RunSettings.defaultSettings

Expand All @@ -85,8 +84,8 @@ type VsTestAdapter() =
let logger = Logger(frameworkHandle, stopwatch)

let runSettings =
Option.ofObj runContext
|> Option.bind (fun c -> Option.ofObj c.RunSettings)
runContext.RunSettings
|> Option.ofObj
|> Option.map (RunSettings.read logger)
|> Option.map (RunSettings.filter runContext)
|> Option.defaultValue RunSettings.defaultSettings
Expand Down
4 changes: 2 additions & 2 deletions src/YoloDev.Expecto.TestSdk/helpers.fs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module internal YoloDev.Expecto.TestSdk.Helpers

[<RequireQualifiedAccess>]
module internal Guard =
let inline argNotNull (name: string) (arg: 'a) =
let inline argNotNull (name: string) (arg: 'a | null) : 'a =
match arg with
| null -> nullArg name
| _ -> arg
| notNull -> notNull

[<RequireQualifiedAccess>]
module internal Seq =
Expand Down
Loading