Skip to content

Commit a310d1d

Browse files
KevinRansomKevinRansom
authored
Improve directory attribute refactor - Break up PR #18161 - Part 2 (#18196)
* More tests - directory attribute improvements * methordresolution
1 parent 73b8cbb commit a310d1d

File tree

54 files changed

+2350
-1727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2350
-1727
lines changed

‎tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsc/checked/checked.fs‎

Lines changed: 68 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -9,71 +9,79 @@ open Xunit
99
module Checked =
1010

1111
// SOURCE=unchecked01.fs # fsc-default
12-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
13-
let ``fsc-unchecked - unchecked01_fs`` compilation =
14-
compilation
12+
[<Theory; FileInlineData("unchecked01.fs")>]
13+
let ``fsc-unchecked - unchecked01_fs`` compilation =
14+
compilation
15+
|> getCompilation
1516
|> asFs
1617
|> compile
1718
|> shouldSucceed
1819

1920
// SOURCE=checked01.fs SCFLAGS="--checked" # fsc-checked
20-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
21-
let ``fsc-unchecked - unchecked01_fs --checked`` compilation =
22-
compilation
21+
[<Theory; FileInlineData("unchecked01.fs")>]
22+
let ``fsc-unchecked - unchecked01_fs --checked`` compilation =
23+
compilation
24+
|> getCompilation
2325
|> asFs
2426
|> withOptions["--checked"]
2527
|> compile
2628
|> shouldSucceed
2729

2830
// SOURCE=checked01.fs SCFLAGS="--checked+" # fsc-checked+
29-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
30-
let ``fsc-unchecked - unchecked01_fs --checked+`` compilation =
31-
compilation
31+
[<Theory; FileInlineData("unchecked01.fs")>]
32+
let ``fsc-unchecked - unchecked01_fs --checked+`` compilation =
33+
compilation
34+
|> getCompilation
3235
|> asFs
3336
|> withOptions["--checked+"]
3437
|> compile
3538
|> shouldSucceed
3639

3740
// SOURCE=unchecked01.fs SCFLAGS="--checked-" # fsc-checked-
38-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
39-
let ``fsc-unchecked - unchecked01_fs --checked-`` compilation =
40-
compilation
41+
[<Theory; FileInlineData("unchecked01.fs")>]
42+
let ``fsc-unchecked - unchecked01_fs --checked-`` compilation =
43+
compilation
44+
|> getCompilation
4145
|> asFs
4246
|> withOptions["--checked-"]
4347
|> compile
4448
|> shouldSucceed
4549

4650
// SOURCE=unchecked01.fs SCFLAGS="--checked-" # fsc-checked-
47-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
48-
let ``fsi-unchecked - unchecked01_fs --checked-`` compilation =
49-
compilation
51+
[<Theory; FileInlineData("unchecked01.fs")>]
52+
let ``fsi-unchecked - unchecked01_fs --checked-`` compilation =
53+
compilation
54+
|> getCompilation
5055
|> asFsx
5156
|> withOptions["--checked-"]
5257
|> compile
5358
|> shouldSucceed
5459

5560
// SOURCE=checked01.fs SCFLAGS="--checked" FSIMODE=EXEC COMPILE_ONLY=1 # fsi-checked
56-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
57-
let ``fsi-checked - checked01_fs --checked`` compilation =
58-
compilation
61+
[<Theory; FileInlineData("checked01.fs")>]
62+
let ``fsi-checked - checked01_fs --checked`` compilation =
63+
compilation
64+
|> getCompilation
5965
|> asFsx
6066
|> withOptions["--checked"]
6167
|> compile
6268
|> shouldSucceed
6369

6470
// SOURCE=checked01.fs SCFLAGS="--checked+" FSIMODE=EXEC COMPILE_ONLY=1 # fsi-checked+
65-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
66-
let ``fsi-checked - checked01_fs --checked+`` compilation =
67-
compilation
71+
[<Theory; FileInlineData("checked01.fs")>]
72+
let ``fsi-checked - checked01_fs --checked+`` compilation =
73+
compilation
74+
|> getCompilation
6875
|> asFsx
6976
|> withOptions["--checked+"]
7077
|> compile
7178
|> shouldSucceed
7279

7380
// SOURCE=checked01.fs SCFLAGS="--checked-" FSIMODE=EXEC COMPILE_ONLY=1 # fsi-checked+
74-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
75-
let ``fsi-checked - checked01_fs --checked-`` compilation =
76-
compilation
81+
[<Theory; FileInlineData("checked01.fs")>]
82+
let ``fsi-checked - checked01_fs --checked-`` compilation =
83+
compilation
84+
|> getCompilation
7785
|> asFsx
7886
|> withOptions["--checked-"]
7987
|> compile
@@ -83,64 +91,71 @@ module Checked =
8391
//# Last one wins
8492

8593
// SOURCE=checked01.fs SCFLAGS="--checked --checked+" # fsc-checkedchecked+
86-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
87-
let ``fsc-checked - checked01_fs --checked --checked+`` compilation =
88-
compilation
94+
[<Theory; FileInlineData("checked01.fs")>]
95+
let ``fsc-checked - checked01_fs --checked --checked+`` compilation =
96+
compilation
97+
|> getCompilation
8998
|> asFs
9099
|> withOptions["--checked"; "--checked+"]
91100
|> compile
92101
|> shouldSucceed
93102

