aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Andreevici <andreevich.egor@gmail.com>2019-12-22 09:45:11 -0500
committerEgor Andreevici <andreevich.egor@gmail.com>2019-12-22 09:45:11 -0500
commite6993cc2af1a2db55c134e45dc324148d76b3993 (patch)
treee63caa2ad0396e1d8a370e7ee6617cba49fd6da3
parenta0eadbbf0e7b70f0fbbc66043536e4328c3808fd (diff)
downloadjavapoet-e6993cc2af1a2db55c134e45dc324148d76b3993.tar.gz
Fix broken merge
-rw-r--r--src/test/java/com/squareup/javapoet/MethodSpecTest.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/test/java/com/squareup/javapoet/MethodSpecTest.java b/src/test/java/com/squareup/javapoet/MethodSpecTest.java
index 3db519c..98fd8f6 100644
--- a/src/test/java/com/squareup/javapoet/MethodSpecTest.java
+++ b/src/test/java/com/squareup/javapoet/MethodSpecTest.java
@@ -179,9 +179,7 @@ public final class MethodSpecTest {
TypeElement classElement = getElement(ExtendsIterableWithDefaultMethods.class);
DeclaredType classType = (DeclaredType) classElement.asType();
List<ExecutableElement> methods = methodsIn(elements.getAllMembers(classElement));
- ExecutableElement exec =
-
- (methods, "spliterator");
+ ExecutableElement exec = findFirst(methods, "spliterator");
MethodSpec method = MethodSpec.overriding(exec, classType, types).build();
assertThat(method.toString()).isEqualTo(""
+ "@java.lang.Override\n"