Skip to content

Commit 2c76cb1

Browse files
committed
fix tests
1 parent 0778eb7 commit 2c76cb1

16 files changed

Lines changed: 75 additions & 364 deletions

File tree

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,7 @@ release.cmd
4444
.fake/*
4545
docs/output/*
4646

47+
*.ncrunchproject
48+
*.ncrunchsolution
49+
tmp.bin
50+
tmp.txt

FSharpx.Extras.Tests/app.config

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<Paket>True</Paket>
7-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
8-
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0" />
9-
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0" />
10-
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0" />
11-
</dependentAssembly>
12-
</assemblyBinding>
13-
</runtime>
4+
5+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6+
<dependentAssembly>
7+
<Paket>True</Paket>
8+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
9+
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
10+
</dependentAssembly>
11+
</assemblyBinding></runtime>
1412
<startup>
1513
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
1614
</startup>

FSharpx.Extras.sln

Lines changed: 34 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 2013
44
VisualStudioVersion = 12.0.31101.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{50709973-279A-4DF0-AF26-8C7535C7C9AE}"
@@ -11,12 +11,12 @@ EndProject
1111
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{722621A6-FA45-4129-8B8D-94880DCD7971}"
1212
ProjectSection(SolutionItems) = preProject
1313
build.fsx = build.fsx
14+
src\FSharpx.Extras\FSharpx.Extras.paket.template = src\FSharpx.Extras\FSharpx.Extras.paket.template
15+
src\FSharpx.Text.StructuredFormat\FSharpx.Text.StructuredFormat.paket.template = src\FSharpx.Text.StructuredFormat\FSharpx.Text.StructuredFormat.paket.template
1416
docs\tools\generate.fsx = docs\tools\generate.fsx
1517
docs\content\index.fsx = docs\content\index.fsx
1618
LICENSE.md = LICENSE.md
1719
README.md = README.md
18-
src\FSharpx.Extras\FSharpx.Extras.paket.template = src\FSharpx.Extras\FSharpx.Extras.paket.template
19-
src\FSharpx.Text.StructuredFormat\FSharpx.Text.StructuredFormat.paket.template = src\FSharpx.Text.StructuredFormat\FSharpx.Text.StructuredFormat.paket.template
2020
EndProjectSection
2121
EndProject
2222
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Tests", "tests\FSharpx.Tests\FSharpx.Tests.fsproj", "{26D9D3EE-E882-43E6-A79E-5D1D89E92C4F}"
@@ -45,12 +45,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{EFB3
4545
docs\content\WebProxy.fsx = docs\content\WebProxy.fsx
4646
EndProjectSection
4747
EndProject
48-
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FSharpx.Extras.Tests", "FSharpx.Extras.Tests\FSharpx.Extras.Tests.fsproj", "{AD500A06-96ED-408C-9472-262CDC2A119B}"
48+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Extras.Tests", "FSharpx.Extras.Tests\FSharpx.Extras.Tests.fsproj", "{AD500A06-96ED-408C-9472-262CDC2A119B}"
4949
EndProject
5050
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpx.Text.StructuredFormat", "src\FSharpx.Text.StructuredFormat\FSharpx.Text.StructuredFormat.fsproj", "{65E077ED-F51A-42D7-8004-E90D60AF8B8F}"
5151
EndProject
52-
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FSharpx.Text.StructuredFormat.Tests", "tests\FSharpx.Text.StructuredFormat.Tests\FSharpx.Text.StructuredFormat.Tests.fsproj", "{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}"
53-
EndProject
5452
Global
5553
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5654
DataStructures|Any CPU = DataStructures|Any CPU
@@ -64,21 +62,6 @@ Global
6462
Release|x86 = Release|x86
6563
EndGlobalSection
6664
GlobalSection(ProjectConfigurationPlatforms) = postSolution
67-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
68-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
69-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
70-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU
71-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|x86.ActiveCfg = Debug|Any CPU
72-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
73-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
74-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
75-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
76-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|x86.ActiveCfg = Debug|Any CPU
77-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Any CPU.Build.0 = Release|Any CPU
79-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
80-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
81-
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|x86.ActiveCfg = Release|Any CPU
8265
{26D9D3EE-E882-43E6-A79E-5D1D89E92C4F}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
8366
{26D9D3EE-E882-43E6-A79E-5D1D89E92C4F}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
8467
{26D9D3EE-E882-43E6-A79E-5D1D89E92C4F}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -109,21 +92,21 @@ Global
10992
{4354A199-6ACF-4DB5-A8FA-BAD638D1D0E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
11093
{4354A199-6ACF-4DB5-A8FA-BAD638D1D0E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
11194
{4354A199-6ACF-4DB5-A8FA-BAD638D1D0E3}.Release|x86.ActiveCfg = Release|Any CPU
112-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
113-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
114-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
115-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU
116-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|x86.ActiveCfg = Debug|Any CPU
117-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
119-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
120-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
121-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|x86.ActiveCfg = Debug|Any CPU
122-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
123-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|Any CPU.Build.0 = Release|Any CPU
124-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
125-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
126-
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|x86.ActiveCfg = Release|Any CPU
95+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
96+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
97+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
98+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU
99+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.DataStructures|x86.ActiveCfg = Debug|Any CPU
100+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
101+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
102+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
103+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
104+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Debug|x86.ActiveCfg = Debug|Any CPU
105+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
106+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Any CPU.Build.0 = Release|Any CPU
107+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
108+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
109+
{1E95A279-C2A9-498B-BC72-6E7A0D6854CE}.Release|x86.ActiveCfg = Release|Any CPU
127110
{AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
128111
{AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
129112
{AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -139,23 +122,21 @@ Global
139122
{AD500A06-96ED-408C-9472-262CDC2A119B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
140123
{AD500A06-96ED-408C-9472-262CDC2A119B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
141124
{AD500A06-96ED-408C-9472-262CDC2A119B}.Release|x86.ActiveCfg = Release|Any CPU
142-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
143-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
144-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
145-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU
146-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.DataStructures|x86.ActiveCfg = Debug|Any CPU
147-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
148-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
149-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
150-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
151-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Debug|x86.ActiveCfg = Debug|Any CPU
152-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
153-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Release|Any CPU.Build.0 = Release|Any CPU
154-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
155-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
156-
{FBE1E618-4F32-4305-95C0-B0FFBAD24EF7}.Release|x86.ActiveCfg = Release|Any CPU
157-
EndGlobalSection
158-
GlobalSection(NestedProjects) = preSolution
125+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
126+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
127+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
128+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|Mixed Platforms.Build.0 = Debug|Any CPU
129+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.DataStructures|x86.ActiveCfg = Debug|Any CPU
130+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
132+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
133+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
134+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Debug|x86.ActiveCfg = Debug|Any CPU
135+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
136+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|Any CPU.Build.0 = Release|Any CPU
137+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
138+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
139+
{65E077ED-F51A-42D7-8004-E90D60AF8B8F}.Release|x86.ActiveCfg = Release|Any CPU
159140
EndGlobalSection
160141
GlobalSection(SolutionProperties) = preSolution
161142
HideSolutionNode = FALSE

build.fsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ open Fake
55
open Fake.Git
66
open Fake.ReleaseNotesHelper
77
open System.IO
8+
open Fake.Testing
89

910

1011
let net45 = "v4.5"
@@ -73,8 +74,6 @@ Target "AssemblyInfo" (fun _ ->
7374
AssemblyDescription = getPackageDesc "FSharpx.Text.StructuredFormat"
7475
Guid = "65e077ed-f51a-42d7-8004-e90d60af8b8f"
7576
OutputFileName = "./src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs" })
76-
77-
7877
)
7978

8079

@@ -90,10 +89,7 @@ Target "Test" (fun _ ->
9089
for fxVersion in [net45] do
9190
printfn "buildDirVer fxVersion = %s" (buildDirVer fxVersion)
9291
!! (buildDirVer fxVersion @@ "*.Tests.dll")
93-
|> NUnit (fun p ->
94-
{p with
95-
DisableShadowCopy = true
96-
OutputFile = buildDirVer fxVersion @@ sprintf "TestResults.%s.xml" fxVersion }))
92+
|> NUnit3 id)
9793

9894

9995
Target "PaketPack" (fun _ ->

paket.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
NUGET
22
remote: https://www.nuget.org/api/v2
3-
FAKE (4.11)
3+
FAKE (4.38)
44
FsCheck (2.6)
55
FSharp.Core (>= 3.1.2.5)
66
FSharp.Compiler.Service (0.0.59)

src/FSharpx.Extras/AssemblyInfo.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ It currently implements:
3232

3333
[<assembly: AssemblyProduct ("FSharpx.Extras")>]
3434

35-
[<assembly: AssemblyVersion ("1.10.3")>]
35+
[<assembly: AssemblyVersion ("2.0.0")>]
3636

37-
[<assembly: AssemblyFileVersion ("1.10.3")>]
37+
[<assembly: AssemblyFileVersion ("2.0.0")>]
3838

3939
[<assembly: AssemblyDelaySign (false)>]
4040

src/FSharpx.Extras/app.config

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<Paket>True</Paket>
7-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
8-
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0" />
9-
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0" />
10-
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0" />
11-
</dependentAssembly>
12-
</assemblyBinding>
13-
</runtime>
4+
5+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6+
<dependentAssembly>
7+
<Paket>True</Paket>
8+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
9+
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
10+
</dependentAssembly>
11+
</assemblyBinding></runtime>
1412
<startup>
1513
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
1614
</startup>

src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ This library provides data structures and functoins for pretty printers.")>]
2626

2727
[<assembly: AssemblyProduct ("FSharpx.Text.StructuredFormat")>]
2828

29-
[<assembly: AssemblyVersion ("1.10.3")>]
29+
[<assembly: AssemblyVersion ("2.0.0")>]
3030

31-
[<assembly: AssemblyFileVersion ("1.10.3")>]
31+
[<assembly: AssemblyFileVersion ("2.0.0")>]
3232

3333
[<assembly: AssemblyDelaySign (false)>]
3434

src/FSharpx.Text.StructuredFormat/FSharpx.Text.StructuredFormat.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<RootNamespace>FSharpx.Text.StructuredFormat</RootNamespace>
1111
<AssemblyName>FSharpx.Text.StructuredFormat</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<TargetFSharpCoreVersion>4.3.0.0</TargetFSharpCoreVersion>
1414
<Name>FSharpx.Text.StructuredFormat</Name>
1515
<TargetFrameworkProfile>

tests/FSharpx.CSharpTests/AsyncTests.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@ public void Parallel() {
3535
var urls = FSharpList.Create(
3636
"http://www.google.com"
3737
, "http://www.bing.com"
38-
, "http://www.yahoo.com"
3938
, "http://www.microsoft.com"
4039
);
4140
var result = urls.Select(Get).Parallel()
4241
.Select(s => string.Join("", s))
4342
.Run();
4443
var rx = new Regex(@"<html");
45-
Assert.AreEqual(4, rx.Matches(result).Count);
44+
Assert.AreEqual(3, rx.Matches(result).Count);
4645
}
4746

4847
[Test]
@@ -57,13 +56,6 @@ public void ToAsync() {
5756
FSharpAsync<Func<int>> fa = FSharpAsyncEx.Return(L.F(() => 1));
5857
}
5958

60-
[Test]
61-
public void Protect() {
62-
Get("http://www.google.comco").Protect().Run()
63-
.Match(result => Assert.Fail("request should have failed"),
64-
e => { });
65-
}
66-
6759
[Test]
6860
public void Example() {
6961
var urls = FSharpList.Create(

0 commit comments

Comments
 (0)