94103
// SOURCE=checked01.fs SCFLAGS="--checked- --checked+" # fsc-checked-checked+
95-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
96-
let ``fsc-checked - checked01_fs --checked- --checked+`` compilation =
97-
compilation
104+
[<Theory; FileInlineData("checked01.fs")>]
105+
let ``fsc-checked - checked01_fs --checked- --checked+`` compilation =
106+
compilation
107+
|> getCompilation
98108
|> asFs
99109
|> withOptions["--checked-"; "--checked+"]
100110
|> compile
101111
|> shouldSucceed
102112

103113
// SOURCE=unchecked01.fs SCFLAGS="--checked+ --checked-" # fsc-checked+checked-
104-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
105-
let ``fsc-checked - unchecked01_fs --checked+ --checked-`` compilation =
106-
compilation
114+
[<Theory; FileInlineData("unchecked01.fs")>]
115+
let ``fsc-checked - unchecked01_fs --checked+ --checked-`` compilation =
116+
compilation
117+
|> getCompilation
107118
|> asFs
108119
|> withOptions["--checked+"; "--checked-"]
109120
|> compile
110121
|> shouldSucceed
111122

112123
// SOURCE=checked01.fs SCFLAGS="--checked --checked+" # fsc-checkedchecked+
113-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
114-
let ``fsi-checked - checked01_fs --checked --checked+`` compilation =
115-
compilation
124+
[<Theory; FileInlineData("checked01.fs")>]
125+
let ``fsi-checked - checked01_fs --checked --checked+`` compilation =
126+
compilation
127+
|> getCompilation
116128
|> asFsx
117129
|> withOptions["--checked"; "--checked+"]
118130
|> compile
119131
|> shouldSucceed
120132

121133
// SOURCE=checked01.fs SCFLAGS="--checked- --checked+" # fsc-checked-checked+
122-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"checked01.fs"|])>]
123-
let ``fsi-checked - checked01_fs --checked- --checked+`` compilation =
124-
compilation
134+
[<Theory; FileInlineData("checked01.fs")>]
135+
let ``fsi-checked - checked01_fs --checked- --checked+`` compilation =
136+
compilation
137+
|> getCompilation
125138
|> asFsx
126139
|> withOptions["--checked-"; "--checked+"]
127140
|> compile
128141
|> shouldSucceed
129142

130143
// SOURCE=unchecked01.fs SCFLAGS="--checked+ --checked-" # fsc-checked+checked-
131-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unchecked01.fs"|])>]
132-
let ``fsi-checked - unchecked01_fs --checked+ --checked-`` compilation =
133-
compilation
144+
[<Theory; FileInlineData("unchecked01.fs")>]
145+
let ``fsi-checked - unchecked01_fs --checked+ --checked-`` compilation =
146+
compilation
147+
|> getCompilation
134148
|> asFsx
135149
|> withOptions["--checked+"; "--checked-"]
136150
|> compile
137151
|> shouldSucceed
138152

139153
//# Unrecognized argument
140154
// SOURCE=unrecogarg.fs SCFLAGS="--Checked" # fsc--Checked
141-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unrecogarg.fs"|])>]
142-
let ``fsc-checked - unchecked01_fs Checked`` compilation =
143-
compilation
155+
[<Theory; FileInlineData("unrecogarg.fs")>]
156+
let ``fsc-checked - unchecked01_fs Checked`` compilation =
157+
compilation
158+
|> getCompilation
144159
|> asFs
145160
|> withOptions["--Checked"]
146161
|> compile
@@ -150,9 +165,10 @@ module Checked =
150165
]
151166

152167
// SOURCE=unrecogarg.fs SCFLAGS="--checked*" # fsc--checked*
153-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"unrecogarg.fs"|])>]
154-
let ``fsc-checked - unchecked01_fs --checked-star`` compilation =
155-
compilation
168+
[<Theory; FileInlineData("unrecogarg.fs")>]
169+
let ``fsc-checked - unchecked01_fs --checked-star`` compilation =
170+
compilation
171+
|> getCompilation
156172
|> asFs
157173
|> withOptions["--checked*"]
158174
|> compile
@@ -162,9 +178,10 @@ module Checked =
162178
]
163179

164180
// SOURCE=unrecogarg.fs SCFLAGS="--checked*" # fsc--checked*
165-
[<Theory; Directory(__SOURCE_DIRECTORY__, Includes=[|"UncheckedDefaultOf01.fs"|])>]
166-
let ``fsc-checked - UncheckedDefaultOf01`` compilation =
167-
compilation
181+
[<Theory; FileInlineData( "UncheckedDefaultOf01.fs")>]
182+
let ``fsc-checked - UncheckedDefaultOf01`` compilation =
183+
compilation
184+
|> getCompilation
168185
|> asFs
169186
|> asExe
170187
|> compile

0 commit comments

Comments
 (0)