Workaround for ambiguous isA method
- Eclipse complains isA() is ambiguous. 'isA' method does exist in both EasyMock and hamcrest Matcher. Change-Id: I6b98dbe1b4f1f0ce4fcbc2dcaded9b666fc19b33
Showing
1 changed file
with
5 additions
and
2 deletions
... | @@ -46,9 +46,11 @@ import java.net.URI; | ... | @@ -46,9 +46,11 @@ import java.net.URI; |
46 | import java.util.Optional; | 46 | import java.util.Optional; |
47 | 47 | ||
48 | import static org.easymock.EasyMock.*; | 48 | import static org.easymock.EasyMock.*; |
49 | -import static org.easymock.EasyMock.isA; | ||
50 | import static org.hamcrest.MatcherAssert.assertThat; | 49 | import static org.hamcrest.MatcherAssert.assertThat; |
51 | -import static org.hamcrest.Matchers.*; | 50 | +import static org.hamcrest.Matchers.containsString; |
51 | +import static org.hamcrest.Matchers.hasSize; | ||
52 | +import static org.hamcrest.Matchers.is; | ||
53 | +import static org.hamcrest.Matchers.notNullValue; | ||
52 | 54 | ||
53 | /** | 55 | /** |
54 | * Unit tests for applications REST APIs. | 56 | * Unit tests for applications REST APIs. |
... | @@ -151,6 +153,7 @@ public class ApplicationsResourceTest extends ResourceTest { | ... | @@ -151,6 +153,7 @@ public class ApplicationsResourceTest extends ResourceTest { |
151 | } | 153 | } |
152 | 154 | ||
153 | 155 | ||
156 | + @Override | ||
154 | @Before | 157 | @Before |
155 | public void setUp() { | 158 | public void setUp() { |
156 | service = createMock(ApplicationAdminService.class); | 159 | service = createMock(ApplicationAdminService.class); | ... | ... |
-
Please register or login to post a comment