Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(691)

Unified Diff: pkg/analysis_server/test/services/correction/assist_test.dart

Issue 495733002: Don't use LinkedEditGroup.id. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/test/services/correction/assist_test.dart
diff --git a/pkg/analysis_server/test/services/correction/assist_test.dart b/pkg/analysis_server/test/services/correction/assist_test.dart
index d5fd995a7cedeb9eb358aceba38b40ed9ba5900b..ddf373fbad9669572735b29af5a55c1d5cc62341 100644
--- a/pkg/analysis_server/test/services/correction/assist_test.dart
+++ b/pkg/analysis_server/test/services/correction/assist_test.dart
@@ -57,20 +57,6 @@ class AssistProcessorTest extends AbstractSingleUnitTest {
assertHasAssist(kind, expected);
}
- void assertHasPositionGroup(String id, int expectedLength,
- List<Position> expectedPositions) {
- List<LinkedEditGroup> linkedPositionGroups = change.linkedEditGroups;
- for (LinkedEditGroup group in linkedPositionGroups) {
- if (group.id == id) {
- expect(group.length, expectedLength);
- expect(group.positions, unorderedEquals(expectedPositions));
- linkedPositionGroup = group;
- return;
- }
- }
- fail('No PositionGroup with id=$id found in $linkedPositionGroups');
- }
-
/**
* Asserts that there is no [Assist] of the given [kind] at [offset].
*/
@@ -309,13 +295,12 @@ main() {
}
List<int> readBytes() => <int>[];
''');
- assertHasPositionGroup('NAME', 9, expectedPositions(['readBytes = ']));
- expect(
- linkedPositionGroup.suggestions,
- unorderedEquals(
- expectedSuggestions(
- LinkedEditSuggestionKind.VARIABLE,
- ['list', 'bytes2', 'readBytes'])));
+ _assertLinkedGroup(
+ change.linkedEditGroups[0],
+ ['readBytes = '],
+ expectedSuggestions(
+ LinkedEditSuggestionKind.VARIABLE,
+ ['list', 'bytes2', 'readBytes']));
}
void test_assignToLocalVariable_alreadyAssignment() {
@@ -2202,28 +2187,13 @@ main() {
throw fail('Expected to find assist $kind in\n${assists.join('\n')}');
}
- void _assertHasLinkedPositions(String groupId, List<String> expectedStrings) {
+ void _assertLinkedGroup(LinkedEditGroup group, List<String> expectedStrings,
+ [List<LinkedEditSuggestion> expectedSuggestions]) {
List<Position> expectedPositions = _findResultPositions(expectedStrings);
- List<LinkedEditGroup> groups = change.linkedEditGroups;
- for (LinkedEditGroup group in groups) {
- if (group.id == groupId) {
- List<Position> actualPositions = group.positions;
- expect(actualPositions, unorderedEquals(expectedPositions));
- return;
- }
- }
- fail('No group with ID=$groupId foind in\n${groups.join('\n')}');
- }
-
- void _assertHasLinkedProposals(String groupId, List<String> expected) {
- List<LinkedEditGroup> groups = change.linkedEditGroups;
- for (LinkedEditGroup group in groups) {
- if (group.id == groupId) {
- expect(group.suggestions, expected);
- return;
- }
+ expect(group.positions, unorderedEquals(expectedPositions));
+ if (expectedSuggestions != null) {
+ expect(group.suggestions, unorderedEquals(expectedSuggestions));
}
- fail('No group with ID=$groupId foind in\n${groups.join('\n')}');
}
List<Position> _findResultPositions(List<String> searchStrings) {

Powered by Google App Engine
This is Rietveld 408576698