Skip to content

Commit 778e35c

Browse files
sigurdmsigurdm
committed
Move link() -> descriptor.dart
1 parent 8909acf commit 778e35c

File tree

5 files changed

+63
-46
lines changed

5 files changed

+63
-46
lines changed

‎test/descriptor.dart‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import 'descriptor/git.dart';
1818
import 'descriptor/package_config.dart';
1919
import 'descriptor/tar.dart';
2020
import 'descriptor/yaml.dart';
21+
import 'link_descriptor.dart';
2122
import 'test_pub.dart';
2223

2324
export 'package:test_descriptor/test_descriptor.dart';
@@ -403,3 +404,7 @@ Descriptor flutterVersion(String version) {
403404
FileDescriptor sdkPackagesConfig(SdkPackageConfig sdkPackageConfig) {
404405
return YamlDescriptor('sdk_packages.yaml', yaml(sdkPackageConfig.toMap()));
405406
}
407+
408+
Descriptor link(String name, String target, {bool forceDirectory = false}) {
409+
return LinkDescriptor(name, target, forceDirectory: forceDirectory);
410+
}

‎test/link_descriptor.dart‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,3 @@ class LinkDescriptor extends d.Descriptor {
5050
}
5151
}
5252
}
53-
54-
d.Descriptor link(String name, String target, {bool forceDirectory = false}) {
55-
return LinkDescriptor(name, target, forceDirectory: forceDirectory);
56-
}

‎test/lish/symlinks_test.dart‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:tar/tar.dart';
99
import 'package:test/test.dart';
1010

1111
import '../descriptor.dart' as d;
12-
import '../link_descriptor.dart';
1312
import '../test_pub.dart';
1413

1514
Future<void> main() async {
@@ -19,19 +18,23 @@ Future<void> main() async {
1918
await d.file('t', 'ttt').create();
2019

2120
await d.dir(appPath, [
22-
d.dir('b', [d.file('bb', 'bbb'), link('l', p.join(d.sandbox, 't'))]),
23-
link(
21+
d.dir('b', [d.file('bb', 'bbb'), d.link('l', p.join(d.sandbox, 't'))]),
22+
d.link(
2423
'symlink_to_dir_outside_package',
2524
p.join(d.sandbox, 'a'),
2625
forceDirectory: true,
2726
),
28-
link(
27+
d.link(
2928
'symlink_to_dir_outside_package_relative',
3029
p.join('..', 'a'),
3130
forceDirectory: true,
3231
),
33-
link('symlink_to_dir_inside_package', p.join(d.sandbox, appPath, 'b')),
34-
link('symlink_to_dir_inside_package_relative', 'b', forceDirectory: true),
32+
d.link('symlink_to_dir_inside_package', p.join(d.sandbox, appPath, 'b')),
33+
d.link(
34+
'symlink_to_dir_inside_package_relative',
35+
'b',
36+
forceDirectory: true,
37+
),
3538
]).create();
3639

3740
await runPub(args: ['publish', '--to-archive=archive.tar.gz']);

‎test/package_list_files_test.dart‎

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import 'package:pub/src/system_cache.dart';
1111
import 'package:test/test.dart';
1212

1313
import 'descriptor.dart' as d;
14-
import 'link_descriptor.dart';
1514
import 'test_pub.dart';
1615

1716
late String root;
@@ -58,7 +57,7 @@ void main() {
5857
d.file('file2.txt', 'contents'),
5958
d.dir('subdir', [
6059
d.dir('a', [d.file('file')]),
61-
link('symlink', 'a', forceDirectory: true),
60+
d.link('symlink', 'a', forceDirectory: true),
6261
]),
6362
]).create();
6463

@@ -81,7 +80,7 @@ void main() {
8180
d.dir('subdir', [
8281
d.file('.pubignore', 'symlink'),
8382
d.dir('a', [d.file('file')]),
84-
link('symlink', 'a', forceDirectory: true),
83+
d.link('symlink', 'a', forceDirectory: true),
8584
]),
8685
]).create();
8786

@@ -103,7 +102,7 @@ void main() {
103102
d.dir('subdir', [
104103
d.file('.pubignore', 'symlink'),
105104
d.dir('a', [d.file('file')]),
106-
link('symlink', 'b', forceDirectory: true),
105+
d.link('symlink', 'b', forceDirectory: true),
107106
]),
108107
]).create();
109108

@@ -125,7 +124,7 @@ void main() {
125124
d.file('file2.txt', 'contents'),
126125
d.dir('subdir', [
127126
d.dir('a', [d.file('file')]),
128-
link('symlink', '..', forceDirectory: true),
127+
d.link('symlink', '..', forceDirectory: true),
129128
]),
130129
]).create();
131130

@@ -152,7 +151,7 @@ void main() {
152151
d.file('file2.txt', 'contents'),
153152
d.dir('subdir', [
154153
d.dir('a', [d.file('file')]),
155-
link('symlink', 'symlink', forceDirectory: true),
154+
d.link('symlink', 'symlink', forceDirectory: true),
156155
]),
157156
]).create();
158157

