Fix for issue 22110

pkg/analyzer/test/generated/all_the_rest_test.dart

 // Copyright (c) 2014, 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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.all_the_rest_test;
 
 import 'dart:collection';
@@ skipping 6831 matching lines @@
         same(ErrorSeverity.WARNING));
   }
 
   void test_max_warning_warning() {
     expect(
         ErrorSeverity.WARNING.max(ErrorSeverity.WARNING),
         same(ErrorSeverity.WARNING));
   }
 }
 
-
+/**
+ * Tests for the [ExitDetector] that do not require that the AST be resolved.
+ *
+ * See [ExitDetectorTest2] for tests that require the AST to be resolved.
+ */
 @reflectiveTest
 class ExitDetectorTest extends ParserTestCase {
   void fail_doStatement_continue_with_label() {
     _assertFalse("{ x: do { continue x; } while(true); }");
   }
 
   void fail_whileStatement_continue_with_label() {
     _assertFalse("{ x: while (true) { continue x; } }");
   }
 
@@ skipping 477 matching lines @@
     ExitDetector detector = new ExitDetector();
     Statement statement = ParserTestCase.parseStatement(source);
     expect(statement.accept(detector), same(expectedResult));
   }
 
   void _assertTrue(String source) {
     _assertHasReturn(true, source);
   }
 }
 
+/**
+ * Tests for the [ExitDetector] that require that the AST be resolved.
+ *
+ * See [ExitDetectorTest] for tests that do not require the AST to be resolved.
+ */
+@reflectiveTest
+class ExitDetectorTest2 extends ResolverTestCase {
+  void test_switch_withEnum_false_noDefault() {
+    Source source = addSource(r'''
+enum E { A, B }
+String f(E e) {
+  var x;
+  switch (e) {
+    case A:
+      x = 'A';
+    case B:
+      x = 'B';
+  }
+  return x;
+}
+''');
+    LibraryElement element = resolve(source);
+    CompilationUnit unit = resolveCompilationUnit(source, element);
+    FunctionDeclaration function = unit.declarations.last;
+    BlockFunctionBody body = function.functionExpression.body;
+    Statement statement = body.block.statements[1];
+    expect(statement.accept(new ExitDetector()), false);
+  }
+
+  void test_switch_withEnum_false_withDefault() {
+    Source source = addSource(r'''
+enum E { A, B }
+String f(E e) {
+  var x;
+  switch (e) {
+    case A:
+      x = 'A';
+    default:
+      x = '?';
+  }
+  return x;
+}
+''');
+    LibraryElement element = resolve(source);
+    CompilationUnit unit = resolveCompilationUnit(source, element);
+    FunctionDeclaration function = unit.declarations.last;
+    BlockFunctionBody body = function.functionExpression.body;
+    Statement statement = body.block.statements[1];
+    expect(statement.accept(new ExitDetector()), false);
+  }
+
+  void test_switch_withEnum_true_noDefault() {
+    Source source = addSource(r'''
+enum E { A, B }
+String f(E e) {
+  switch (e) {
+    case A:
+      return 'A';
+    case B:
+      return 'B';
+  }
+}
+''');
+    LibraryElement element = resolve(source);
+    CompilationUnit unit = resolveCompilationUnit(source, element);
+    FunctionDeclaration function = unit.declarations.last;
+    BlockFunctionBody body = function.functionExpression.body;
+    Statement statement = body.block.statements[0];
+    expect(statement.accept(new ExitDetector()), true);
+  }
+
+  void test_switch_withEnum_true_withDefault() {
+    Source source = addSource(r'''
+enum E { A, B }
+String f(E e) {
+  switch (e) {
+    case A:
+      return 'A';
+    default:
+      return '?';
+  }
+}
+''');
+    LibraryElement element = resolve(source);
+    CompilationUnit unit = resolveCompilationUnit(source, element);
+    FunctionDeclaration function = unit.declarations.last;
+    BlockFunctionBody body = function.functionExpression.body;
+    Statement statement = body.block.statements[0];
+    expect(statement.accept(new ExitDetector()), true);
+  }
+}
+
 
 @reflectiveTest
 class FileBasedSourceTest {
   void test_equals_false_differentFiles() {
     JavaFile file1 = FileUtilities2.createFile("/does/not/exist1.dart");
     JavaFile file2 = FileUtilities2.createFile("/does/not/exist2.dart");
     FileBasedSource source1 = new FileBasedSource.con1(file1);
     FileBasedSource source2 = new FileBasedSource.con1(file2);
     expect(source1 == source2, isFalse);
   }
 
   void test_equals_false_null() {
     JavaFile file = FileUtilities2.createFile("/does/not/exist1.dart");
     FileBasedSource source1 = new FileBasedSource.con1(file);
     expect(source1 == null, isFalse);
   }
 
   void test_equals_true() {
     JavaFile file1 = FileUtilities2.createFile("/does/not/exist.dart");
     JavaFile file2 = FileUtilities2.createFile("/does/not/exist.dart");
     FileBasedSource source1 = new FileBasedSource.con1(file1);
     FileBasedSource source2 = new FileBasedSource.con1(file2);
     expect(source1 == source2, isTrue);
   }
 
-  void test_getEncoding() {
-    SourceFactory factory = new SourceFactory([new FileUriResolver()]);
-    String fullPath = "/does/not/exist.dart";
-    JavaFile file = FileUtilities2.createFile(fullPath);
-    FileBasedSource source = new FileBasedSource.con1(file);
-    expect(factory.fromEncoding(source.encoding), source);
-  }
-
-  void test_getFullName() {
-    String fullPath = "/does/not/exist.dart";
-    JavaFile file = FileUtilities2.createFile(fullPath);
-    FileBasedSource source = new FileBasedSource.con1(file);
-    expect(source.fullName, file.getAbsolutePath());
-  }
-
-  void test_getShortName() {
-    JavaFile file = FileUtilities2.createFile("/does/not/exist.dart");
-    FileBasedSource source = new FileBasedSource.con1(file);
-    expect(source.shortName, "exist.dart");
-  }
-
   void test_fileReadMode() {
     expect(FileBasedSource.fileReadMode('a'), 'a');
     expect(FileBasedSource.fileReadMode('a\n'), 'a\n');
     expect(FileBasedSource.fileReadMode('ab'), 'ab');
     expect(FileBasedSource.fileReadMode('abc'), 'abc');
     expect(FileBasedSource.fileReadMode('a\nb'), 'a\nb');
     expect(FileBasedSource.fileReadMode('a\rb'), 'a\rb');
     expect(FileBasedSource.fileReadMode('a\r\nb'), 'a\r\nb');
   }
 
@@ skipping 22 matching lines @@
     expect(FileBasedSource.fileReadMode('\r\na'), '\na');
 
     // '\r' -> '\n' as first, last and only character
     expect(FileBasedSource.fileReadMode('\r'), '\n');
     expect(FileBasedSource.fileReadMode('a\r'), 'a\n');
     expect(FileBasedSource.fileReadMode('\ra'), '\na');
 
     FileBasedSource.fileReadMode = (String s) => s;
   }
 
