Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Side by Side Diff: pkg/scheduled_test/lib/src/descriptor/file_descriptor.dart

Issue 22284003: pkg: analysis aided cleanup (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library descriptor.file; 5 library descriptor.file;
6 6
7 import 'dart:async'; 7 import 'dart:async';
8 import 'dart:io'; 8 import 'dart:io';
9 import 'dart:math' as math; 9 import 'dart:math' as math;
10 import 'dart:utf'; 10 import 'dart:utf';
11 11
12 import 'package:path/path.dart' as path; 12 import 'package:path/path.dart' as pathos;
gram 2013/08/05 23:23:12 Is there a conflict with path? Otherwise we should
kevmoo-old 2013/08/06 01:27:16 The editor shows some really weird errors when I l
kevmoo-old 2013/08/06 01:27:16 Done.
13 13
14 import '../../descriptor.dart'; 14 import '../../descriptor.dart';
15 import '../../scheduled_test.dart'; 15 import '../../scheduled_test.dart';
16 import '../utils.dart'; 16 import '../utils.dart';
17 17
18 /// A descriptor describing a single file. 18 /// A descriptor describing a single file.
19 abstract class FileDescriptor extends Descriptor implements ReadableDescriptor { 19 abstract class FileDescriptor extends Descriptor implements ReadableDescriptor {
20 /// The contents of the file, in bytes. 20 /// The contents of the file, in bytes.
21 final List<int> contents; 21 final List<int> contents;
22 22
(...skipping 19 matching lines...) Expand all
42 42
43 /// Creates a new text [FileDescriptor] with [name] and [contents]. 43 /// Creates a new text [FileDescriptor] with [name] and [contents].
44 factory FileDescriptor(String name, String contents) => 44 factory FileDescriptor(String name, String contents) =>
45 new _StringFileDescriptor(name, contents); 45 new _StringFileDescriptor(name, contents);
46 46
47 FileDescriptor._(String name, this.contents) 47 FileDescriptor._(String name, this.contents)
48 : super(name); 48 : super(name);
49 49
50 Future create([String parent]) => schedule(() { 50 Future create([String parent]) => schedule(() {
51 if (parent == null) parent = defaultRoot; 51 if (parent == null) parent = defaultRoot;
52 return new File(path.join(parent, name)).writeAsBytes(contents); 52 return new File(pathos.join(parent, name)).writeAsBytes(contents);
53 }, "creating file '$name'"); 53 }, "creating file '$name'");
54 54
55 Future validate([String parent]) => 55 Future validate([String parent]) =>
56 schedule(() => validateNow(parent), "validating file '$name'"); 56 schedule(() => validateNow(parent), "validating file '$name'");
57 57
58 Future validateNow([String parent]) { 58 Future validateNow([String parent]) {
59 if (parent == null) parent = defaultRoot; 59 if (parent == null) parent = defaultRoot;
60 var fullPath = path.join(parent, name); 60 var fullPath = pathos.join(parent, name);
61 if (!new File(fullPath).existsSync()) { 61 if (!new File(fullPath).existsSync()) {
62 throw "File not found: '$fullPath'."; 62 throw "File not found: '$fullPath'.";
63 } 63 }
64 64
65 return new File(fullPath).readAsBytes().then(_validateNow); 65 return new File(fullPath).readAsBytes().then(_validateNow);
66 } 66 }
67 67
68 // TODO(nweiz): rather than setting up an inheritance chain, just store a 68 // TODO(nweiz): rather than setting up an inheritance chain, just store a
69 // Matcher for validation. This would require better error messages from the 69 // Matcher for validation. This would require better error messages from the
70 // matcher library, though. 70 // matcher library, though.
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 _MatcherFileDescriptor(String name, this._matcher, {bool isBinary}) 141 _MatcherFileDescriptor(String name, this._matcher, {bool isBinary})
142 : _isBinary = isBinary == true ? true : false, 142 : _isBinary = isBinary == true ? true : false,
143 super._(name, <int>[]); 143 super._(name, <int>[]);
144 144
145 void _validateNow(List<int> actualContents) => 145 void _validateNow(List<int> actualContents) =>
146 expect( 146 expect(
147 _isBinary ? actualContents : new String.fromCharCodes(actualContents), 147 _isBinary ? actualContents : new String.fromCharCodes(actualContents),
148 _matcher); 148 _matcher);
149 } 149 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698