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

Unified Diff: editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/TestAnalysisServerListener.java

Issue 474193003: Make more use of generated code in Java analysis server. (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: editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/TestAnalysisServerListener.java
diff --git a/editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/TestAnalysisServerListener.java b/editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/TestAnalysisServerListener.java
index 23eca4c82bdec09fa2592bf6ccbfcd46bfb861cf..a7fa7790918ebd4deafbc77dc85fc9dd3a98ff88 100644
--- a/editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/TestAnalysisServerListener.java
+++ b/editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/TestAnalysisServerListener.java
@@ -19,17 +19,16 @@ import com.google.common.collect.Maps;
import com.google.dart.engine.source.Source;
import com.google.dart.engine.utilities.general.ArrayUtilities;
import com.google.dart.server.AnalysisServerListener;
-import com.google.dart.server.AnalysisStatus;
import com.google.dart.server.CompletionSuggestion;
-import com.google.dart.server.HighlightRegion;
-import com.google.dart.server.NavigationRegion;
-import com.google.dart.server.Occurrences;
import com.google.dart.server.Outline;
-import com.google.dart.server.OverrideMember;
import com.google.dart.server.SearchResult;
-import com.google.dart.server.ServerStatus;
import com.google.dart.server.generated.types.AnalysisError;
+import com.google.dart.server.generated.types.AnalysisStatus;
import com.google.dart.server.generated.types.Element;
+import com.google.dart.server.generated.types.HighlightRegion;
+import com.google.dart.server.generated.types.NavigationRegion;
+import com.google.dart.server.generated.types.Occurrences;
+import com.google.dart.server.generated.types.OverrideMember;
import com.google.dart.server.internal.asserts.NavigationRegionsAssert;
import junit.framework.Assert;
@@ -58,6 +57,7 @@ public class TestAnalysisServerListener implements AnalysisServerListener {
}
private final Map<String, CompletionResult> completionsMap = Maps.newHashMap();
+ private final List<String> flushedResults = Lists.newArrayList();
private final Map<String, SearchResult[]> searchResultsMap = Maps.newHashMap();
private final List<AnalysisServerError> serverErrors = Lists.newArrayList();
private final Map<String, AnalysisError[]> sourcesErrors = Maps.newHashMap();
@@ -67,7 +67,12 @@ public class TestAnalysisServerListener implements AnalysisServerListener {
private final Map<String, Outline> outlineMap = Maps.newHashMap();
private final Map<String, OverrideMember[]> overridesMap = Maps.newHashMap();
private boolean serverConnected = false;
- private ServerStatus serverStatus = null;
+ private AnalysisStatus analysisStatus = null;
+
+ public synchronized void assertAnalysisStatus(AnalysisStatus expectedStatus) {
+ Assert.assertEquals(expectedStatus.isAnalyzing(), analysisStatus.isAnalyzing());
+ Assert.assertEquals(expectedStatus.getAnalysisTarget(), analysisStatus.getAnalysisTarget());
+ }
/**
* Assert that the number of errors that have been gathered matches the number of errors that are
@@ -86,6 +91,13 @@ public class TestAnalysisServerListener implements AnalysisServerListener {
}
/**
+ * Asserts the list of flushed results.
+ */
+ public synchronized void assertFlushedResults(List<String> expectedFlushedResults) {
+ assertThat(expectedFlushedResults).isEqualTo(flushedResults);
+ }
+
+ /**
* Returns {@link NavigationRegionsAssert} for the given file.
*/
public synchronized NavigationRegionsAssert assertNavigationRegions(String file) {
@@ -110,15 +122,6 @@ public class TestAnalysisServerListener implements AnalysisServerListener {
}
}
- public synchronized void assertServerStatus(ServerStatus expectedStatus) {
- AnalysisStatus actualAnalysisStatus = serverStatus.getAnalysisStatus();
- AnalysisStatus expectedAnalysisStatus = expectedStatus.getAnalysisStatus();
- Assert.assertEquals(expectedAnalysisStatus.isAnalyzing(), actualAnalysisStatus.isAnalyzing());
- Assert.assertEquals(
- expectedAnalysisStatus.getAnalysisTarget(),
- actualAnalysisStatus.getAnalysisTarget());
- }
-
/**
* Removes all of reported {@link NavigationRegion}s.
*/
@@ -194,13 +197,18 @@ public class TestAnalysisServerListener implements AnalysisServerListener {
if (regions != null) {
for (NavigationRegion navigationRegion : regions) {
if (navigationRegion.containsInclusive(offset)) {
- return navigationRegion.getTargets()[0];
+ return navigationRegion.getTargets().get(0);
}
}
}
return null;
}
+ @Override
+ public synchronized void flushedResults(List<String> files) {
+ flushedResults.addAll(files);
+ }
+
public boolean getCompletionIsLast(String completionId) {
CompletionResult result = completionsMap.get(completionId);
if (result == null) {
@@ -304,8 +312,8 @@ public class TestAnalysisServerListener implements AnalysisServerListener {
}
@Override
- public synchronized void serverStatus(ServerStatus status) {
- this.serverStatus = status;
+ public synchronized void serverStatus(AnalysisStatus status) {
+ this.analysisStatus = status;
}
/**

Powered by Google App Engine
This is Rietveld 408576698