Patch imports and function type aliases. Report more errors.

pkg/analyzer/test/src/dart/sdk/patch_test.dart

 // Copyright (c) 2016, 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:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/dart/sdk/patch.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart';
@@ skipping 15 matching lines @@
   Folder sdkFolder;
   FolderBasedDartSdk sdk;
 
   SdkPatcher patcher = new SdkPatcher();
   RecordingErrorListener listener = new RecordingErrorListener();
 
   void setUp() {
     sdkFolder = provider.getFolder(_p('/sdk'));
   }
 
+  test_directive_fail_export() {
+    expect(() {
+      _doTopLevelPatching(
+          r'''
+import 'a.dart';
+''',
+          r'''
+export 'c.dart';
+''');
+    }, throwsArgumentError);
+  }
+
+  test_directive_import() {
+    CompilationUnit unit = _doTopLevelPatching(
+        r'''
+import 'a.dart';
+part 'b.dart';
+int bar() => 0;
+''',
+        r'''
+import 'c.dart';
+''');
+    _assertUnitCode(unit,
+        "import 'a.dart'; part 'b.dart'; import 'c.dart'; int bar() => 0;");
+  }
+
   test_fail_noSuchLibrary() {
     expect(() {
       _setSdkLibraries('const LIBRARIES = const {};');
       _createSdk();
       File file = provider.newFile(_p('/sdk/lib/test/test.dart'), '');
       Source source = file.createSource(FastUri.parse('dart:test'));
       CompilationUnit unit = SdkPatcher.parse(source, true, listener);
       patcher.patch(sdk, SdkLibraryImpl.VM_PLATFORM, listener, source, unit);
     }, throwsArgumentError);
   }
@@ skipping 23 matching lines @@
 int _foo1() => 1;
 int get _foo2 => 1;
 void set _foo3(int val) {}
 ''');
     _assertUnitCode(
         unit,
         'int bar() => 2; int _foo1() => 1; '
         'int get _foo2 => 1; void set _foo3(int val) {}');
   }
 
-  test_topLevel_fail_append_notPrivate() {
+  test_topLevel_fail_topLevelVariable() {
     expect(() {
       _doTopLevelPatching(
           r'''
-int foo() => 1;
+int foo() => 0;
 ''',
           r'''
-int bar() => 2;
+int _bar;
 ''');
     }, throwsArgumentError);
   }
 
-  test_topLevel_fail_noExternalKeyword() {
+  test_topLevel_function_fail_noExternalKeyword() {
     expect(() {
       _doTopLevelPatching(
           r'''
 int foo();
 ''',
           r'''
 @patch
 int foo() => 1;
 ''');
     }, throwsArgumentError);
   }
 
+  test_topLevel_function_fail_notPrivate() {
+    expect(() {
+      _doTopLevelPatching(
+          r'''
+int foo() => 1;
+''',
+          r'''
+int bar() => 2;
+''');
+    }, throwsArgumentError);
+  }
+
+  test_topLevel_functionTypeAlias_append() {
+    CompilationUnit unit = _doTopLevelPatching(
+        r'''
+int foo() => 0;
+''',
+        r'''
+typedef int _bar();
+''');
+    _assertUnitCode(unit, 'int foo() => 0; typedef int _bar();');
+  }
+
+  test_topLevel_functionTypeAlias_fail_hasAnnotation() {
+    expect(() {
+      _doTopLevelPatching(
+          r'''
+int foo() => 0;
+''',
+          r'''
+@patch
+typedef int _bar();
+''');
+    }, throwsArgumentError);
+  }
+
+  test_topLevel_functionTypeAlias_fail_notPrivate() {
+    expect(() {
+      _doTopLevelPatching(
+          r'''
+int foo() => 0;
+''',
+          r'''
+typedef int bar();
+''');
+    }, throwsArgumentError);
+  }
+
   test_topLevel_patch_function() {
     CompilationUnit unit = _doTopLevelPatching(
         r'''
 external int foo();
 int bar() => 2;
 ''',
         r'''
 @patch
 int foo() => 1;
 ''');
     _assertUnitCode(unit, 'int foo() => 1; int bar() => 2;');
   }
 
+  test_topLevel_patch_function_blockBody() {
+    CompilationUnit unit = _doTopLevelPatching(
+        r'''
+external int foo();
+''',
+        r'''
+@patch
+int foo() {int v = 1; return v + 2;}
+''');
+    _assertUnitCode(unit, 'int foo() {int v = 1; return v + 2;}');
+  }
+
   test_topLevel_patch_getter() {
     CompilationUnit unit = _doTopLevelPatching(
         r'''
 external int get foo;
 int bar() => 2;
 ''',
         r'''
 @patch
 int get foo => 1;
 ''');
@@ skipping 40 matching lines @@
     return unit;
   }
 
   String _p(String path) => provider.convertPath(path);
 
   void _setSdkLibraries(String code) {
     provider.newFile(
         _p('/sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart'), code);
   }
 }