Convert all 'wrong' test to 'BAD'.

pkg/analysis_server/test/services/correction/assist_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.
 
 library test.services.correction.assist;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/plugin/protocol/protocol.dart';
@@ skipping 325 matching lines @@
         'item in',
         DartAssistKind.ADD_TYPE_ANNOTATION,
         '''
 main(List<String> items) {
   for (final String item in items) {
   }
 }
 ''');
   }
 
+  test_addTypeAnnotation_local_BAD_hasTypeAnnotation() async {
+    resolveTestUnit('''
+main() {
+  int v = 42;
+}
+''');
+    await assertNoAssistAt(' = 42', DartAssistKind.ADD_TYPE_ANNOTATION);
+  }
+
+  test_addTypeAnnotation_local_BAD_multiple() async {
+    resolveTestUnit('''
+main() {
+  var a = 1, b = '';
+}
+''');
+    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+  }
+
+  test_addTypeAnnotation_local_BAD_noValue() async {
+    verifyNoTestUnitErrors = false;
+    resolveTestUnit('''
+main() {
+  var v;
+}
+''');
+    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+  }
+
+  test_addTypeAnnotation_local_BAD_null() async {
+    resolveTestUnit('''
+main() {
+  var v = null;
+}
+''');
+    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+  }
+
+  test_addTypeAnnotation_local_BAD_unknown() async {
+    verifyNoTestUnitErrors = false;
+    resolveTestUnit('''
+main() {
+  var v = unknownVar;
+}
+''');
+    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+  }
+
   test_addTypeAnnotation_local_generic_OK_literal() async {
     resolveTestUnit('''
 class A {
   main(List<int> items) {
     var v = items;
   }
 }
 ''');
     await assertHasAssistAt(
         'v =',
@@ skipping 267 matching lines @@
     await assertHasAssistAt(
         ' // marker',
         DartAssistKind.ADD_TYPE_ANNOTATION,
         '''
 main() {
   int v = 123; // marker
 }
 ''');
   }
 
-  test_addTypeAnnotation_local_wrong_hasTypeAnnotation() async {
-    resolveTestUnit('''
-main() {
-  int v = 42;
-}
-''');
-    await assertNoAssistAt(' = 42', DartAssistKind.ADD_TYPE_ANNOTATION);
-  }
-
-  test_addTypeAnnotation_local_wrong_multiple() async {
-    resolveTestUnit('''
-main() {
-  var a = 1, b = '';
-}
-''');
-    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
-  }
-
-  test_addTypeAnnotation_local_wrong_noValue() async {
-    verifyNoTestUnitErrors = false;
-    resolveTestUnit('''
-main() {
-  var v;
-}
-''');
-    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
-  }
-
-  test_addTypeAnnotation_local_wrong_null() async {
-    resolveTestUnit('''
-main() {
-  var v = null;
-}
-''');
-    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
-  }
-
-  test_addTypeAnnotation_local_wrong_unknown() async {
-    verifyNoTestUnitErrors = false;
-    resolveTestUnit('''
-main() {
-  var v = unknownVar;
-}
-''');
-    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
-  }
-
   test_addTypeAnnotation_OK_privateType_sameLibrary() async {
     resolveTestUnit('''
 class _A {}
 _A getValue() => new _A();
 main() {
   var v = getValue();
 }
 ''');
     await assertHasAssistAt(
         'var ',
@@ skipping 38 matching lines @@
         'test',
         DartAssistKind.ADD_TYPE_ANNOTATION,
         '''
 foo(f(int p)) {}
 main() {
   foo((int test) {});
 }
 ''');
   }
 
+  test_addTypeAnnotation_topLevelField_BAD_multiple() async {
+    resolveTestUnit('''
+var A = 1, V = '';
+''');
+    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+  }
+
+  test_addTypeAnnotation_topLevelField_BAD_noValue() async {
+    resolveTestUnit('''
+var V;
+''');
+    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
+  }
+
   test_addTypeAnnotation_topLevelField_OK_int() async {
     resolveTestUnit('''
 var V = 0;
 ''');
     await assertHasAssistAt(
         'var ',
         DartAssistKind.ADD_TYPE_ANNOTATION,
         '''
 int V = 0;
 ''');
   }
 
-  test_addTypeAnnotation_topLevelField_wrong_multiple() async {
-    resolveTestUnit('''
-var A = 1, V = '';
-''');
-    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
-  }
-
-  test_addTypeAnnotation_topLevelField_wrong_noValue() async {
-    resolveTestUnit('''
-var V;
-''');
-    await assertNoAssistAt('var ', DartAssistKind.ADD_TYPE_ANNOTATION);
-  }
-
   test_assignToLocalVariable() async {
     resolveTestUnit('''
 main() {
   List<int> bytes;
   readBytes();
 }
 List<int> readBytes() => <int>[];
 ''');
     await assertHasAssistAt(
         'readBytes();',
@@ skipping 205 matching lines @@
         '''
 class A {
   /// AAAAAAA [int] AAAAAAA
   /// BBBBBBBB BBBB BBBB
   /// CCC [A] CCCCCCCCCCC
   mmm() {}
 }
 ''');
   }
 
+  test_convertToBlockBody_BAD_noEnclosingFunction() async {
+    resolveTestUnit('''
+var v = 123;
+''');
+    await assertNoAssistAt('v =', DartAssistKind.CONVERT_INTO_BLOCK_BODY);
+  }
+
+  test_convertToBlockBody_BAD_notExpressionBlock() async {
+    resolveTestUnit('''
+fff() {
+  return 123;
+}
+''');
+    await assertNoAssistAt('fff() {', DartAssistKind.CONVERT_INTO_BLOCK_BODY);
+  }
+
   test_convertToBlockBody_OK_async() async {
     resolveTestUnit('''
 class A {
   mmm() async => 123;
 }
 ''');
     await assertHasAssistAt(
         'mmm()',
         DartAssistKind.CONVERT_INTO_BLOCK_BODY,
         '''
@@ skipping 114 matching lines @@
     await assertHasAssistAt(
         '23;',
         DartAssistKind.CONVERT_INTO_BLOCK_BODY,
         '''
 fff() {
   return 123;
 }
 ''');
   }
 
-  test_convertToBlockBody_wrong_noEnclosingFunction() async {
+  test_convertToExpressionBody_BAD_already() async {
     resolveTestUnit('''
-var v = 123;
+fff() => 42;
 ''');
-    await assertNoAssistAt('v =', DartAssistKind.CONVERT_INTO_BLOCK_BODY);
+    await assertNoAssistAt(
+        'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
   }
 
-  test_convertToBlockBody_wrong_notExpressionBlock() async {
+  test_convertToExpressionBody_BAD_moreThanOneStatement() async {
     resolveTestUnit('''
 fff() {
-  return 123;
+  var v = 42;
+  return v;
 }
 ''');
-    await assertNoAssistAt('fff() {', DartAssistKind.CONVERT_INTO_BLOCK_BODY);
+    await assertNoAssistAt(
+        'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
+  }
+
+  test_convertToExpressionBody_BAD_noEnclosingFunction() async {
+    resolveTestUnit('''
+var V = 42;
+''');
+    await assertNoAssistAt('V = ', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
+  }
+
+  test_convertToExpressionBody_BAD_noReturn() async {
+    resolveTestUnit('''
+fff() {
+  var v = 42;
+}
+''');
+    await assertNoAssistAt(
+        'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
+  }
+
+  test_convertToExpressionBody_BAD_noReturnValue() async {
+    resolveTestUnit('''
+fff() {
+  return;
+}
+''');
+    await assertNoAssistAt(
+        'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
   }
 
   test_convertToExpressionBody_OK_async() async {
     resolveTestUnit('''
 class A {
   mmm() async {
     return 42;
   }
 }
 ''');
@@ skipping 118 matching lines @@
 }
 ''');
     await assertHasAssistAt(
         'return',
         DartAssistKind.CONVERT_INTO_EXPRESSION_BODY,
         '''
 fff() => 42;
 ''');
   }
 
-  test_convertToExpressionBody_wrong_already() async {
-    resolveTestUnit('''
-fff() => 42;
-''');
-    await assertNoAssistAt(
-        'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
-  }
-
-  test_convertToExpressionBody_wrong_moreThanOneStatement() async {
-    resolveTestUnit('''
-fff() {
-  var v = 42;
-  return v;
-}
-''');
-    await assertNoAssistAt(
-        'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
-  }
-
-  test_convertToExpressionBody_wrong_noEnclosingFunction() async {
-    resolveTestUnit('''
-var V = 42;
-''');
-    await assertNoAssistAt('V = ', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
-  }
-
-  test_convertToExpressionBody_wrong_noReturn() async {
-    resolveTestUnit('''
-fff() {
-  var v = 42;
-}
-''');
-    await assertNoAssistAt(
-        'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
-  }
-
-  test_convertToExpressionBody_wrong_noReturnValue() async {
-    resolveTestUnit('''
-fff() {
-  return;
-}
-''');
-    await assertNoAssistAt(
-        'fff()', DartAssistKind.CONVERT_INTO_EXPRESSION_BODY);
-  }
-
   test_convertToFieldParameter_BAD_additionalUse() async {
     resolveTestUnit('''
 class A {
   int aaa2;
   int bbb2;
   A(int aaa) : aaa2 = aaa, bbb2 = aaa;
 }
 ''');
     await assertNoAssistAt('aaa)', DartAssistKind.CONVERT_TO_FIELD_PARAMETER);
   }
@@ skipping 247 matching lines @@
 main(List<String> items) {
   for (int k = 0; k < items.length; k++) {
     String item = items[k];
     print(item);
     int i = 0, j = 1;
   }
 }
 ''');
   }
 
+  test_convertToIsNot_BAD_is_alreadyIsNot() async {
+    resolveTestUnit('''
+main(p) {
+  p is! String;
+}
+''');
+    await assertNoAssistAt('is!', DartAssistKind.CONVERT_INTO_IS_NOT);
+  }
+
+  test_convertToIsNot_BAD_is_noEnclosingParenthesis() async {
+    resolveTestUnit('''
+main(p) {
+  p is String;
+}
+''');
+    await assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
+  }
+
+  test_convertToIsNot_BAD_is_noPrefix() async {
+    resolveTestUnit('''
+main(p) {
+  (p is String);
+}
+''');
+    await assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
+  }
+
+  test_convertToIsNot_BAD_is_notIsExpression() async {
+    resolveTestUnit('''
+main(p) {
+  123 + 456;
+}
+''');
+    await assertNoAssistAt('123 +', DartAssistKind.CONVERT_INTO_IS_NOT);
+  }
+
+  test_convertToIsNot_BAD_is_notTheNotOperator() async {
+    verifyNoTestUnitErrors = false;
+    resolveTestUnit('''
+main(p) {
+  ++(p is String);
+}
+''');
+    await assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
+  }
+
+  test_convertToIsNot_BAD_not_alreadyIsNot() async {
+    resolveTestUnit('''
+main(p) {
+  !(p is! String);
+}
+''');
+    await assertNoAssistAt('!(p', DartAssistKind.CONVERT_INTO_IS_NOT);
+  }
+
+  test_convertToIsNot_BAD_not_noEnclosingParenthesis() async {
+    resolveTestUnit('''
+main(p) {
+  !p;
+}
+''');
+    await assertNoAssistAt('!p', DartAssistKind.CONVERT_INTO_IS_NOT);
+  }
+
+  test_convertToIsNot_BAD_not_notIsExpression() async {
+    resolveTestUnit('''
+main(p) {
+  !(p == null);
+}
+''');
+    await assertNoAssistAt('!(p', DartAssistKind.CONVERT_INTO_IS_NOT);
+  }
+
+  test_convertToIsNot_BAD_not_notTheNotOperator() async {
+    verifyNoTestUnitErrors = false;
+    resolveTestUnit('''
+main(p) {
+  ++(p is String);
+}
+''');
+    await assertNoAssistAt('++(', DartAssistKind.CONVERT_INTO_IS_NOT);
+  }
+
   test_convertToIsNot_OK_childOfIs_left() async {
     resolveTestUnit('''
 main(p) {
   !(p is String);
 }
 ''');
     await assertHasAssistAt(
         'p is',
         DartAssistKind.CONVERT_INTO_IS_NOT,
         '''
 main(p) {
-  p is! String;
-}
-''');
-  }
-
-  test_convertToIsNot_OK_childOfIs_right() async {
-    resolveTestUnit('''
-main(p) {
-  !(p is String);
-}
-''');
-    await assertHasAssistAt(
-        'String)',
-        DartAssistKind.CONVERT_INTO_IS_NOT,
-        '''
-main(p) {
-  p is! String;
-}
-''');
-  }
-
-  test_convertToIsNot_OK_is() async {
-    resolveTestUnit('''
-main(p) {
-  !(p is String);
-}
-''');
-    await assertHasAssistAt(
-        'is String',
-        DartAssistKind.CONVERT_INTO_IS_NOT,
-        '''
-main(p) {
-  p is! String;
-}
-''');
-  }
-
-  test_convertToIsNot_OK_is_higherPrecedencePrefix() async {
-    resolveTestUnit('''
-main(p) {
-  !!(p is String);
-}
-''');
-    await assertHasAssistAt(
-        'is String',
-        DartAssistKind.CONVERT_INTO_IS_NOT,
-        '''
-main(p) {
-  !(p is! String);
-}
-''');
-  }
-
-  test_convertToIsNot_OK_is_not_higherPrecedencePrefix() async {
-    resolveTestUnit('''
-main(p) {
-  !!(p is String);
-}
-''');
-    await assertHasAssistAt(
-        '!(p',
-        DartAssistKind.CONVERT_INTO_IS_NOT,
-        '''
-main(p) {
-  !(p is! String);
-}
-''');
-  }
-
-  test_convertToIsNot_OK_not() async {
-    resolveTestUnit('''
-main(p) {
-  !(p is String);
-}
-''');
-    await assertHasAssistAt(
-        '!(p',
-        DartAssistKind.CONVERT_INTO_IS_NOT,
-        '''
-main(p) {
   p is! String;
 }
 ''');
   }
 
-  test_convertToIsNot_OK_parentheses() async {
+  test_convertToIsNot_OK_childOfIs_right() async {
     resolveTestUnit('''
 main(p) {
   !(p is String);
 }
 ''');
     await assertHasAssistAt(
-        '(p is',
+        'String)',
         DartAssistKind.CONVERT_INTO_IS_NOT,
         '''
 main(p) {
   p is! String;
 }
 ''');
   }
 
-  test_convertToIsNot_wrong_is_alreadyIsNot() async {
+  test_convertToIsNot_OK_is() async {
     resolveTestUnit('''
 main(p) {
+  !(p is String);
+}
+''');
+    await assertHasAssistAt(
+        'is String',
+        DartAssistKind.CONVERT_INTO_IS_NOT,
+        '''
+main(p) {
   p is! String;
 }
 ''');
-    await assertNoAssistAt('is!', DartAssistKind.CONVERT_INTO_IS_NOT);
   }
 
-  test_convertToIsNot_wrong_is_noEnclosingParenthesis() async {
+  test_convertToIsNot_OK_is_higherPrecedencePrefix() async {
     resolveTestUnit('''
 main(p) {
-  p is String;
+  !!(p is String);
 }
 ''');
-    await assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
-  }
-
-  test_convertToIsNot_wrong_is_noPrefix() async {
-    resolveTestUnit('''
-main(p) {
-  (p is String);
-}
-''');
-    await assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
-  }
-
-  test_convertToIsNot_wrong_is_notIsExpression() async {
-    resolveTestUnit('''
-main(p) {
-  123 + 456;
-}
-''');
-    await assertNoAssistAt('123 +', DartAssistKind.CONVERT_INTO_IS_NOT);
-  }
-
-  test_convertToIsNot_wrong_is_notTheNotOperator() async {
-    verifyNoTestUnitErrors = false;
-    resolveTestUnit('''
-main(p) {
-  ++(p is String);
-}
-''');
-    await assertNoAssistAt('is String', DartAssistKind.CONVERT_INTO_IS_NOT);
-  }
-
-  test_convertToIsNot_wrong_not_alreadyIsNot() async {
-    resolveTestUnit('''
+    await assertHasAssistAt(
+        'is String',
+        DartAssistKind.CONVERT_INTO_IS_NOT,
+        '''
 main(p) {
   !(p is! String);
 }
 ''');
-    await assertNoAssistAt('!(p', DartAssistKind.CONVERT_INTO_IS_NOT);
   }
 
-  test_convertToIsNot_wrong_not_noEnclosingParenthesis() async {
+  test_convertToIsNot_OK_is_not_higherPrecedencePrefix() async {
     resolveTestUnit('''
 main(p) {
-  !p;
+  !!(p is String);
 }
 ''');
-    await assertNoAssistAt('!p', DartAssistKind.CONVERT_INTO_IS_NOT);
+    await assertHasAssistAt(
+        '!(p',
+        DartAssistKind.CONVERT_INTO_IS_NOT,
+        '''
+main(p) {
+  !(p is! String);
+}
+''');
   }
 
-  test_convertToIsNot_wrong_not_notIsExpression() async {
+  test_convertToIsNot_OK_not() async {
     resolveTestUnit('''
 main(p) {
-  !(p == null);
+  !(p is String);
 }
 ''');
-    await assertNoAssistAt('!(p', DartAssistKind.CONVERT_INTO_IS_NOT);
+    await assertHasAssistAt(
+        '!(p',
+        DartAssistKind.CONVERT_INTO_IS_NOT,
+        '''
+main(p) {
+  p is! String;
+}
+''');
   }
 
-  test_convertToIsNot_wrong_not_notTheNotOperator() async {
+  test_convertToIsNot_OK_parentheses() async {
+    resolveTestUnit('''
+main(p) {
+  !(p is String);
+}
+''');
+    await assertHasAssistAt(
+        '(p is',
+        DartAssistKind.CONVERT_INTO_IS_NOT,
+        '''
+main(p) {
+  p is! String;
+}
+''');
+  }
+
+  test_convertToIsNotEmpty_BAD_noBang() async {
     verifyNoTestUnitErrors = false;
     resolveTestUnit('''
-main(p) {
-  ++(p is String);
+main(String str) {
+  ~str.isEmpty;
 }
 ''');
-    await assertNoAssistAt('++(', DartAssistKind.CONVERT_INTO_IS_NOT);
+    await assertNoAssistAt(
+        'isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
+  }
+
+  test_convertToIsNotEmpty_BAD_noIsNotEmpty() async {
+    resolveTestUnit('''
+class A {
+  bool get isEmpty => false;
+}
+main(A a) {
+  !a.isEmpty;
+}
+''');
+    await assertNoAssistAt(
+        'isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
+  }
+
+  test_convertToIsNotEmpty_BAD_notInPrefixExpression() async {
+    resolveTestUnit('''
+main(String str) {
+  str.isEmpty;
+}
+''');
+    await assertNoAssistAt(
+        'isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
+  }
+
+  test_convertToIsNotEmpty_BAD_notIsEmpty() async {
+    resolveTestUnit('''
+main(int p) {
+  !p.isEven;
+}
+''');
+    await assertNoAssistAt('isEven;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
   }
 
   test_convertToIsNotEmpty_OK_on_isEmpty() async {
     resolveTestUnit('''
 main(String str) {
   !str.isEmpty;
 }
 ''');
     await assertHasAssistAt(
         'isEmpty',
@@ skipping 30 matching lines @@
     await assertHasAssistAt(
         'isEmpty',
         DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY,
         '''
 main(String str) {
   'text'.isNotEmpty;
 }
 ''');
   }
 
-  test_convertToIsNotEmpty_wrong_noBang() async {
-    verifyNoTestUnitErrors = false;
-    resolveTestUnit('''
-main(String str) {
-  ~str.isEmpty;
-}
-''');
-    await assertNoAssistAt(
-        'isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
-  }
-
-  test_convertToIsNotEmpty_wrong_noIsNotEmpty() async {
-    resolveTestUnit('''
-class A {
-  bool get isEmpty => false;
-}
-main(A a) {
-  !a.isEmpty;
-}
-''');
-    await assertNoAssistAt(
-        'isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
-  }
-
-  test_convertToIsNotEmpty_wrong_notInPrefixExpression() async {
-    resolveTestUnit('''
-main(String str) {
-  str.isEmpty;
-}
-''');
-    await assertNoAssistAt(
-        'isEmpty;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
-  }
-
-  test_convertToIsNotEmpty_wrong_notIsEmpty() async {
-    resolveTestUnit('''
-main(int p) {
-  !p.isEven;
-}
-''');
-    await assertNoAssistAt('isEven;', DartAssistKind.CONVERT_INTO_IS_NOT_EMPTY);
-  }
-
   test_convertToNormalParameter_OK_dynamic() async {
     resolveTestUnit('''
 class A {
   var test;
   A(this.test) {
   }
 }
 ''');
     await assertHasAssistAt(
         'test)',
@@ skipping 162 matching lines @@
   void set test(test) {
     _test = test;
   }
 }
 main(A a) {
   print(a.test);
 }
 ''');
   }
 
+  test_exchangeBinaryExpressionArguments_BAD_extraLength() async {
+    resolveTestUnit('''
+main() {
+  111 + 222;
+}
+''');
+    length = 3;
+    await assertNoAssistAt('+ 222', DartAssistKind.EXCHANGE_OPERANDS);
+  }
+
+  test_exchangeBinaryExpressionArguments_BAD_onOperand() async {
+    resolveTestUnit('''
+main() {
+  111 + 222;
+}
+''');
+    length = 3;
+    await assertNoAssistAt('11 +', DartAssistKind.EXCHANGE_OPERANDS);
+  }
+
+  test_exchangeBinaryExpressionArguments_BAD_selectionWithBinary() async {
+    resolveTestUnit('''
+main() {
+  1 + 2 + 3;
+}
+''');
+    length = '1 + 2 + 3'.length;
+    await assertNoAssistAt('1 + 2 + 3', DartAssistKind.EXCHANGE_OPERANDS);
+  }
+
   test_exchangeBinaryExpressionArguments_OK_compare() async {
     const initialOperators = const ['<', '<=', '>', '>='];
     const resultOperators = const ['>', '>=', '<', '<='];
     for (int i = 0; i <= 0; i++) {
       String initialOperator = initialOperators[i];
       String resultOperator = resultOperators[i];
       resolveTestUnit('''
 bool main(int a, int b) {
   return a $initialOperator b;
 }
@@ skipping 132 matching lines @@
     await assertHasAssistAt(
         '+ 2',
         DartAssistKind.EXCHANGE_OPERANDS,
         '''
 main() {
   2 + 1;
 }
 ''');
   }
 
-  test_exchangeBinaryExpressionArguments_wrong_extraLength() async {
-    resolveTestUnit('''
-main() {
-  111 + 222;
-}
-''');
-    length = 3;
-    await assertNoAssistAt('+ 222', DartAssistKind.EXCHANGE_OPERANDS);
-  }
-
-  test_exchangeBinaryExpressionArguments_wrong_onOperand() async {
-    resolveTestUnit('''
-main() {
-  111 + 222;
-}
-''');
-    length = 3;
-    await assertNoAssistAt('11 +', DartAssistKind.EXCHANGE_OPERANDS);
-  }
-
-  test_exchangeBinaryExpressionArguments_wrong_selectionWithBinary() async {
-    resolveTestUnit('''
-main() {
-  1 + 2 + 3;
-}
-''');
-    length = '1 + 2 + 3'.length;
-    await assertNoAssistAt('1 + 2 + 3', DartAssistKind.EXCHANGE_OPERANDS);
-  }
-
   test_importAddShow_BAD_hasShow() async {
     resolveTestUnit('''
 import 'dart:math' show PI;
 main() {
   PI;
 }
 ''');
     await assertNoAssistAt('import ', DartAssistKind.IMPORT_ADD_SHOW);
   }
 
@@ skipping 223 matching lines @@
         '''
 main() {
   if (false)
     1;
   else
     0;
 }
 ''');
   }
 
+  test_joinIfStatementInner_BAD_innerNotIf() async {
+    resolveTestUnit('''
+main() {
+  if (1 == 1) {
+    print(0);
+  }
+}
+''');
+    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+  }
+
+  test_joinIfStatementInner_BAD_innerWithElse() async {
+    resolveTestUnit('''
+main() {
+  if (1 == 1) {
+    if (2 == 2) {
+      print(0);
+    } else {
+      print(1);
+    }
+  }
+}
+''');
+    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+  }
+
+  test_joinIfStatementInner_BAD_statementAfterInner() async {
+    resolveTestUnit('''
+main() {
+  if (1 == 1) {
+    if (2 == 2) {
+      print(2);
+    }
+    print(1);
+  }
+}
+''');
+    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+  }
+
+  test_joinIfStatementInner_BAD_statementBeforeInner() async {
+    resolveTestUnit('''
+main() {
+  if (1 == 1) {
+    print(1);
+    if (2 == 2) {
+      print(2);
+    }
+  }
+}
+''');
+    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+  }
+
+  test_joinIfStatementInner_BAD_targetNotIf() async {
+    resolveTestUnit('''
+main() {
+  print(0);
+}
+''');
+    await assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_INNER);
+  }
+
+  test_joinIfStatementInner_BAD_targetWithElse() async {
+    resolveTestUnit('''
+main() {
+  if (1 == 1) {
+    if (2 == 2) {
+      print(0);
+    }
+  } else {
+    print(1);
+  }
+}
+''');
+    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+  }
+
   test_joinIfStatementInner_OK_conditionAndOr() async {
     resolveTestUnit('''
 main() {
   if (1 == 1) {
     if (2 == 2 || 3 == 3) {
       print(0);
     }
   }
 }
 ''');
@@ skipping 160 matching lines @@
         DartAssistKind.JOIN_IF_WITH_INNER,
         '''
 main() {
   if (1 == 1 && 2 == 2) {
     print(0);
   }
 }
 ''');
   }
 
-  test_joinIfStatementInner_wrong_innerNotIf() async {
+  test_joinIfStatementOuter_BAD_outerNotIf() async {
     resolveTestUnit('''
 main() {
   if (1 == 1) {
     print(0);
   }
 }
 ''');
-    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+    await assertNoAssistAt('if (1 == 1', DartAssistKind.JOIN_IF_WITH_OUTER);
   }
 
-  test_joinIfStatementInner_wrong_innerWithElse() async {
+  test_joinIfStatementOuter_BAD_outerWithElse() async {
     resolveTestUnit('''
 main() {
   if (1 == 1) {
     if (2 == 2) {
       print(0);
-    } else {
-      print(1);
     }
+  } else {
+    print(1);
   }
 }
 ''');
-    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
   }
 
-  test_joinIfStatementInner_wrong_statementAfterInner() async {
+  test_joinIfStatementOuter_BAD_statementAfterInner() async {
     resolveTestUnit('''
 main() {
   if (1 == 1) {
     if (2 == 2) {
       print(2);
     }
     print(1);
   }
 }
 ''');
-    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
   }
 
-  test_joinIfStatementInner_wrong_statementBeforeInner() async {
+  test_joinIfStatementOuter_BAD_statementBeforeInner() async {
     resolveTestUnit('''
 main() {
   if (1 == 1) {
     print(1);
     if (2 == 2) {
       print(2);
     }
   }
 }
 ''');
-    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
   }
 
-  test_joinIfStatementInner_wrong_targetNotIf() async {
+  test_joinIfStatementOuter_BAD_targetNotIf() async {
     resolveTestUnit('''
 main() {
   print(0);
 }
 ''');
-    await assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_INNER);
+    await assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_OUTER);
   }
 
-  test_joinIfStatementInner_wrong_targetWithElse() async {
+  test_joinIfStatementOuter_BAD_targetWithElse() async {
     resolveTestUnit('''
 main() {
   if (1 == 1) {
     if (2 == 2) {
       print(0);
+    } else {
+      print(1);
     }
-  } else {
-    print(1);
   }
 }
 ''');
-    await assertNoAssistAt('if (1 ==', DartAssistKind.JOIN_IF_WITH_INNER);
+    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
   }
 
   test_joinIfStatementOuter_OK_conditionAndOr() async {
     resolveTestUnit('''
 main() {
   if (1 == 1) {
     if (2 == 2 || 3 == 3) {
       print(0);
     }
   }
@@ skipping 162 matching lines @@
         DartAssistKind.JOIN_IF_WITH_OUTER,
         '''
 main() {
   if (1 == 1 && 2 == 2) {
     print(0);
   }
 }
 ''');
   }
 
-  test_joinIfStatementOuter_wrong_outerNotIf() async {
+  test_joinVariableDeclaration_onAssignment_BAD_hasInitializer() async {
     resolveTestUnit('''
 main() {
-  if (1 == 1) {
-    print(0);
+  var v = 1;
+  v = 2;
+}
+''');
+    await assertNoAssistAt('v = 2', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+  }
+
+  test_joinVariableDeclaration_onAssignment_BAD_notAdjacent() async {
+    resolveTestUnit('''
+main() {
+  var v;
+  var bar;
+  v = 1;
+}
+''');
+    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+  }
+
+  test_joinVariableDeclaration_onAssignment_BAD_notAssignment() async {
+    resolveTestUnit('''
+main() {
+  var v;
+  v += 1;
+}
+''');
+    await assertNoAssistAt('v += 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+  }
+
+  test_joinVariableDeclaration_onAssignment_BAD_notDeclaration() async {
+    resolveTestUnit('''
+main(var v) {
+  v = 1;
+}
+''');
+    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+  }
+
+  test_joinVariableDeclaration_onAssignment_BAD_notLeftArgument() async {
+    resolveTestUnit('''
+main() {
+  var v;
+  1 + v; // marker
+}
+''');
+    await assertNoAssistAt(
+        'v; // marker', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+  }
+
+  test_joinVariableDeclaration_onAssignment_BAD_notOneVariable() async {
+    resolveTestUnit('''
+main() {
+  var v, v2;
+  v = 1;
+}
+''');
+    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+  }
+
+  test_joinVariableDeclaration_onAssignment_BAD_notResolved() async {
+    verifyNoTestUnitErrors = false;
+    resolveTestUnit('''
+main() {
+  var v;
+  x = 1;
+}
+''');
+    await assertNoAssistAt('x = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+  }
+
+  test_joinVariableDeclaration_onAssignment_BAD_notSameBlock() async {
+    resolveTestUnit('''
+main() {
+  var v;
+  {
+    v = 1;
   }
 }
 ''');
-    await assertNoAssistAt('if (1 == 1', DartAssistKind.JOIN_IF_WITH_OUTER);
-  }
-
-  test_joinIfStatementOuter_wrong_outerWithElse() async {
-    resolveTestUnit('''
-main() {
-  if (1 == 1) {
-    if (2 == 2) {
-      print(0);
-    }
-  } else {
-    print(1);
-  }
-}
-''');
-    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
-  }
-
-  test_joinIfStatementOuter_wrong_statementAfterInner() async {
-    resolveTestUnit('''
-main() {
-  if (1 == 1) {
-    if (2 == 2) {
-      print(2);
-    }
-    print(1);
-  }
-}
-''');
-    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
-  }
-
-  test_joinIfStatementOuter_wrong_statementBeforeInner() async {
-    resolveTestUnit('''
-main() {
-  if (1 == 1) {
-    print(1);
-    if (2 == 2) {
-      print(2);
-    }
-  }
-}
-''');
-    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
-  }
-
-  test_joinIfStatementOuter_wrong_targetNotIf() async {
-    resolveTestUnit('''
-main() {
-  print(0);
-}
-''');
-    await assertNoAssistAt('print', DartAssistKind.JOIN_IF_WITH_OUTER);
-  }
-
-  test_joinIfStatementOuter_wrong_targetWithElse() async {
-    resolveTestUnit('''
-main() {
-  if (1 == 1) {
-    if (2 == 2) {
-      print(0);
-    } else {
-      print(1);
-    }
-  }
-}
-''');
-    await assertNoAssistAt('if (2 == 2', DartAssistKind.JOIN_IF_WITH_OUTER);
+    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
   }
 
   test_joinVariableDeclaration_onAssignment_OK() async {
     resolveTestUnit('''
 main() {
   var v;
   v = 1;
 }
 ''');
     await assertHasAssistAt(
         'v =',
         DartAssistKind.JOIN_VARIABLE_DECLARATION,
         '''
 main() {
   var v = 1;
 }
 ''');
   }
 
-  test_joinVariableDeclaration_onAssignment_wrong_hasInitializer() async {
+  test_joinVariableDeclaration_onDeclaration_BAD_hasInitializer() async {
     resolveTestUnit('''
 main() {
   var v = 1;
   v = 2;
 }
 ''');
-    await assertNoAssistAt('v = 2', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
   }
 
-  test_joinVariableDeclaration_onAssignment_wrong_notAdjacent() async {
+  test_joinVariableDeclaration_onDeclaration_BAD_lastStatement() async {
+    resolveTestUnit('''
+main() {
+  if (true)
+    var v;
+}
+''');
+    await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+  }
+
+  test_joinVariableDeclaration_onDeclaration_BAD_nextNotAssignmentExpression() async {
     resolveTestUnit('''
 main() {
   var v;
-  var bar;
-  v = 1;
+  42;
 }
 ''');
-    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+    await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
   }
 
-  test_joinVariableDeclaration_onAssignment_wrong_notAssignment() async {
+  test_joinVariableDeclaration_onDeclaration_BAD_nextNotExpressionStatement() async {
+    resolveTestUnit('''
+main() {
+  var v;
+  if (true) return;
+}
+''');
+    await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+  }
+
+  test_joinVariableDeclaration_onDeclaration_BAD_nextNotPureAssignment() async {
     resolveTestUnit('''
 main() {
   var v;
   v += 1;
 }
 ''');
-    await assertNoAssistAt('v += 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+    await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
   }
 
-  test_joinVariableDeclaration_onAssignment_wrong_notDeclaration() async {
-    resolveTestUnit('''
-main(var v) {
-  v = 1;
-}
-''');
-    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
-  test_joinVariableDeclaration_onAssignment_wrong_notLeftArgument() async {
-    resolveTestUnit('''
-main() {
-  var v;
-  1 + v; // marker
-}
-''');
-    await assertNoAssistAt(
-        'v; // marker', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
-  test_joinVariableDeclaration_onAssignment_wrong_notOneVariable() async {
+  test_joinVariableDeclaration_onDeclaration_BAD_notOneVariable() async {
     resolveTestUnit('''
 main() {
   var v, v2;
   v = 1;
 }
 ''');
-    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
-  test_joinVariableDeclaration_onAssignment_wrong_notResolved() async {
-    verifyNoTestUnitErrors = false;
-    resolveTestUnit('''
-main() {
-  var v;
-  x = 1;
-}
-''');
-    await assertNoAssistAt('x = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
-  test_joinVariableDeclaration_onAssignment_wrong_notSameBlock() async {
-    resolveTestUnit('''
-main() {
-  var v;
-  {
-    v = 1;
-  }
-}
-''');
-    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
+    await assertNoAssistAt('v, ', DartAssistKind.JOIN_VARIABLE_DECLARATION);
   }
 
   test_joinVariableDeclaration_onDeclaration_OK_onName() async {
     resolveTestUnit('''
 main() {
   var v;
   v = 1;
 }
 ''');
     await assertHasAssistAt(
@@ skipping 33 matching lines @@
     await assertHasAssistAt(
         'var v',
         DartAssistKind.JOIN_VARIABLE_DECLARATION,
         '''
 main() {
   var v = 1;
 }
 ''');
   }
 
-  test_joinVariableDeclaration_onDeclaration_wrong_hasInitializer() async {
-    resolveTestUnit('''
-main() {
-  var v = 1;
-  v = 2;
-}
-''');
-    await assertNoAssistAt('v = 1', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
-  test_joinVariableDeclaration_onDeclaration_wrong_lastStatement() async {
-    resolveTestUnit('''
-main() {
-  if (true)
-    var v;
-}
-''');
-    await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
-  test_joinVariableDeclaration_onDeclaration_wrong_nextNotAssignmentExpression() async {
-    resolveTestUnit('''
-main() {
-  var v;
-  42;
-}
-''');
-    await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
-  test_joinVariableDeclaration_onDeclaration_wrong_nextNotExpressionStatement() async {
-    resolveTestUnit('''
-main() {
-  var v;
-  if (true) return;
-}
-''');
-    await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
-  test_joinVariableDeclaration_onDeclaration_wrong_nextNotPureAssignment() async {
-    resolveTestUnit('''
-main() {
-  var v;
-  v += 1;
-}
-''');
-    await assertNoAssistAt('v;', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
-  test_joinVariableDeclaration_onDeclaration_wrong_notOneVariable() async {
-    resolveTestUnit('''
-main() {
-  var v, v2;
-  v = 1;
-}
-''');
-    await assertNoAssistAt('v, ', DartAssistKind.JOIN_VARIABLE_DECLARATION);
-  }
-
   test_removeTypeAnnotation_classField_OK() async {
     resolveTestUnit('''
 class A {
   int v = 1;
 }
 ''');
     await assertHasAssistAt(
         'v = ',
         DartAssistKind.REMOVE_TYPE_ANNOTATION,
         '''
@@ skipping 84 matching lines @@
 final int V = 1;
 ''');
     await assertHasAssistAt(
         'int ',
         DartAssistKind.REMOVE_TYPE_ANNOTATION,
         '''
 final V = 1;
 ''');
   }
 
+  test_replaceConditionalWithIfElse_BAD_noEnclosingStatement() async {
+    resolveTestUnit('''
+var v = true ? 111 : 222;
+''');
+    await assertNoAssistAt(
+        '? 111', DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE);
+  }
+
+  test_replaceConditionalWithIfElse_BAD_notConditional() async {
+    resolveTestUnit('''
+main() {
+  var v = 42;
+}
+''');
+    await assertNoAssistAt(
+        'v = 42', DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE);
+  }
+
   test_replaceConditionalWithIfElse_OK_assignment() async {
     resolveTestUnit('''
 main() {
   var v;
   v = true ? 111 : 222;
 }
 ''');
     // on conditional
     await assertHasAssistAt(
         '11 :',
@@ skipping 58 matching lines @@
   int a = 1, vvv, b = 2;
   if (true) {
     vvv = 111;
   } else {
     vvv = 222;
   }
 }
 ''');
   }
 
-  test_replaceConditionalWithIfElse_wrong_noEnclosingStatement() async {
-    resolveTestUnit('''
-var v = true ? 111 : 222;
-''');
-    await assertNoAssistAt(
-        '? 111', DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE);
-  }
-
-  test_replaceConditionalWithIfElse_wrong_notConditional() async {
+  test_replaceIfElseWithConditional_BAD_expressionVsReturn() async {
     resolveTestUnit('''
 main() {
-  var v = 42;
+  if (true) {
+    print(42);
+  } else {
+    return;
+  }
 }
 ''');
     await assertNoAssistAt(
-        'v = 42', DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE);
+        'else', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
+  }
+
+  test_replaceIfElseWithConditional_BAD_notIfStatement() async {
+    resolveTestUnit('''
+main() {
+  print(0);
+}
+''');
+    await assertNoAssistAt(
+        'print', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
+  }
+
+  test_replaceIfElseWithConditional_BAD_notSingleStatement() async {
+    resolveTestUnit('''
+main() {
+  int vvv;
+  if (true) {
+    print(0);
+    vvv = 111;
+  } else {
+    print(0);
+    vvv = 222;
+  }
+}
+''');
+    await assertNoAssistAt(
+        'if (true)', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
   }
 
   test_replaceIfElseWithConditional_OK_assignment() async {
     resolveTestUnit('''
 main() {
   int vvv;
   if (true) {
     vvv = 111;
   } else {
     vvv = 222;
@@ skipping 24 matching lines @@
     await assertHasAssistAt(
         'if (true)',
         DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL,
         '''
 main() {
   return true ? 111 : 222;
 }
 ''');
   }
 
-  test_replaceIfElseWithConditional_wrong_expressionVsReturn() async {
+  test_splitAndCondition_BAD_hasElse() async {
     resolveTestUnit('''
 main() {
-  if (true) {
-    print(42);
+  if (1 == 1 && 2 == 2) {
+    print(1);
   } else {
-    return;
+    print(2);
   }
 }
 ''');
-    await assertNoAssistAt(
-        'else', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
+    await assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
   }
 
-  test_replaceIfElseWithConditional_wrong_notIfStatement() async {
+  test_splitAndCondition_BAD_notAnd() async {
     resolveTestUnit('''
 main() {
-  print(0);
-}
-''');
-    await assertNoAssistAt(
-        'print', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
-  }
-
-  test_replaceIfElseWithConditional_wrong_notSingleStatement() async {
-    resolveTestUnit('''
-main() {
-  int vvv;
-  if (true) {
+  if (1 == 1 || 2 == 2) {
     print(0);
-    vvv = 111;
-  } else {
-    print(0);
-    vvv = 222;
   }
 }
 ''');
-    await assertNoAssistAt(
-        'if (true)', DartAssistKind.REPLACE_IF_ELSE_WITH_CONDITIONAL);
+    await assertNoAssistAt('|| 2', DartAssistKind.SPLIT_AND_CONDITION);
+  }
+
+  test_splitAndCondition_BAD_notPartOfIf() async {
+    resolveTestUnit('''
+main() {
+  print(1 == 1 && 2 == 2);
+}
+''');
+    await assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
+  }
+
+  test_splitAndCondition_BAD_notTopLevelAnd() async {
+    resolveTestUnit('''
+main() {
+  if (true || (1 == 1 && 2 == 2)) {
+    print(0);
+  }
+  if (true && (3 == 3 && 4 == 4)) {
+    print(0);
+  }
+}
+''');
+    await assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
+    await assertNoAssistAt('&& 4', DartAssistKind.SPLIT_AND_CONDITION);
   }
 
   test_splitAndCondition_OK_innerAndExpression() async {
     resolveTestUnit('''
 main() {
   if (1 == 1 && 2 == 2 && 3 == 3) {
     print(0);
   }
 }
 ''');
@@ skipping 69 matching lines @@
 ''');
     // not binary expression
     await assertNoAssistAt('main() {', DartAssistKind.SPLIT_AND_CONDITION);
     // selection is not empty and includes more than just operator
     {
       length = 5;
       await assertNoAssistAt('&& 2 == 2', DartAssistKind.SPLIT_AND_CONDITION);
     }
   }
 
-  test_splitAndCondition_wrong_hasElse() async {
+  test_splitVariableDeclaration_BAD_notOneVariable() async {
     resolveTestUnit('''
 main() {
-  if (1 == 1 && 2 == 2) {
-    print(1);
-  } else {
-    print(2);
-  }
+  var v = 1, v2;
 }
 ''');
-    await assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
-  }
-
-  test_splitAndCondition_wrong_notAnd() async {
-    resolveTestUnit('''
-main() {
-  if (1 == 1 || 2 == 2) {
-    print(0);
-  }
-}
-''');
-    await assertNoAssistAt('|| 2', DartAssistKind.SPLIT_AND_CONDITION);
-  }
-
-  test_splitAndCondition_wrong_notPartOfIf() async {
-    resolveTestUnit('''
-main() {
-  print(1 == 1 && 2 == 2);
-}
-''');
-    await assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
-  }
-
-  test_splitAndCondition_wrong_notTopLevelAnd() async {
-    resolveTestUnit('''
-main() {
-  if (true || (1 == 1 && 2 == 2)) {
-    print(0);
-  }
-  if (true && (3 == 3 && 4 == 4)) {
-    print(0);
-  }
-}
-''');
-    await assertNoAssistAt('&& 2', DartAssistKind.SPLIT_AND_CONDITION);
-    await assertNoAssistAt('&& 4', DartAssistKind.SPLIT_AND_CONDITION);
+    await assertNoAssistAt('v = 1', DartAssistKind.SPLIT_VARIABLE_DECLARATION);
   }
 
   test_splitVariableDeclaration_OK_onName() async {
     resolveTestUnit('''
 main() {
   var v = 1;
 }
 ''');
     await assertHasAssistAt(
         'v =',
@@ skipping 33 matching lines @@
         'var ',
         DartAssistKind.SPLIT_VARIABLE_DECLARATION,
         '''
 main() {
   var v;
   v = 1;
 }
 ''');
   }
 
-  test_splitVariableDeclaration_wrong_notOneVariable() async {
-    resolveTestUnit('''
-main() {
-  var v = 1, v2;
-}
-''');
-    await assertNoAssistAt('v = 1', DartAssistKind.SPLIT_VARIABLE_DECLARATION);
-  }
-
   test_surroundWith_block() async {
     resolveTestUnit('''
 main() {
 // start
   print(0);
   print(1);
 // end
 }
 ''');
     _setStartEndSelection();
@@ skipping 213 matching lines @@
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
 
   void _setStartEndSelection() {
     offset = findOffset('// start\n') + '// start\n'.length;
     length = findOffset('// end') - offset;
   }
 }