commit 0df81c42a713bbb520c431d8ed55bb72c86c97f0
author pq <pquitslund@google.com> Wed Dec 12 00:28:39 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Wed Dec 12 00:28:39 2018 +0000
tree d846591555abd27025977feaac2d04cc6c5c77cf
parent bc8c7cf7823a5b375b7dafdf088e06ee887824b9

fix options integration tests

Fixes: #28868

Change-Id: Ia3a144b583432228531243ac53e07977fcf1db01
Reviewed-on: https://dart-review.googlesource.com/c/87024
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Phil Quitslund <pquitslund@google.com>

pkg/analysis_server/test/integration/analysis/analysis_options_test.dart

diff --git a/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart b/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
index f7114c5..e27f275 100644
--- a/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/analysis_options_test.dart
@@ -15,24 +15,15 @@
   });
 }
 
-/// Wrapper around the test package's `fail` function.
-///
-/// Unlike the test package's `fail` function, this function is not annotated
-/// with @alwaysThrows, so we can call it at the top of a test method without
-/// causing the rest of the method to be flagged as dead code.
-void _fail(String message) {
-  fail(message);
-}
-
 @reflectiveTest
 class OptionsIntegrationTest extends AbstractAnalysisServerIntegrationTest {
-  @failingTest
+  void optionsAnalysisSetup() {
+    // Add an empty Dart file; required to trigger analysis (#35383).
+    writeFile(sourcePath('test.dart'), '');
+    standardAnalysisSetup();
+  }
+
   test_option_warning_newOptionFile() async {
-    // TimeoutException after 0:00:30.000000: Test timed out after 30 seconds
-    // (#28868).
-
-    _fail('test timeout expected - #28868');
-
     String options = sourcePath(AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE);
     writeFile(options, '''
 linter:
@@ -40,7 +31,7 @@
     - camel_case_typo # :)
 ''');
 
-    standardAnalysisSetup();
+    optionsAnalysisSetup();
 
     await analysisFinished;
 
@@ -57,21 +48,15 @@
     expect(error.location.startColumn, 7);
   }
 
-  @failingTest
   test_option_warning_oldOptionFile() async {
-    // TimeoutException after 0:00:30.000000: Test timed out after 30 seconds
-    // (#28868).
-
-    _fail('test timeout expected - #28868');
-
     String options = sourcePath(AnalysisEngine.ANALYSIS_OPTIONS_FILE);
     writeFile(options, '''
 linter:
   rules:
-    - camel_case_typo # :)
+    - camel_case_types
 ''');
 
-    standardAnalysisSetup();
+    optionsAnalysisSetup();
 
     await analysisFinished;
 
@@ -80,11 +65,13 @@
     expect(errors, hasLength(1));
     AnalysisError error = errors[0];
     expect(error.location.file, options);
-    expect(error.severity, AnalysisErrorSeverity.WARNING);
-    expect(error.type, AnalysisErrorType.STATIC_WARNING);
-    expect(error.location.offset, 23);
-    expect(error.location.length, 'camel_case_typo'.length);
-    expect(error.location.startLine, 3);
-    expect(error.location.startColumn, 7);
+    expect(error.severity, AnalysisErrorSeverity.INFO);
+    expect(error.type, AnalysisErrorType.HINT);
+    expect(error.location.offset, 0);
+    expect(error.location.length, 1);
+    expect(error.location.startLine, 1);
+    expect(error.location.startColumn, 1);
+    expect(error.message,
+        "The name of the analysis options file .analysis_options is deprecated; consider renaming it to analysis_options.yaml.");
   }
 }