Skip to content

Commit

Permalink
Get rid of Arguments usage if possible (#1314)
Browse files Browse the repository at this point in the history
  • Loading branch information
@epeee @joel-costigliola
epeee authored and joel-costigliola committed Sep 2, 2018
1 parent 1ad4805 commit 426bf2e
Show file tree
Hide file tree
Showing 9 changed files with 118 additions and 127 deletions.
5 changes: 2 additions & 3 deletions src/test/java/org/assertj/core/error/ShouldBeEqual_newAssertionError_Test.java
View file
Expand Up @@ -25,7 +25,6 @@
import org.assertj.core.internal.TestDescription;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.opentest4j.AssertionFailedError;

Expand Down Expand Up @@ -65,7 +64,7 @@ public void should_create_AssertionFailedError_if_JUnit5_is_present_and_trim_spa
"but was not."));
}

public static Stream<Arguments> parameters() {
return Stream.of(Arguments.of("[Jedi]"), Arguments.of("[Jedi] "));
public static Stream<String> parameters() {
return Stream.of("[Jedi]", "[Jedi] ");
}
}
29 changes: 14 additions & 15 deletions src/test/java/org/assertj/core/internal/strings/Strings_assertBlank_Test.java
View file
Expand Up @@ -20,19 +20,18 @@

import org.assertj.core.internal.StringsBaseTest;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

