Skip to content

Commit 26c2a60

Browse files
committed
Avoid naming conflict with equals method
1 parent 14986f8 commit 26c2a60

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/main/java/de/tobiasroeser/lambdatest/ExpectString.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package de.tobiasroeser.lambdatest;
22

3+
import static de.tobiasroeser.lambdatest.Expect.expectEquals;
4+
import static de.tobiasroeser.lambdatest.Expect.expectNotEquals;
35
import static de.tobiasroeser.lambdatest.Expect.expectTrue;
46

57
import java.text.MessageFormat;
@@ -38,21 +40,22 @@ private ExpectString check(final boolean cond, final String msg, final Object...
3840
return this;
3941
}
4042

41-
public ExpectString equals(final String expected) {
42-
return check(actual.equals(expected), "Actual is not equal to \"{0}\", actual: \"{1}\"", expected, actual);
43+
public ExpectString isEqual(final String expected) {
44+
expectEquals(actual, expected);
45+
return this;
4346
}
4447

45-
public ExpectString equalsNot(final String expected) {
46-
return check(!actual.equals(expected), "Actual must not be equal to \"{0}\", actual: \"{1}\"", expected,
47-
actual);
48+
public ExpectString isNotEqual(final String expected) {
49+
expectNotEquals(actual, expected);
50+
return this;
4851
}
4952

50-
public ExpectString equalsIgnoreCase(final String expected) {
53+
public ExpectString isEqualIgnoreCase(final String expected) {
5154
return check(actual.equalsIgnoreCase(expected), "Actual is not equal to \"{0}\" (ignore case), actual: \"{1}\"",
5255
expected, actual);
5356
}
5457

55-
public ExpectString equalsIgnoreCaseNot(final String expected) {
58+
public ExpectString isNotEqualIgnoreCase(final String expected) {
5659
return check(!actual.equalsIgnoreCase(expected),
5760
"Actual must not be equal to \"{0}\" (ignore case), actual: \"{1}\"", expected,
5861
actual);
@@ -127,5 +130,4 @@ public ExpectString containsIgnoreCaseNot(final String fragment) {
127130
actual);
128131
}
129132

130-
131133
}

0 commit comments

Comments
 (0)