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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 576473003: Split refactoring problems into init, options and final. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 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
« no previous file with comments | « editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/processor/GetRefactoringProcessor.java ('k') | editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/refactoring/ExtractMethodInputPage_NEW.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImplTest.java
diff --git a/editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImplTest.java b/editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImplTest.java
index 23abdcbba5435610dff7210b9bfe76ad6db65593..1c08ff2a9397e4f33ad27e5dedd3203d06b66e0d 100644
--- a/editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImplTest.java
+++ b/editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImplTest.java
@@ -1397,7 +1397,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
}
});
@@ -1449,7 +1450,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
}
});
@@ -1507,7 +1509,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
}
});
@@ -1545,7 +1548,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
}
});
@@ -1580,7 +1584,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
}
});
@@ -1604,7 +1609,9 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
}
public void test_edit_getRefactoring_response() throws Exception {
- final Object[] problemsArray = {null};
+ final Object[] initialProblemsArray = {null};
+ final Object[] optionsProblemsArray = {null};
+ final Object[] finalProblemsArray = {null};
final RefactoringFeedback[] feedbackArray = {null};
final SourceChange[] changeArray = {null};
final Object[] potentialEditsArray = {null};
@@ -1618,9 +1625,12 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
- problemsArray[0] = problems;
+ initialProblemsArray[0] = initialProblems;
+ optionsProblemsArray[0] = optionsProblems;
+ finalProblemsArray[0] = finalProblems;
feedbackArray[0] = feedback;
changeArray[0] = change;
potentialEditsArray[0] = potentialEdits;
@@ -1631,12 +1641,24 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
"{",
" 'id': '0',",
" 'result': {",
- " 'problems': [",
+ " 'initialProblems': [",
" {",
" 'severity': 'INFO',",
" 'message': 'message1'",
" }",
" ],",
+ " 'optionsProblems': [",
+ " {",
+ " 'severity': 'WARNING',",
+ " 'message': 'message2'",
+ " }",
+ " ],",
+ " 'finalProblems': [",
+ " {",
+ " 'severity': 'FATAL',",
+ " 'message': 'message3'",
+ " }",
+ " ],",
" 'feedback': {",
" offset: 1,",
" length: 2,",
@@ -1650,11 +1672,27 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
server.test_waitForWorkerComplete();
// assertions on 'problems' (List<ErrorFixes>)
- @SuppressWarnings("unchecked")
- List<RefactoringProblem> refactoringProblem = (List<RefactoringProblem>) problemsArray[0];
- assertThat(refactoringProblem).hasSize(1);
- assertEquals(refactoringProblem.get(0).getSeverity(), RefactoringProblemSeverity.INFO);
- assertEquals(refactoringProblem.get(0).getMessage(), "message1");
+ {
+ @SuppressWarnings("unchecked")
+ List<RefactoringProblem> problem = (List<RefactoringProblem>) initialProblemsArray[0];
+ assertThat(problem).hasSize(1);
+ assertEquals(problem.get(0).getSeverity(), RefactoringProblemSeverity.INFO);
+ assertEquals(problem.get(0).getMessage(), "message1");
+ }
+ {
+ @SuppressWarnings("unchecked")
+ List<RefactoringProblem> problem = (List<RefactoringProblem>) optionsProblemsArray[0];
+ assertThat(problem).hasSize(1);
+ assertEquals(problem.get(0).getSeverity(), RefactoringProblemSeverity.WARNING);
+ assertEquals(problem.get(0).getMessage(), "message2");
+ }
+ {
+ @SuppressWarnings("unchecked")
+ List<RefactoringProblem> problem = (List<RefactoringProblem>) finalProblemsArray[0];
+ assertThat(problem).hasSize(1);
+ assertEquals(problem.get(0).getSeverity(), RefactoringProblemSeverity.FATAL);
+ assertEquals(problem.get(0).getMessage(), "message3");
+ }
// assertions on 'feedback'
RenameFeedback feedback = (RenameFeedback) feedbackArray[0];
@@ -1684,7 +1722,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
feedbackArray[0] = feedback;
}
@@ -1694,12 +1733,9 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
"{",
" 'id': '0',",
" 'result': {",
- " 'problems': [",
- " {",
- " 'severity': 'INFO',",
- " 'message': 'message1'",
- " }",
- " ],",
+ " 'initialProblems': [],",
+ " 'optionsProblems': [],",
+ " 'finalProblems': [],",
" 'feedback': {",
" 'names': ['one', 'two'],",
" 'offsets': [1, 2],",
@@ -1730,7 +1766,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
feedbackArray[0] = feedback;
}
@@ -1740,12 +1777,9 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
"{",
" 'id': '0',",
" 'result': {",
- " 'problems': [",
- " {",
- " 'severity': 'INFO',",
- " 'message': 'message1'",
- " }",
- " ],",
+ " 'initialProblems': [],",
+ " 'optionsProblems': [],",
+ " 'finalProblems': [],",
" 'feedback': {",
" 'offset': 1,",
" 'length': 2,",
@@ -1786,7 +1820,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
feedbackArray[0] = feedback;
}
@@ -1796,12 +1831,9 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
"{",
" 'id': '0',",
" 'result': {",
- " 'problems': [",
- " {",
- " 'severity': 'INFO',",
- " 'message': 'message1'",
- " }",
- " ],",
+ " 'initialProblems': [],",
+ " 'optionsProblems': [],",
+ " 'finalProblems': [],",
" 'feedback': {",
" 'name': 'myVar',",
" 'occurrences': 3",
@@ -1830,7 +1862,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
feedbackArray[0] = feedback;
}
@@ -1840,12 +1873,9 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
"{",
" 'id': '0',",
" 'result': {",
- " 'problems': [",
- " {",
- " 'severity': 'INFO',",
- " 'message': 'message1'",
- " }",
- " ],",
+ " 'initialProblems': [],",
+ " 'optionsProblems': [],",
+ " 'finalProblems': [],",
" 'feedback': {",
" 'className': 'myClassName',",
" 'methodName': 'myMethodName',",
@@ -1876,7 +1906,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
options,
new GetRefactoringConsumer() {
@Override
- public void computedRefactorings(List<RefactoringProblem> problems,
+ public void computedRefactorings(List<RefactoringProblem> initialProblems,
+ List<RefactoringProblem> optionsProblems, List<RefactoringProblem> finalProblems,
RefactoringFeedback feedback, SourceChange change, List<String> potentialEdits) {
feedbackArray[0] = feedback;
}
@@ -1886,12 +1917,9 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
"{",
" 'id': '0',",
" 'result': {",
- " 'problems': [",
- " {",
- " 'severity': 'INFO',",
- " 'message': 'message1'",
- " }",
- " ],",
+ " 'initialProblems': [],",
+ " 'optionsProblems': [],",
+ " 'finalProblems': [],",
" 'feedback': {",
" offset: 1,",
" length: 2,",
« no previous file with comments | « editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/processor/GetRefactoringProcessor.java ('k') | editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/refactoring/ExtractMethodInputPage_NEW.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698