Skip to content

Commit 7703993

Browse files
committed
Remove obsolete tests
1 parent df9fc49 commit 7703993

File tree

2 files changed

+23
-50
lines changed

2 files changed

+23
-50
lines changed

integrationtests/Paket.IntegrationTests/BindingRedirect.fs

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ open System.Text.RegularExpressions
88
open Paket
99

1010
[<Test>]
11-
let ``install should redirect required assemblies only``() =
11+
let ``install should redirect required assemblies only``() =
1212
use __ = paket "install --redirects --createnewbindingfiles" "i001187-binding-redirect" |> fst
1313

1414
let path = Path.Combine(scenarioTempPath "i001187-binding-redirect")
@@ -86,9 +86,9 @@ let ``#2408 should report wrong app.config parsing``() =
8686
failwith "paket should fail"
8787
with
8888
| exn when exn.Message.Contains("Project1") && exn.Message.Contains("app.config") -> ()
89-
89+
9090
[<Test>]
91-
let ``#1218 install should replace paket's binding redirects with required only``() =
91+
let ``#1218 install should replace paket's binding redirects with required only``() =
9292
use __ = paket "install --redirects --createnewbindingfiles" "i001218-binding-redirect" |> fst
9393

9494
let path = Path.Combine(scenarioTempPath "i001218-binding-redirect")
@@ -166,25 +166,7 @@ let ``#1218 install should replace paket's binding redirects with required only`
166166

167167

168168
[<Test>]
169-
let ``#1270 force redirects``() =
170-
use __ = paket "install --createnewbindingfiles" "i001270-force-redirects" |> fst
171-
let path = Path.Combine(scenarioTempPath "i001270-force-redirects")
172-
let configPath = Path.Combine(path, "MyClassLibrary", "MyClassLibrary", "app.config")
173-
174-
let ``FSharp.Core`` = """<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />"""
175-
let AlphaFS = """<assemblyIdentity name="AlphaFS" publicKeyToken="4d31a58f7d7ad5c9" culture="neutral" />"""
176-
let ``Newtonsoft.Json`` = """<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />"""
177-
let ``Newtonsoft.Json.Schema`` = """<assemblyIdentity name="Newtonsoft.Json.Schema" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />"""
178-
179-
let config = File.ReadAllText(configPath)
180-
181-
config |> shouldContainText ``FSharp.Core``
182-
config.Contains AlphaFS |> shouldEqual false
183-
config.Contains ``Newtonsoft.Json`` |> shouldEqual false
184-
config.Contains ``Newtonsoft.Json.Schema`` |> shouldEqual false
185-
186-
[<Test>]
187-
let ``#1270 redirects from references``() =
169+
let ``#1270 redirects from references``() =
188170
use __ = paket "install --createnewbindingfiles" "i001270-force-redirects" |> fst
189171
let path = Path.Combine(scenarioTempPath "i001270-force-redirects")
190172
let configPath = Path.Combine(path, "MyClassLibrary", "MyClassLibrary2", "app.config")
@@ -202,7 +184,7 @@ let ``#1270 redirects from references``() =
202184
config.Contains ``Newtonsoft.Json`` |> shouldEqual false
203185

204186
[<Test>]
205-
let ``#1574 redirects GAC``() =
187+
let ``#1574 redirects GAC``() =
206188
use __ = paket "install --clean-redirects" "i001574-redirect-gac" |> fst
207189
let path = Path.Combine(scenarioTempPath "i001574-redirect-gac")
208190
let configPath = Path.Combine(path, "BindingRedirectPaketBug", "App.config")
@@ -220,26 +202,24 @@ let ``#1621 generates binding redirect when references project with another targ
220202
use __ = install scenario |> fst
221203
let ``NUnit`` = """<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />"""
222204
let ``NUnit correct version`` = "newVersion=\"3.0.5813.39031\""
223-
205+
224206
let path = Path.Combine(scenarioTempPath scenario, "projectB")
225207
let configPath = Path.Combine(path, "app.config")
226208

227209
let config = File.ReadAllText(configPath) |> normalizeLineEndings
228-
210+
229211
config |> shouldContainText ``NUnit``
230212
config |> shouldContainText ``NUnit correct version``
231213

232214
[<Test>]
233215
let ``#1783 generates binding redirect when assembly with different version of main group``() =
234216
let scenario = "i001783-different-versions"
235217
use __ = install scenario |> fst
236-
let ``FSharp.Core`` = """<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />"""
237218
let ``Newtonsoft.Json`` = """<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />"""
238-
219+
239220
let path = Path.Combine(scenarioTempPath scenario, "projectB")
240221
let configPath = Path.Combine(path, "app.config")
241222