+  void test_getEncoding() {
+    SourceFactory factory = new SourceFactory([new FileUriResolver()]);
+    String fullPath = "/does/not/exist.dart";
+    JavaFile file = FileUtilities2.createFile(fullPath);
+    FileBasedSource source = new FileBasedSource.con1(file);
+    expect(factory.fromEncoding(source.encoding), source);
+  }
+
+  void test_getFullName() {
+    String fullPath = "/does/not/exist.dart";
+    JavaFile file = FileUtilities2.createFile(fullPath);
+    FileBasedSource source = new FileBasedSource.con1(file);
+    expect(source.fullName, file.getAbsolutePath());
+  }
+
+  void test_getShortName() {
+    JavaFile file = FileUtilities2.createFile("/does/not/exist.dart");
+    FileBasedSource source = new FileBasedSource.con1(file);
+    expect(source.shortName, "exist.dart");
+  }
+
   void test_hashCode() {
     JavaFile file1 = FileUtilities2.createFile("/does/not/exist.dart");
     JavaFile file2 = FileUtilities2.createFile("/does/not/exist.dart");
     FileBasedSource source1 = new FileBasedSource.con1(file1);
     FileBasedSource source2 = new FileBasedSource.con1(file2);
     expect(source2.hashCode, source1.hashCode);
   }
 
   void test_isInSystemLibrary_contagious() {
     JavaFile sdkDirectory = DirectoryBasedDartSdk.defaultSdkDirectory;
@@ skipping 1429 matching lines @@
     } else {
       expect(scriptSource, isNotNull, reason: "script $scriptIndex");
       String actualExternalScriptName = scriptSource.shortName;
       expect(
           actualExternalScriptName,
           _expectedExternalScriptName,
           reason: "script $scriptIndex");
     }
   }
 }