@@ -178,15 +177,15 @@ void main() {
178177
d.dir('subdir', [
179178
d.dir('a', [
180179
d.file('file'),
181-
link('symlink1', p.join('..', 'b'), forceDirectory: true),
180+
d.link('symlink1', p.join('..', 'b'), forceDirectory: true),
182181
]),
183182
d.dir('b', [
184-
link('symlink2', p.join('..', 'c'), forceDirectory: true),
183+
d.link('symlink2', p.join('..', 'c'), forceDirectory: true),
185184
]),
186185
d.dir('c', [
187-
link('symlink3', p.join('..', 'a'), forceDirectory: true),
186+
d.link('symlink3', p.join('..', 'a'), forceDirectory: true),
188187
]),
189-
link('symlink', 'a', forceDirectory: true),
188+
d.link('symlink', 'a', forceDirectory: true),
190189
]),
191190
]).create();
192191

@@ -207,9 +206,9 @@ void main() {
207206
test('throws on link to loop', () async {
208207
await d.dir(appPath, [
209208
d.pubspec({'name': 'myapp'}),
210-
link('symlink', p.join(d.sandbox, 'loop'), forceDirectory: true),
209+
d.link('symlink', p.join(d.sandbox, 'loop'), forceDirectory: true),
211210
]).create();
212-
await link('loop', 'loop', forceDirectory: true).create();
211+
await d.link('loop', 'loop', forceDirectory: true).create();
213212

214213
createEntrypoint();
215214

@@ -229,10 +228,15 @@ void main() {
229228
await d.dir('src', [
230229
d.dir(appPath, [
231230
d.pubspec({'name': 'myapp'}),
232-
link('symlink', p.join(d.sandbox, 'source'), forceDirectory: true),
231+
d.link(
232+
'symlink',
233+
p.join(d.sandbox, 'source'),
234+
forceDirectory: true,
235+
),
233236
]),
234237
]).create();
235-
await link('source', p.join(d.sandbox, 'src'), forceDirectory: true)
238+
await d
239+
.link('source', p.join(d.sandbox, 'src'), forceDirectory: true)
236240
.create();
237241

238242
createEntrypoint(p.join('src', appPath));
@@ -254,14 +258,20 @@ void main() {
254258
await d.dir('src', [
255259
d.dir(appPath, [
256260
d.pubspec({'name': 'myapp'}),
257-
link('symlink', p.join(d.sandbox, 'source'), forceDirectory: true),
261+
d.link(
262+
'symlink',
263+
p.join(d.sandbox, 'source'),
264+
forceDirectory: true,
265+
),
258266
]),
259267
]).create();
260-
await link(
261-
'source',
262-
p.join(d.sandbox, 'src'),
263-
forceDirectory: true,
264-
).create();
268+
await d
269+
.link(
270+
'source',
271+
p.join(d.sandbox, 'src'),
272+
forceDirectory: true,
273+
)
274+
.create();
265275

266276
createEntrypoint(p.join('source', appPath));
267277

@@ -283,11 +293,13 @@ void main() {
283293
d.pubspec({'name': 'myapp'}),
284294
]),
285295
]).create();
286-
await link(
287-
'source',
288-
p.join(d.sandbox, 'src'),
289-
forceDirectory: true,
290-
).create();
296+
await d
297+
.link(
298+
'source',
299+
p.join(d.sandbox, 'src'),
300+
forceDirectory: true,
301+
)
302+
.create();
291303

292304
createEntrypoint(p.join('source', appPath));
293305

@@ -304,7 +316,7 @@ void main() {
304316
d.dir('subdir', [
305317
d.file('.pubignore', 'symlink'),
306318
d.dir('a', [d.file('file')]),
307-
link('symlink', '..', forceDirectory: true),
319+
d.link('symlink', '..', forceDirectory: true),
308320
]),
309321
]).create();
310322

@@ -325,10 +337,10 @@ void main() {
325337
d.file('file2.txt', 'contents'),
326338
d.dir('subdir', [
327339
d.dir('a', [d.file('file')]),
328-
link('symlink1', 'a', forceDirectory: true),
329-
link('symlink2', 'a', forceDirectory: true),
340+
d.link('symlink1', 'a', forceDirectory: true),
341+
d.link('symlink2', 'a', forceDirectory: true),
330342
]),
331-
link('symlink3', p.join('subdir', 'a'), forceDirectory: true),
343+
d.link('symlink3', p.join('subdir', 'a'), forceDirectory: true),
332344
]).create();
333345

334346
createEntrypoint();
@@ -356,7 +368,7 @@ void main() {
356368
]),
357369
]).create();
358370

359-
await link('symlink', appPath).create();
371+
await d.link('symlink', appPath).create();
360372
root = p.join(d.sandbox, 'symlink');
361373

362374
final entrypoint = Entrypoint(

‎test/validator/gitignore_test.dart‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:pub/src/exit_codes.dart' as exit_codes;
99
import 'package:test/test.dart';
1010

1111
import '../descriptor.dart' as d;
12-
import '../link_descriptor.dart';
1312
import '../test_pub.dart';
1413

1514
Future<void> expectValidation(
@@ -159,11 +158,13 @@ void main() {
159158
await pubGet(
160159
workingDirectory: packageRoot,
161160
);
162-
await link(
163-
p.join(d.sandbox, appPath, 'dir_with_symlink', 'symlink'),
164-
'..',
165-
forceDirectory: true,
166-
).create();
161+
await d
162+
.link(
163+
p.join(d.sandbox, appPath, 'dir_with_symlink', 'symlink'),
164+
'..',
165+
forceDirectory: true,
166+
)
167+
.create();
167168
await git.commit();
168169

169170
await expectValidation(

0 commit comments

Comments
 (0)