Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added supporting for comparing CharSequence objects. Added tests. #1533

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/main/java/org/junit/Assert.java
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,36 @@ public static void assertEquals(String message, long expected, long actual) {
}
}

/**
* Asserts that two CharSequence instances are equal. If they are not, an
* {@link AssertionError} is thrown with the given message.
*
* @param message the identifying message for the {@link AssertionError} (<code>null</code>
* okay)
* @param expected CharSequence expected value.
* @param actual CharSequence actual value
*/
public static void assertEquals(String message, CharSequence expected, CharSequence actual) {
boolean isContentEqual = actual.length() == expected.length()
&& expected.toString().equals(actual.toString());
if (isContentEqual) {
return;
} else {
failNotEquals(message, expected, actual);
}
}

/**
* Asserts that two CharSequence instances are equal. If they are not, an
* {@link AssertionError} is thrown with the given message.
*
* @param expected CharSequence expected value.
* @param actual CharSequence actual value
*/
public static void assertEquals(CharSequence expected, CharSequence actual) {
assertEquals(null, expected, actual);
}

/**
* @deprecated Use
* <code>assertEquals(double expected, double actual, double delta)</code>
Expand Down
50 changes: 50 additions & 0 deletions src/test/java/org/junit/tests/assertion/AssertionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,56 @@ public void arraysEqualWithMessage() {
assertArrayEquals("equal", objects1, objects2);
}

@Test
public void StringContentShouldBeEqualsCharSeqContent() {
String content = "abc";
CharSequence seqContent = "abc";
Assert.assertEquals(content, seqContent);
}

@Test
public void StringBuilderContentShouldBeEqualsCharSeqContent() {
StringBuilder builder = new StringBuilder();
builder.append("abc");
CharSequence seqContent = "abc";
Assert.assertEquals(builder, seqContent);
}

@Test
public void StringContentShouldBeEqualsStringBuilderContent() {
StringBuilder builder = new StringBuilder();
builder.append("abc");
String content = "abc";
String contentObj = new String("abc");
Assert.assertEquals(builder, content);
Assert.assertEquals(builder, contentObj);
}

@Test
public void StringContentShouldNotBeEqualsCharSeqContent() {
String content = "abc";
CharSequence seqContent = "abc1";
Assert.assertNotEquals(content, seqContent);
}

@Test
public void StringContentShouldNotBeEqualsStringBuilderContent() {
StringBuilder builder = new StringBuilder();
builder.append("abc1");
String content = "abc";
String contentObj = new String("abc");
Assert.assertNotEquals(builder, content);
Assert.assertNotEquals(builder, contentObj);
}

@Test
public void CharSequenceObjEqualWithMessage() {
String content = "abc";
CharSequence seqContent = "abc";
Assert.assertEquals("equal", content, seqContent);
}


@Test
public void equals() {
Object o = new Object();
Expand Down