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

Unified Diff: pkg/analysis_server/test/integration/analysis_domain_int_test.dart

Issue 437383003: Simplify handling of pathnames in integration tests. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/test/integration/analysis_domain_int_test.dart
diff --git a/pkg/analysis_server/test/integration/analysis_domain_int_test.dart b/pkg/analysis_server/test/integration/analysis_domain_int_test.dart
index 7bde9aed38abaf64ff0bea21260128a2d4bbda85..a5007d9cb819df7900c8383f4983343450da5e57 100644
--- a/pkg/analysis_server/test/integration/analysis_domain_int_test.dart
+++ b/pkg/analysis_server/test/integration/analysis_domain_int_test.dart
@@ -18,8 +18,7 @@ import 'protocol_matchers.dart';
class AnalysisDomainIntegrationTest extends
AbstractAnalysisServerIntegrationTest {
test_getHover() {
- String filename = 'test.dart';
- String pathname = normalizePath(filename);
+ String pathname = sourcePath('test.dart');
String text =
r'''
library lib.test;
@@ -39,8 +38,8 @@ main() {
func(35);
}
''';
- writeFile(filename, text);
- setAnalysisRoots(['']);
+ writeFile(pathname, text);
+ standardAnalysisRoot();
testHover(String target, int length, List<String> descriptionRegexps, String
kind, List<String> staticTypeRegexps, {bool isCore: false, String docRegexp:
@@ -138,15 +137,14 @@ main() {
}
test_getHover_noInfo() {
- String filename = 'test.dart';
- String pathname = normalizePath(filename);
+ String pathname = sourcePath('test.dart');
String text = r'''
main() {
// no code
}
''';
- writeFile(filename, text);
- setAnalysisRoots(['']);
+ writeFile(pathname, text);
+ standardAnalysisRoot();
// Note: analysis.getHover doesn't wait for analysis to complete--it simply
// returns the latest results that are available at the time that the
@@ -171,14 +169,13 @@ main() {
}
Future getErrorsTest(bool afterAnalysis) {
- String filename = 'test.dart';
- String pathname = normalizePath(filename);
+ String pathname = sourcePath('test.dart');
String text = r'''
main() {
var x // parse error: missing ';'
}''';
- writeFile(filename, text);
- setAnalysisRoots(['']);
+ writeFile(pathname, text);
+ standardAnalysisRoot();
Future finishTest() {
return server.send(ANALYSIS_GET_ERRORS, {
'file': pathname
@@ -203,15 +200,14 @@ main() {
}
Future updateContentTest(bool includeOffsetAndLengths) {
- String filename = 'test.dart';
- String pathname = normalizePath(filename);
+ String pathname = sourcePath('test.dart');
String goodText = r'''
main() {
print("Hello, world!");
}''';
String badText = goodText.replaceAll(';', '');
- writeFile(filename, badText);
- setAnalysisRoots(['']);
+ writeFile(pathname, badText);
+ standardAnalysisRoot();
return analysisFinished.then((_) {
// The contents on disk (badText) are missing a semicolon.
expect(currentAnalysisErrors[pathname], isNot(isEmpty));

Powered by Google App Engine
This is Rietveld 408576698