Skip to content

Commit 5f03310

Browse files
Krzysztof-CieslakKrzysztof-Cieslak
committed
Code coverage changes
Disable code coverage by default Don't copy coverlet targets if code coverage is turned off Add code coverage to settings
1 parent a22ab87 commit 5f03310

File tree

4 files changed

+42
-33
lines changed

4 files changed

+42
-33
lines changed

‎release/package.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
"type": "boolean",
5858
"default": true,
5959
"description": "Enable Neptunes telemetry"
60+
},
61+
"Neptune.enableCodeCoverage": {
62+
"type": "boolean",
63+
"default": false,
64+
"description": "Enable Neptunes code coverage feature"
6065
}
6166
}
6267
},

‎src/TestExplorer.fs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
702702
handleTestResults n
703703
)
704704
|> Promise.onSuccess (fun _ ->
705-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
705+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
706706
if cfg then
707707
msgHandler |> report collectCoverageMsg
708708
runnerRegister.Values
@@ -757,7 +757,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
757757
handleTestResults n
758758
)
759759
|> Promise.onSuccess (fun _ ->
760-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
760+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
761761
if cfg then
762762
msgHandler |> report collectCoverageMsg
763763
runnerRegister.Values
@@ -815,7 +815,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
815815
handleTestResults n
816816
)
817817
|> Promise.onSuccess (fun _ ->
818-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
818+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
819819
if cfg then
820820
msgHandler |> report collectCoverageMsg
821821
runnerRegister.Values
@@ -873,7 +873,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
873873
handleTestResults n
874874
)
875875
|> Promise.onSuccess (fun _ ->
876-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
876+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
877877
if cfg then
878878
msgHandler |> report collectCoverageMsg
879879
runnerRegister.Values
@@ -912,7 +912,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
912912
|> Promise.onSuccess (fun _ ->
913913
projects
914914
|> Seq.iter (fun prj ->
915-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
915+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
916916
if cfg then
917917
msgHandler |> report collectCoverageMsg
918918
runnerRegister.Values
@@ -950,7 +950,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
950950
|> Promise.onSuccess (fun _ ->
951951
projects
952952
|> Seq.iter (fun prj ->
953-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
953+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
954954
if cfg then
955955
msgHandler |> report collectCoverageMsg
956956
runnerRegister.Values
@@ -994,7 +994,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
994994
|> Promise.onSuccess (fun _ ->
995995
projectsWithTests
996996
|> Seq.iter (fun (prj,_) ->
997-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
997+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
998998
if cfg then
999999
msgHandler |> report collectCoverageMsg
10001000
runnerRegister.Values
@@ -1038,7 +1038,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
10381038
|> Promise.onSuccess (fun _ ->
10391039
projectsWithTests
10401040
|> Seq.iter (fun (prj,_) ->
1041-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
1041+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
10421042
if cfg then
10431043
msgHandler |> report collectCoverageMsg
10441044
runnerRegister.Values
@@ -1096,7 +1096,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
10961096
|> Promise.onSuccess (fun _ ->
10971097
projectsWithTests
10981098
|> Seq.iter (fun (prj,_) ->
1099-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
1099+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
11001100
if cfg then
11011101
msgHandler |> report collectCoverageMsg
11021102
runnerRegister.Values
@@ -1152,7 +1152,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
11521152
|> Promise.onSuccess (fun _ ->
11531153
projectsWithTests
11541154
|> Seq.iter (fun (prj,_) ->
1155-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
1155+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
11561156
if cfg then
11571157
msgHandler |> report collectCoverageMsg
11581158
runnerRegister.Values
@@ -1206,7 +1206,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
12061206
|> Promise.onSuccess (fun _ ->
12071207
projectsWithTests
12081208
|> Seq.iter (fun (prj,_) ->
1209-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
1209+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
12101210
if cfg then
12111211
msgHandler |> report collectCoverageMsg
12121212
runnerRegister.Values
@@ -1259,7 +1259,7 @@ let activate selector (context: ExtensionContext) (reporter : IReporter) =
12591259
|> Promise.onSuccess (fun _ ->
12601260
projectsWithTests
12611261
|> Seq.iter (fun (prj,_) ->
1262-
let cfg = Configuration.get true "Neptune.enableCodeCoverage"
1262+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
12631263
if cfg then
12641264
msgHandler |> report collectCoverageMsg
12651265
runnerRegister.Values

‎src/fsharp/ExpectoRunner.fs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,19 @@ let getErrors () =
129129
| _ -> [||]
130130

131131
let buildProjs api projs =
132-
projs
133-
|> List.iter (fun n ->
134-
match n.Info with
135-
| ProjectResponseInfo.DotnetSdk z when z.TargetFrameworkIdentifier <> ".NETFramework" ->
136-
let name = Path.basename(n.Project)
137-
let targPath = Path.join(Path.dirname n.Project, "obj", name + ".neptune.targets")
138-
let content = targetFileContent (Path.join(pluginPath, "bin_coverlet"))
139-
Fs.writeFileSync(targPath, content)
140-
141-
| _ ->()
142-
)
132+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
133+
if cfg then
134+
projs
135+
|> List.iter (fun n ->
136+
match n.Info with
137+
| ProjectResponseInfo.DotnetSdk z when z.TargetFrameworkIdentifier <> ".NETFramework" ->
138+
let name = Path.basename(n.Project)
139+
let targPath = Path.join(Path.dirname n.Project, "obj", name + ".neptune.targets")
140+
let content = targetFileContent (Path.join(pluginPath, "bin_coverlet"))
141+
Fs.writeFileSync(targPath, content)
142+
143+
| _ ->()
144+
)
143145

144146
projs
145147
|> List.fold (fun p proj -> p |> Promise.bind (fun code ->

‎src/fsharp/VSTestRunner.fs‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,18 @@ let convert = Globals.require.Invoke "xml-js" |> unbox<obj>
3131

3232

3333
let buildProjs api projs =
34-
projs
35-
|> List.iter (fun n ->
36-
match n.Info with
37-
| ProjectResponseInfo.DotnetSdk z when z.TargetFrameworkIdentifier <> ".NETFramework" ->
38-
let name = Path.basename(n.Project)
39-
let targPath = Path.join(Path.dirname n.Project, "obj", name + ".neptune.targets")
40-
let content = targetFileContent (Path.join(pluginPath, "bin_coverlet"))
41-
Fs.writeFileSync(targPath, content)
42-
| _ -> ()
43-
)
34+
let cfg = Configuration.get false "Neptune.enableCodeCoverage"
35+
if cfg then
36+
projs
37+
|> List.iter (fun n ->
38+
match n.Info with
39+
| ProjectResponseInfo.DotnetSdk z when z.TargetFrameworkIdentifier <> ".NETFramework" ->
40+
let name = Path.basename(n.Project)
41+
let targPath = Path.join(Path.dirname n.Project, "obj", name + ".neptune.targets")
42+
let content = targetFileContent (Path.join(pluginPath, "bin_coverlet"))
43+
Fs.writeFileSync(targPath, content)
44+
| _ -> ()
45+
)
4446

4547
projs
4648
|> List.fold (fun p proj -> p |> Promise.bind (fun code ->

0 commit comments

Comments
 (0)