242223
let config = File.ReadAllText(configPath) |> normalizeLineEndings
243-
244-
config |> shouldContainText ``FSharp.Core``
224+
245225
config |> shouldContainText ``Newtonsoft.Json``

integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ let ``#140 windsor should resolve framework dependent dependencies``() =
1818
|> getExplicitRestriction
1919
|> shouldEqual (FrameworkRestriction.Between(DotNetFramework(FrameworkVersion.V3_5), DotNetFramework(FrameworkVersion.V4)))
2020

21-
[<Test; Ignore "slow test">]
22-
let ``#1182 framework restrictions overwrite each other``() =
23-
let cleanup, lockFile = update "i001182-framework-restrictions"
24-
use __ = cleanup
25-
let lockFile = lockFile.ToString()
26-
lockFile.Contains("Microsoft.Data.OData (>= 5.6.2)") |> shouldEqual true
27-
lockFile.Contains("framework: winv4.5") |> shouldEqual false
2821

2922
[<Test>]
3023
#if NO_UNIT_PLATFORMATTRIBUTE
@@ -33,50 +26,50 @@ let ``#1182 framework restrictions overwrite each other``() =
3326
[<Platform("Mono")>] // PATH TOO LONG on Windows...
3427
[<Flaky>] // failure on assert
3528
#endif
36-
let ``#1190 paket add nuget should handle transitive dependencies``() =
29+
let ``#1190 paket add nuget should handle transitive dependencies``() =
3730
use __ = paket "add nuget xunit version 2.1.0" "i001190-transitive-dependencies-with-restr" |> fst
3831
let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001190-transitive-dependencies-with-restr","paket.lock"))
3932
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "xunit.abstractions"].Settings.FrameworkRestrictions
4033
|> getExplicitRestriction
4134
|> fun res -> res.ToString() |> shouldEqual "|| (>= dnx451) (>= dnxcore50) (>= portable-net45+win8+wp8+wpa81)"
42-
35+
4336
[<Test>]
44-
let ``#1190 paket add nuget should handle transitive dependencies with restrictions``() =
37+
let ``#1190 paket add nuget should handle transitive dependencies with restrictions``() =
4538
use __ = paket "add nuget xunit version 2.1.0" "i001190-transitive-deps" |> fst
46-
39+
4740
let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001190-transitive-deps","paket.lock"))
4841
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "xunit.abstractions"].Settings.FrameworkRestrictions
4942
|> getExplicitRestriction
5043
|> shouldEqual FrameworkRestriction.NoRestriction
51-
52-
44+
45+
5346
[<Test>]
54-
let ``#1197 framework dependencies are not restricting each other``() =
47+
let ``#1197 framework dependencies are not restricting each other``() =
5548
let cleanup, lockFile = update "i001197-too-strict-frameworks"
5649
use __ = cleanup
57-
50+
5851
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "log4net"].Version
5952
|> shouldBeGreaterThan (SemVer.Parse "0")
6053

61-
54+
6255
[<Test>]
63-
let ``#1213 framework dependencies propagate``() =
56+
let ``#1213 framework dependencies propagate``() =
6457
let cleanup, lockFile = update "i001213-framework-propagation"
6558
use __ = cleanup
6659
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Newtonsoft.Json"].Settings.FrameworkRestrictions
6760
|> getExplicitRestriction
6861
|> shouldEqual FrameworkRestriction.NoRestriction
6962

7063
[<Test>]
71-
let ``#1215 framework dependencies propagate``() =
64+
let ``#1215 framework dependencies propagate``() =
7265
let cleanup, lockFile = update "i001215-framework-propagation-no-restriction"
7366
use __ = cleanup
7467
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Microsoft.Bcl.Async"].Settings.FrameworkRestrictions
7568
|> getExplicitRestriction
7669
|> shouldEqual FrameworkRestriction.NoRestriction
7770

7871
[<Test>]
79-
let ``#1232 framework dependencies propagate``() =
72+
let ``#1232 framework dependencies propagate``() =
8073
let cleanup, lockFile = update "i001232-sql-lite"
8174
use __ = cleanup
8275
let restriction =
@@ -90,7 +83,7 @@ let ``#1232 framework dependencies propagate``() =
9083
|> shouldEqual true
9184

9285
[<Test>]
93-
let ``#1494 detect platform 5.0``() =
86+
let ``#1494 detect platform 5.0``() =
9487
use __ = update "i001494-download" |> fst
95-
88+
9689
()

0 commit comments

Comments
 (0)