Fix warnings & formatting

assertj · Aug 24, 2015 · 2d88f57 · 2d88f57
1 parent fe7424d
commit 2d88f57
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 24 deletions.
diff --git a/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_withFailMessage_Test.java b/src/test/java/org/assertj/core/api/abstract_/AbstractAssert_withFailMessage_Test.java
@@ -28,7 +28,7 @@ public class AbstractAssert_withFailMessage_Test {
 
   @Test
   public void should_delegate_to_overridingErrorMessage() {
-    AbstractAssert suT = spy(Assertions.assertThat("test"));
+    AbstractAssert<?, ?> suT = spy(Assertions.assertThat("test"));
 
     suT.withFailMessage("test", "eins");
 

diff --git a/...rg/assertj/core/api/charsequence/CharSequenceAssert_isEqualToIgnoringWhitespace_Test.java b/...rg/assertj/core/api/charsequence/CharSequenceAssert_isEqualToIgnoringWhitespace_Test.java
@@ -12,25 +12,25 @@
  */
 package org.assertj.core.api.charsequence;
 
+import static org.mockito.Mockito.verify;
+
 import org.assertj.core.api.CharSequenceAssert;
 import org.assertj.core.api.CharSequenceAssertBaseTest;
 
-import static org.mockito.Mockito.verify;
-
 /**
  * Tests for <code>{@link org.assertj.core.api.CharSequenceAssert#isEqualToIgnoringWhitespace(CharSequence)}</code>.
  *
  * @author Alexander Bischof
  */
 public class CharSequenceAssert_isEqualToIgnoringWhitespace_Test extends CharSequenceAssertBaseTest {
 
-    @Override
-    protected CharSequenceAssert invoke_api_method() {
-        return assertions.isEqualToIgnoringWhitespace(" my foo bar ");
-    }
+  @Override
+  protected CharSequenceAssert invoke_api_method() {
+    return assertions.isEqualToIgnoringWhitespace(" my foo bar ");
+  }
 
-    @Override
-    protected void verify_internal_effects() {
-        verify(strings).assertEqualsIgnoringWhitespace(getInfo(assertions), getActual(assertions), " my foo bar ");
-    }
+  @Override
+  protected void verify_internal_effects() {
+    verify(strings).assertEqualsIgnoringWhitespace(getInfo(assertions), getActual(assertions), " my foo bar ");
+  }
 }
diff --git a/src/test/java/org/assertj/core/error/ShouldBeReadable_create_Test.java b/src/test/java/org/assertj/core/error/ShouldBeReadable_create_Test.java
@@ -18,7 +18,6 @@
 import static org.assertj.core.error.ShouldBeReadable.shouldBeReadable;
 import static org.mockito.Mockito.mock;
 
-import java.io.IOException;
 import java.nio.file.Path;
 
 import org.assertj.core.internal.TestDescription;
@@ -41,7 +40,7 @@ public void should_create_error_message_for_File() {
   }
 
   @Test
-  public void should_create_error_message_for_Path() throws IOException {
+  public void should_create_error_message_for_Path() {
 	final Path path = mock(Path.class);
 	ErrorMessageFactory factory = shouldBeReadable(path);
 

diff --git a/src/test/java/org/assertj/core/error/ShouldBeRelativePath_create_Test.java b/src/test/java/org/assertj/core/error/ShouldBeRelativePath_create_Test.java
@@ -18,7 +18,6 @@
 import static org.assertj.core.error.ShouldBeRelativePath.shouldBeRelativePath;
 import static org.mockito.Mockito.mock;
 
-import java.io.IOException;
 import java.nio.file.Path;
 
 import org.assertj.core.internal.TestDescription;
@@ -46,7 +45,7 @@ public void should_create_error_message_for_File() {
   }
 
   @Test
-  public void should_create_error_message_for_Path() throws IOException {
+  public void should_create_error_message_for_Path() {
 	final Path path = mock(Path.class);
 	ErrorMessageFactory factory = shouldBeRelativePath(path);
 

diff --git a/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyOnce_Test.java b/src/test/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyOnce_Test.java
@@ -17,8 +17,6 @@
 import static org.assertj.core.test.TestData.someInfo;
 import static org.assertj.core.test.TestFailures.failBecauseExpectedAssertionErrorWasNotThrown;
 import static org.assertj.core.util.FailureMessages.actualIsNull;
-
-
 import static org.mockito.Mockito.verify;
 
 import org.assertj.core.api.AssertionInfo;
@@ -33,7 +31,7 @@
 public class Strings_assertContainsOnlyOnce_Test extends StringsBaseTest {
 
   @Test
-  public void should_pass_if_actual_is_contains_given_string_only_once() {
+  public void should_pass_if_actual_contains_given_string_only_once() {
     strings.assertContainsOnlyOnce(someInfo(), "Yoda", "Yo");
   }
 

diff --git a/...assertj/core/internal/strings/Strings_assertEqualsIgnoringWhitespace_Successful_Test.java b/...assertj/core/internal/strings/Strings_assertEqualsIgnoringWhitespace_Successful_Test.java
@@ -52,8 +52,8 @@ public static List<Object[]> parameters() {
         { " my foo    bar ", "  my foo bar   " },
         { "       ", " " },
         { " my\tfoo bar ", new String(arrayOf(' ', 'm', 'y', ' ', 'f', 'o', 'o', ' ', 'b', 'a', 'r')) },
-        { " my\tfoo bar ", " my\tfoo bar " }, // same
-        { null, null }, // null
+        { " my\tfoo bar ", " my\tfoo bar " },   // same
+        { null, null },   // null
         { " \t \t", " " },
         { " abc", "abc " }
     });

diff --git a/...t/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringWhitespace_Test.java b/...t/java/org/assertj/core/internal/strings/Strings_assertEqualsIgnoringWhitespace_Test.java
@@ -12,16 +12,16 @@
  */
 package org.assertj.core.internal.strings;
 
-import org.assertj.core.api.AssertionInfo;
-import org.assertj.core.internal.StringsBaseTest;
-import org.junit.Test;
-
 import static org.assertj.core.error.ShouldBeEqualIgnoringWhitespace.shouldBeEqualIgnoringWhitespace;
 import static org.assertj.core.test.ErrorMessages.charSequenceToLookForIsNull;
 import static org.assertj.core.test.TestData.someInfo;
 import static org.assertj.core.test.TestFailures.failBecauseExpectedAssertionErrorWasNotThrown;
 import static org.mockito.Mockito.verify;
 
+import org.assertj.core.api.AssertionInfo;
+import org.assertj.core.internal.StringsBaseTest;
+import org.junit.Test;
+
 /**
  * Tests for <code>{@link org.assertj.core.internal.Strings#assertEqualsIgnoringWhitespace(org.assertj.core.api.AssertionInfo, CharSequence, CharSequence)} </code>.
  *