suggest re-exported elements of imported libraries

pkg/analysis_server/test/services/completion/completion_test_util.dart

Index: pkg/analysis_server/test/services/completion/completion_test_util.dart
diff --git a/pkg/analysis_server/test/services/completion/completion_test_util.dart b/pkg/analysis_server/test/services/completion/completion_test_util.dart
index 395f335ff978528a9b720f15f81e346de198790b..2816b1297a6736a015bd5e4af0089db4e9153c1f 100644
--- a/pkg/analysis_server/test/services/completion/completion_test_util.dart
+++ b/pkg/analysis_server/test/services/completion/completion_test_util.dart
@@ -67,7 +67,7 @@ class AbstractCompletionTest extends AbstractContextTest {
       bool isDeprecated = false, bool isPotential = false]) {
     CompletionSuggestion cs;
     request.suggestions.forEach((s) {
-      if (s.completion == completion) {
+      if (s.completion == completion && s.kind == kind) {
         if (cs == null) {
           cs = s;
         } else {
@@ -223,6 +223,12 @@ class AbstractCompletionTest extends AbstractContextTest {
     return cs;
   }
 
+  void assertSuggestTopLevelVarGetterSetter(String name, String returnType,
+      [CompletionRelevance relevance = CompletionRelevance.DEFAULT]) {
+    assertSuggestGetter(name, returnType);
+    assertSuggestSetter(name);
+  }
+
   bool computeFast() {
     _computeFastCalled = true;
     testUnit = context.parseCompilationUnit(testSource);