public class Strings_assertBlank_Test extends StringsBaseTest {

public static Stream<Arguments> blank() {
return Stream.of(Arguments.of((String) null),
Arguments.of(""),
Arguments.of(" "),
Arguments.of("\u005Ct"), // tab
Arguments.of("\u005Cn"), // line feed
Arguments.of("\u005Cr"), // carriage return
Arguments.of(" \u005Cn\u005Cr "));
public static Stream<String> blank() {
return Stream.of(null,
"",
" ",
"\u005Ct", // tab
"\u005Cn", // line feed
"\u005Cr", // carriage return
" \u005Cn\u005Cr ");
}

@ParameterizedTest
Expand All @@ -41,12 +40,12 @@ public void should_pass_if_string_is_blank(String actual) {
strings.assertBlank(someInfo(), actual);
}

public static Stream<Arguments> notBlank() {
return Stream.of(Arguments.of("a"),
Arguments.of(" bc "),
Arguments.of("\u00A0"), // non-breaking space
Arguments.of("\u2007"), // non-breaking space
Arguments.of("\u202F")); // non-breaking space);
public static Stream<String> notBlank() {
return Stream.of("a",
" bc ",
"\u00A0", // non-breaking space
"\u2007", // non-breaking space
"\u202F"); // non-breaking space);
}

@ParameterizedTest
Expand Down
29 changes: 14 additions & 15 deletions ...st/java/org/assertj/core/internal/strings/Strings_assertContainsOnlyWhitespaces_Test.java
View file
Expand Up @@ -20,17 +20,16 @@

import org.assertj.core.internal.StringsBaseTest;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

public class Strings_assertContainsOnlyWhitespaces_Test extends StringsBaseTest {

public static Stream<Arguments> containOnlyWhitespace() {
return Stream.of(Arguments.of(" "),
Arguments.of("\u005Ct"), // tab
Arguments.of("\u005Cn"), // line feed
Arguments.of("\u005Cr"), // carriage return
Arguments.of(" \u005Cn\u005Cr "));
public static Stream<String> containOnlyWhitespace() {
return Stream.of(" ",
"\u005Ct", // tab
"\u005Cn", // line feed
"\u005Cr", // carriage return
" \u005Cn\u005Cr ");
}

@ParameterizedTest
Expand All @@ -39,14 +38,14 @@ public void should_pass_if_string_contains_only_whitespaces(String actual) {
strings.assertContainsOnlyWhitespaces(someInfo(), actual);
}

public static Stream<Arguments> containNotOnlyWhitespace() {
return Stream.of(Arguments.of((String) null),
Arguments.of(""),
Arguments.of("a"),
Arguments.of(" bc "),
Arguments.of("\u00A0"), // non-breaking space
Arguments.of("\u2007"), // non-breaking space
Arguments.of("\u202F")); // non-breaking space
public static Stream<String> containNotOnlyWhitespace() {
return Stream.of(null,
"",
"a",
" bc ",
"\u00A0", // non-breaking space
"\u2007", // non-breaking space
"\u202F"); // non-breaking space
}

@ParameterizedTest
Expand Down
39 changes: 19 additions & 20 deletions src/test/java/org/assertj/core/internal/strings/Strings_assertContainsWhitespaces_Test.java
View file
Expand Up @@ -20,17 +20,16 @@

import org.assertj.core.internal.StringsBaseTest;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

public class Strings_assertContainsWhitespaces_Test extends StringsBaseTest {

public static Stream<Arguments> containOnlyWhitespace() {
return Stream.of(Arguments.of(" "),
Arguments.of("\u005Ct"), // tab
Arguments.of("\u005Cn"), // line feed
Arguments.of("\u005Cr"), // carriage return
Arguments.of(" \u005Cn\u005Cr "));
public static Stream<String> containOnlyWhitespace() {
return Stream.of(" ",
"\u005Ct", // tab
"\u005Cn", // line feed
"\u005Cr", // carriage return
" \u005Cn\u005Cr ");
}

@ParameterizedTest
Expand All @@ -39,14 +38,14 @@ public void should_pass_if_string_contains_only_whitespaces(String actual) {
strings.assertContainsWhitespaces(someInfo(), actual);
}

public static Stream<Arguments> containOneOrMoreWhitespaces() {
return Stream.of(Arguments.of("a "),
Arguments.of("a b"),
Arguments.of("a b"),
Arguments.of("a\u005Ctb"), // tab
Arguments.of("a\u005Cnb"), // line feed
Arguments.of("a\u005Crb"), // carriage return
Arguments.of("a \u005Cn\u005Cr b"));
public static Stream<String> containOneOrMoreWhitespaces() {
return Stream.of("a ",
"a b",
"a b",
"a\u005Ctb", // tab
"a\u005Cnb", // line feed
"a\u005Crb", // carriage return
"a \u005Cn\u005Cr b");
}

@ParameterizedTest
Expand All @@ -55,11 +54,11 @@ public void should_pass_if_string_contains_one_or_more_whitespaces(String actual
strings.assertContainsWhitespaces(someInfo(), actual);
}

public static Stream<Arguments> doesNotcontainAnyWhitespaces() {
return Stream.of(Arguments.of((String) null),
Arguments.of(""),
Arguments.of("a"),
Arguments.of("bc"));
public static Stream<String> doesNotcontainAnyWhitespaces() {
return Stream.of(null,
"",
"a",
"bc");
}

@ParameterizedTest
Expand Down
27 changes: 13 additions & 14 deletions ...va/org/assertj/core/internal/strings/Strings_assertDoesNotContainAnyWhitespaces_Test.java
View file
Expand Up @@ -20,16 +20,15 @@

import org.assertj.core.internal.StringsBaseTest;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

public class Strings_assertDoesNotContainAnyWhitespaces_Test extends StringsBaseTest {

public static Stream<Arguments> doesNotContainAnyWhitespaces() {
return Stream.of(Arguments.of((String) null),
Arguments.of(""),
Arguments.of("a"),
Arguments.of("bc"));
public static Stream<String> doesNotContainAnyWhitespaces() {
return Stream.of(null,
"",
"a",
"bc");
}

@ParameterizedTest
Expand All @@ -38,14 +37,14 @@ public void should_pass_if_string_does_not_contain_any_whitespaces(String actual
strings.assertDoesNotContainAnyWhitespaces(someInfo(), actual);
}

public static Stream<Arguments> containsWithspaces() {
return Stream.of(Arguments.of("a "),
Arguments.of("a b"),
Arguments.of("a b"),
Arguments.of("a\u005Ctb"), // tab
Arguments.of("a\u005Cnb"), // line feed
Arguments.of("a\u005Crb"), // carriage return
Arguments.of("a \u005Cn\u005Cr b"));
public static Stream<String> containsWithspaces() {
return Stream.of("a ",
"a b",
"a b",
"a\u005Ctb", // tab
"a\u005Cnb", // line feed
"a\u005Crb", // carriage return
"a \u005Cn\u005Cr b");
}

@ParameterizedTest
Expand Down
29 changes: 14 additions & 15 deletions ...a/org/assertj/core/internal/strings/Strings_assertDoesNotContainOnlyWhitespaces_Test.java
View file
Expand Up @@ -20,19 +20,18 @@

import org.assertj.core.internal.StringsBaseTest;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

public class Strings_assertDoesNotContainOnlyWhitespaces_Test extends StringsBaseTest {

public static Stream<Arguments> containsNotOnlyWhitespace() {
return Stream.of(Arguments.of((String) null),
Arguments.of(""),
Arguments.of("a"),
Arguments.of(" bc "),
Arguments.of("\u00A0"), // non-breaking space
Arguments.of("\u2007"), // non-breaking space
Arguments.of("\u202F")); // non-breaking space
public static Stream<String> containsNotOnlyWhitespace() {
return Stream.of(null,
"",
"a",
" bc ",
"\u00A0", // non-breaking space
"\u2007", // non-breaking space
"\u202F"); // non-breaking space
}

@ParameterizedTest
Expand All @@ -41,12 +40,12 @@ public void should_pass_if_string_does_not_contain_only_whitespaces(String actua
strings.assertDoesNotContainOnlyWhitespaces(someInfo(), actual);
}

public static Stream<Arguments> containsOnlyWhitespace() {
return Stream.of(Arguments.of(" "),
Arguments.of("\u005Ct"), // tab
Arguments.of("\u005Cn"), // line feed
Arguments.of("\u005Cr"), // carriage return
Arguments.of(" \u005Cn\u005Cr "));
public static Stream<String> containsOnlyWhitespace() {
return Stream.of(" ",
"\u005Ct", // tab
"\u005Cn", // line feed
"\u005Cr", // carriage return
" \u005Cn\u005Cr ");
}

@ParameterizedTest
Expand Down
29 changes: 14 additions & 15 deletions src/test/java/org/assertj/core/internal/strings/Strings_assertJavaBlank_Test.java
View file
Expand Up @@ -22,17 +22,16 @@
import org.assertj.core.api.AssertionInfo;
import org.assertj.core.internal.StringsBaseTest;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

public class Strings_assertJavaBlank_Test extends StringsBaseTest {

public static Stream<Arguments> blank() {
return Stream.of(Arguments.of(" "),
Arguments.of("\u005Ct"), // tab
Arguments.of("\u005Cn"), // line feed
Arguments.of("\u005Cr"), // carriage return
Arguments.of(" \u005Cn\u005Cr "));
public static Stream<String> blank() {
return Stream.of(" ",
"\u005Ct", // tab
"\u005Cn", // line feed
"\u005Cr", // carriage return
" \u005Cn\u005Cr ");
}

@ParameterizedTest
Expand All @@ -41,14 +40,14 @@ public void should_pass_string_is_blank(String actual) {
strings.assertJavaBlank(someInfo(), actual);
}

public static Stream<Arguments> notBlank() {
return Stream.of(Arguments.of((String) null),
Arguments.of(""),
Arguments.of("a"),
Arguments.of(" bc "),
Arguments.of("\u00A0"), // non-breaking space
Arguments.of("\u2007"), // non-breaking space
Arguments.of("\u202F")); // non-breaking space
public static Stream<String> notBlank() {
return Stream.of(null,
"",
"a",
" bc ",
"\u00A0", // non-breaking space
"\u2007", // non-breaking space
"\u202F"); // non-breaking space
}

@ParameterizedTest
Expand Down
29 changes: 14 additions & 15 deletions src/test/java/org/assertj/core/internal/strings/Strings_assertNotBlank_Test.java
View file
Expand Up @@ -20,17 +20,16 @@

import org.assertj.core.internal.StringsBaseTest;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

public class Strings_assertNotBlank_Test extends StringsBaseTest {

public static Stream<Arguments> notBlank() {
return Stream.of(Arguments.of("a"),
Arguments.of(" bc "),
Arguments.of("\u00A0"), // non-breaking space
Arguments.of("\u2007"), // non-breaking space
Arguments.of("\u202F")); // non-breaking space
public static Stream<String> notBlank() {
return Stream.of("a",
" bc ",
"\u00A0", // non-breaking space
"\u2007", // non-breaking space
"\u202F"); // non-breaking space
}

@ParameterizedTest
Expand All @@ -39,14 +38,14 @@ public void should_pass_if_string_is_not_blank(String actual) {
strings.assertNotBlank(someInfo(), actual);
}

public static Stream<Arguments> blank() {
return Stream.of(Arguments.of((String) null),
Arguments.of(""),
Arguments.of(" "),
Arguments.of("\u005Ct"), // tab
Arguments.of("\u005Cn"), // line feed
Arguments.of("\u005Cr"), // carriage return
Arguments.of(" \u005Cn\u005Cr ")); // non-breaking space
public static Stream<String> blank() {
return Stream.of(null,
"",
" ",
"\u005Ct", // tab
"\u005Cn", // line feed
"\u005Cr", // carriage return
" \u005Cn\u005Cr "); // non-breaking space
}

@ParameterizedTest
Expand Down

0 comments on commit 426bf2e

Please sign in to comment.