| 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 a26ca83115416a15a4ac4e53c5d84740571e1e07..84528ff84821531a7f5d8683c2d5b855c37a761d 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
|
| @@ -200,8 +200,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| "}");
|
| server.test_waitForWorkerComplete();
|
| assertNotNull(hovers[0]);
|
| - assertEquals(new Integer(22), hovers[0].getOffset());
|
| - assertEquals(new Integer(5), hovers[0].getLength());
|
| + assertEquals(22, hovers[0].getOffset());
|
| + assertEquals(5, hovers[0].getLength());
|
| assertEquals("myLibrary", hovers[0].getContainingLibraryName());
|
| assertEquals("/path/to/lib", hovers[0].getContainingLibraryPath());
|
| assertEquals("some dartdoc", hovers[0].getDartdoc());
|
| @@ -308,14 +308,14 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| {
|
| HighlightRegion error = regions.get(0);
|
| assertEquals(HighlightRegionType.CLASS, error.getType());
|
| - assertEquals(new Integer(1), error.getOffset());
|
| - assertEquals(new Integer(2), error.getLength());
|
| + assertEquals(1, error.getOffset());
|
| + assertEquals(2, error.getLength());
|
| }
|
| {
|
| HighlightRegion error = regions.get(1);
|
| assertEquals(HighlightRegionType.FIELD, error.getType());
|
| - assertEquals(new Integer(10), error.getOffset());
|
| - assertEquals(new Integer(20), error.getLength());
|
| + assertEquals(10, error.getOffset());
|
| + assertEquals(20, error.getLength());
|
| }
|
| }
|
|
|
| @@ -367,8 +367,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertThat(regions).hasSize(1);
|
| {
|
| NavigationRegion region = regions.get(0);
|
| - assertEquals(new Integer(1), region.getOffset());
|
| - assertEquals(new Integer(2), region.getLength());
|
| + assertEquals(1, region.getOffset());
|
| + assertEquals(2, region.getLength());
|
| List<Element> elements = region.getTargets();
|
| assertThat(elements).hasSize(2);
|
| {
|
| @@ -377,10 +377,10 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertEquals("name0", element.getName());
|
| Location location = element.getLocation();
|
| assertEquals("/test2.dart", location.getFile());
|
| - assertEquals(new Integer(3), location.getOffset());
|
| - assertEquals(new Integer(4), location.getLength());
|
| - assertEquals(new Integer(5), location.getStartLine());
|
| - assertEquals(new Integer(6), location.getStartColumn());
|
| + assertEquals(3, location.getOffset());
|
| + assertEquals(4, location.getLength());
|
| + assertEquals(5, location.getStartLine());
|
| + assertEquals(6, location.getStartColumn());
|
| assertFalse(element.isAbstract());
|
| assertFalse(element.isConst());
|
| assertFalse(element.isDeprecated());
|
| @@ -396,10 +396,10 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertEquals("_name1", element.getName());
|
| Location location = element.getLocation();
|
| assertEquals("/test3.dart", location.getFile());
|
| - assertEquals(new Integer(7), location.getOffset());
|
| - assertEquals(new Integer(8), location.getLength());
|
| - assertEquals(new Integer(9), location.getStartLine());
|
| - assertEquals(new Integer(10), location.getStartColumn());
|
| + assertEquals(7, location.getOffset());
|
| + assertEquals(8, location.getLength());
|
| + assertEquals(9, location.getStartLine());
|
| + assertEquals(10, location.getStartColumn());
|
| assertTrue(element.isAbstract());
|
| assertTrue(element.isConst());
|
| assertTrue(element.isDeprecated());
|
| @@ -451,10 +451,10 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertEquals("name0", element.getName());
|
| Location location = element.getLocation();
|
| assertEquals("/test2.dart", location.getFile());
|
| - assertEquals(new Integer(7), location.getOffset());
|
| - assertEquals(new Integer(8), location.getLength());
|
| - assertEquals(new Integer(9), location.getStartLine());
|
| - assertEquals(new Integer(10), location.getStartColumn());
|
| + assertEquals(7, location.getOffset());
|
| + assertEquals(8, location.getLength());
|
| + assertEquals(9, location.getStartLine());
|
| + assertEquals(10, location.getStartColumn());
|
| assertTrue(element.isAbstract());
|
| assertTrue(element.isConst());
|
| assertTrue(element.isDeprecated());
|
| @@ -465,7 +465,7 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertNull(element.getReturnType());
|
| }
|
| assertThat(occurrences.getOffsets()).hasSize(5).contains(1, 2, 3, 4, 5);
|
| - assertEquals(new Integer(6), occurrences.getLength());
|
| + assertEquals(6, occurrences.getLength());
|
| }
|
|
|
| public void test_analysis_notification_outline() throws Exception {
|
| @@ -518,17 +518,17 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
|
|
| // assertions on outline
|
| assertThat(outline.getChildren()).hasSize(1);
|
| - assertEquals(new Integer(1), outline.getOffset());
|
| - assertEquals(new Integer(2), outline.getLength());
|
| + assertEquals(1, outline.getOffset());
|
| + assertEquals(2, outline.getLength());
|
| Element element = outline.getElement();
|
| assertEquals(ElementKind.COMPILATION_UNIT, element.getKind());
|
| assertEquals("name0", element.getName());
|
| Location location = element.getLocation();
|
| assertEquals("/test2.dart", location.getFile());
|
| - assertEquals(new Integer(3), location.getOffset());
|
| - assertEquals(new Integer(4), location.getLength());
|
| - assertEquals(new Integer(5), location.getStartLine());
|
| - assertEquals(new Integer(6), location.getStartColumn());
|
| + assertEquals(3, location.getOffset());
|
| + assertEquals(4, location.getLength());
|
| + assertEquals(5, location.getStartLine());
|
| + assertEquals(6, location.getStartColumn());
|
| assertTrue(element.isAbstract());
|
| assertTrue(element.isConst());
|
| assertTrue(element.isDeprecated());
|
| @@ -540,18 +540,18 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
|
|
| // assertions on child
|
| Outline child = outline.getChildren().get(0);
|
| - assertEquals(new Integer(7), child.getOffset());
|
| - assertEquals(new Integer(8), child.getLength());
|
| + assertEquals(7, child.getOffset());
|
| + assertEquals(8, child.getLength());
|
| assertThat(child.getChildren()).hasSize(0);
|
| Element childElement = child.getElement();
|
| assertEquals(ElementKind.CLASS, childElement.getKind());
|
| assertEquals("_name1", childElement.getName());
|
| location = childElement.getLocation();
|
| assertEquals("/test3.dart", location.getFile());
|
| - assertEquals(new Integer(9), location.getOffset());
|
| - assertEquals(new Integer(10), location.getLength());
|
| - assertEquals(new Integer(11), location.getStartLine());
|
| - assertEquals(new Integer(12), location.getStartColumn());
|
| + assertEquals(9, location.getOffset());
|
| + assertEquals(10, location.getLength());
|
| + assertEquals(11, location.getStartLine());
|
| + assertEquals(12, location.getStartColumn());
|
|
|
| assertFalse(childElement.isAbstract());
|
| assertFalse(childElement.isConst());
|
| @@ -603,16 +603,16 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| // assertions on overrides
|
| assertThat(overrides).hasSize(2);
|
| {
|
| - assertEquals(new Integer(1), overrides.get(0).getOffset());
|
| - assertEquals(new Integer(2), overrides.get(0).getLength());
|
| + assertEquals(1, overrides.get(0).getOffset());
|
| + assertEquals(2, overrides.get(0).getLength());
|
| OverriddenMember superclassMember = overrides.get(0).getSuperclassMember();
|
| assertNotNull(superclassMember);
|
| assertEquals("superclassName1", superclassMember.getClassName());
|
| assertEquals("name1", superclassMember.getElement().getName());
|
| }
|
| {
|
| - assertEquals(new Integer(7), overrides.get(1).getOffset());
|
| - assertEquals(new Integer(8), overrides.get(1).getLength());
|
| + assertEquals(7, overrides.get(1).getOffset());
|
| + assertEquals(8, overrides.get(1).getLength());
|
| assertNull(overrides.get(1).getSuperclassMember());
|
| }
|
| }
|
| @@ -1057,8 +1057,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertEquals(CompletionSuggestionKind.CLASS, suggestion.getKind());
|
| assertEquals(CompletionRelevance.LOW, suggestion.getRelevance());
|
| assertEquals(suggestion.getCompletion(), "completion0");
|
| - assertEquals(suggestion.getSelectionOffset(), new Integer(4));
|
| - assertEquals(suggestion.getSelectionLength(), new Integer(5));
|
| + assertEquals(4, suggestion.getSelectionOffset());
|
| + assertEquals(5, suggestion.getSelectionLength());
|
| assertTrue(suggestion.isDeprecated());
|
| assertTrue(suggestion.isPotential());
|
| assertEquals(suggestion.getDocSummary(), "docSummary0");
|
| @@ -1083,8 +1083,8 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertEquals(CompletionSuggestionKind.CLASS_ALIAS, suggestion.getKind());
|
| assertEquals(CompletionRelevance.DEFAULT, suggestion.getRelevance());
|
| assertEquals(suggestion.getCompletion(), "completion1");
|
| - assertEquals(suggestion.getSelectionOffset(), new Integer(10));
|
| - assertEquals(suggestion.getSelectionLength(), new Integer(11));
|
| + assertEquals(10, suggestion.getSelectionOffset());
|
| + assertEquals(11, suggestion.getSelectionLength());
|
| assertTrue(suggestion.isDeprecated());
|
| assertTrue(suggestion.isPotential());
|
| assertNull(suggestion.getDocSummary());
|
| @@ -2024,10 +2024,10 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertEquals("name1", element.getName());
|
| Location location = element.getLocation();
|
| assertEquals("/test1.dart", location.getFile());
|
| - assertEquals(new Integer(1), location.getOffset());
|
| - assertEquals(new Integer(2), location.getLength());
|
| - assertEquals(new Integer(3), location.getStartLine());
|
| - assertEquals(new Integer(4), location.getStartColumn());
|
| + assertEquals(1, location.getOffset());
|
| + assertEquals(2, location.getLength());
|
| + assertEquals(3, location.getStartLine());
|
| + assertEquals(4, location.getStartColumn());
|
| assertTrue(element.isAbstract());
|
| assertTrue(element.isConst());
|
| assertTrue(element.isDeprecated());
|
| @@ -2045,10 +2045,10 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertEquals("name2", element.getName());
|
| Location location = element.getLocation();
|
| assertEquals("/test2.dart", location.getFile());
|
| - assertEquals(new Integer(5), location.getOffset());
|
| - assertEquals(new Integer(6), location.getLength());
|
| - assertEquals(new Integer(7), location.getStartLine());
|
| - assertEquals(new Integer(8), location.getStartColumn());
|
| + assertEquals(5, location.getOffset());
|
| + assertEquals(6, location.getLength());
|
| + assertEquals(7, location.getStartLine());
|
| + assertEquals(8, location.getStartColumn());
|
| assertFalse(element.isAbstract());
|
| assertFalse(element.isConst());
|
| assertFalse(element.isDeprecated());
|
| @@ -2067,10 +2067,10 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| assertEquals("name3", childItem.getBestName());
|
| Location location = element.getLocation();
|
| assertEquals("/test3.dart", location.getFile());
|
| - assertEquals(new Integer(9), location.getOffset());
|
| - assertEquals(new Integer(10), location.getLength());
|
| - assertEquals(new Integer(11), location.getStartLine());
|
| - assertEquals(new Integer(12), location.getStartColumn());
|
| + assertEquals(9, location.getOffset());
|
| + assertEquals(10, location.getLength());
|
| + assertEquals(11, location.getStartLine());
|
| + assertEquals(12, location.getStartColumn());
|
| }
|
| assertNull(childItem.getDisplayName());
|
| assertNull(childItem.getMemberElement());
|
| @@ -2373,10 +2373,10 @@ public class RemoteAnalysisServerImplTest extends AbstractRemoteServerTest {
|
| private void assertLocation(Location location, String file, int offset, int length,
|
| int startLine, int startColumn) {
|
| assertEquals(file, location.getFile());
|
| - assertEquals(new Integer(offset), location.getOffset());
|
| - assertEquals(new Integer(length), location.getLength());
|
| - assertEquals(new Integer(startLine), location.getStartLine());
|
| - assertEquals(new Integer(startColumn), location.getStartColumn());
|
| + assertEquals(offset, location.getOffset());
|
| + assertEquals(length, location.getLength());
|
| + assertEquals(startLine, location.getStartLine());
|
| + assertEquals(startColumn, location.getStartColumn());
|
| }
|
|
|
| private String getSourceChangeJson() {
|
|
|