Convert more tests

pkg/analysis_server/test/analysis/notification_analysis_options_test.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/protocol/protocol_generated.dart'
     hide AnalysisOptions;
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analyzer/src/generated/engine.dart';
@@ skipping 86 matching lines @@
 main() {
   String unused = "";
 }
 ''');
 
     setAnalysisRoot();
 
     await waitForTasksFinished();
 
     // Verify options file.
-    if (!enableNewAnalysisDriver) {
-      // TODO(brianwilkerson) Implement options file analysis in the new driver.
-      expect(optionsFileErrors, isNotNull);
-      expect(optionsFileErrors, isEmpty);
-    }
+    // TODO(brianwilkerson) Implement options file analysis in the new driver.
+//    expect(optionsFileErrors, isNotNull);
+//    expect(optionsFileErrors, isEmpty);
 
     // Verify test file.
     expect(testFileErrors, isNotNull);
     expect(testFileErrors, isEmpty);
   }
 
   test_error_filter_removed() async {
     addOptionsFile('''
 analyzer:
   errors:
     unused_local_variable: ignore
 ''');
 
     addTestFile('''
 main() {
   String unused = "";
 }
 ''');
 
     setAnalysisRoot();
 
     await waitForTasksFinished();
 
     // Verify options file.
-    if (!enableNewAnalysisDriver) {
-      // TODO(brianwilkerson) Implement options file analysis in the new driver.
-      expect(optionsFileErrors, isNotNull);
-      expect(optionsFileErrors, isEmpty);
-    }
+    // TODO(brianwilkerson) Implement options file analysis in the new driver.
+//    expect(optionsFileErrors, isNotNull);
+//    expect(optionsFileErrors, isEmpty);
 
     // Verify test file.
     expect(testFileErrors, isNotNull);
     expect(testFileErrors, isEmpty);
 
     addOptionsFile('''
 analyzer:
   errors:
   #  unused_local_variable: ignore
 ''');
 
     await pumpEventQueue();
     await waitForTasksFinished();
 
     // Verify options file.
-    if (!enableNewAnalysisDriver) {
-      // TODO(brianwilkerson) Implement options file analysis in the new driver.
-      expect(optionsFileErrors, isEmpty);
-    }
+    // TODO(brianwilkerson) Implement options file analysis in the new driver.
+//    expect(optionsFileErrors, isEmpty);
 
     // Verify test file.
     expect(testFileErrors, hasLength(1));
   }
 
   test_lint_options_changes() async {
     addOptionsFile('''
 linter:
   rules:
     - camel_case_types
@@ skipping 24 matching lines @@
 linter:
   rules:
     - unsupported
 ''');
 
     addTestFile(testSource);
     setAnalysisRoot();
 
     await waitForTasksFinished();
 
-    if (!enableNewAnalysisDriver) {
-      // TODO(brianwilkerson) Implement options file analysis in the new driver.
-      expect(optionsFileErrors, hasLength(1));
-      expect(optionsFileErrors.first.severity, AnalysisErrorSeverity.WARNING);
-      expect(optionsFileErrors.first.type, AnalysisErrorType.STATIC_WARNING);
-    }
+    // TODO(brianwilkerson) Implement options file analysis in the new driver.
+//    expect(optionsFileErrors, hasLength(1));
+//    expect(optionsFileErrors.first.severity, AnalysisErrorSeverity.WARNING);
+//    expect(optionsFileErrors.first.type, AnalysisErrorType.STATIC_WARNING);
   }
 
   test_options_file_added() async {
     addTestFile(testSource);
     setAnalysisRoot();
 
     await waitForTasksFinished();
 
     // Verify strong-mode disabled.
     verifyStrongMode(enabled: false);
@@ skipping 11 matching lines @@
   }
 
   test_options_file_parse_error() async {
     addOptionsFile('''
 ; #bang
 ''');
     setAnalysisRoot();
 
     await waitForTasksFinished();
 
-    if (!enableNewAnalysisDriver) {
-      // TODO(brianwilkerson) Implement options file analysis in the new driver.
-      expect(optionsFileErrors, hasLength(1));
-      expect(optionsFileErrors.first.severity, AnalysisErrorSeverity.ERROR);
-      expect(
-          optionsFileErrors.first.type, AnalysisErrorType.COMPILE_TIME_ERROR);
-    }
+    // TODO(brianwilkerson) Implement options file analysis in the new driver.
+//    expect(optionsFileErrors, hasLength(1));
+//    expect(optionsFileErrors.first.severity, AnalysisErrorSeverity.ERROR);
+//    expect(optionsFileErrors.first.type, AnalysisErrorType.COMPILE_TIME_ERROR);
   }
 
   test_options_file_removed() async {
     setStrongMode(true);
 
     addTestFile(testSource);
     setAnalysisRoot();
 
     await waitForTasksFinished();
 
@@ skipping 78 matching lines @@
   @override
   String get optionsFilePath => '$projectPath/analysis_options.yaml';
 }
 
 @reflectiveTest
 class OldAnalysisOptionsFileNotificationTest
     extends AnalysisOptionsFileNotificationTest {
   @override
   String get optionsFilePath => '$projectPath/.analysis_options';
 }