meaningful generic name + get rid of unnecessary semicolon (#942)

assertj · Mar 1, 2017 · 8c4bdf4 · 8c4bdf4
1 parent f38bb4d
commit 8c4bdf4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/assertj/core/api/WithAssertions.java b/src/main/java/org/assertj/core/api/WithAssertions.java
@@ -563,7 +563,7 @@ default AbstractFileAssert<?> assertThat(final File actual) {
    * @since 3.7.0
    */
   @CheckReturnValue
-  default <T> AbstractFutureAssert<?, ? extends Future<? extends T>, T> assertThat(Future<T> actual) {
+  default <RESULT> AbstractFutureAssert<?, ? extends Future<? extends RESULT>, RESULT> assertThat(Future<RESULT> actual) {
     return Assertions.assertThat(actual);
   }
 

diff --git a/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_isInstanceOfSatisfying_Test.java b/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_isInstanceOfSatisfying_Test.java
@@ -32,7 +32,7 @@ public class AbstractAssert_isInstanceOfSatisfying_Test extends AbstractAssertBa
   public ExpectedException thrown = none();
 
   // init here to make it available in create_assertions() 
-  private Jedi yoda = new Jedi("Yoda", "Green");;
+  private Jedi yoda = new Jedi("Yoda", "Green");
   private Jedi luke = new Jedi("Luke Skywalker", "Green");
   private Consumer<Jedi> jediRequirements;
 

diff --git a/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extracting_Test.java b/src/test/java/org/assertj/core/api/objectarray/ObjectArrayAssert_extracting_Test.java
@@ -66,7 +66,7 @@ public void setUpOnce() {
     fellowshipOfTheRing[5] = TolkienCharacter.of("Gimli", 139, DWARF);
     fellowshipOfTheRing[6] = TolkienCharacter.of("Aragorn", 87, MAN);
     fellowshipOfTheRing[7] = TolkienCharacter.of("Boromir", 37, MAN);
-  };
+  }
 
   @Test
   public void should_allow_assertions_on_property_values_extracted_from_given_iterable() {