Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert tests for Validate.notNull overloads to @Nested test

This commit is contained in:
Benedikt Ritter 2018-09-06 10:16:26 +02:00
parent aad2db8b12
commit d3f2a89ba2
No known key found for this signature in database
GPG Key ID: 9DAADC1C9FCC82D0
1 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/test/java/org/apache/commons/lang3/ValidateTest.java
View File

@ -139,39 +139,60 @@ void shouldThrowExceptionWithDoubleInsertedIntoTemplateMessageForFalseExpression
}
}
//-----------------------------------------------------------------------
//-----------------------------------------------------------------------
@SuppressWarnings("unused")
@Test
void testNotNull1() {
Validate.notNull(new Object());
try {
Validate.notNull(null);
fail("Expecting NullPointerException");
} catch (final NullPointerException ex) {
assertEquals("The validated object is null", ex.getMessage());
@Nested
class NotNull {
@Nested
class WithoutMessage {
@Test
void shouldNotThrowForNonNullReference() {
Validate.notNull(new Object());
}
@Test
void shouldReturnTheSameInstance() {
final String str = "Hi";
final String result = Validate.notNull(str);
assertSame(str, result);
}
@Test
void shouldThrowExceptionWithDefaultMessageForNullReference() {
final NullPointerException ex = assertThrows(
NullPointerException.class,
() -> Validate.notNull(null));
assertEquals("The validated object is null", ex.getMessage());
}
}
final String str = "Hi";
final String testStr = Validate.notNull(str);
assertSame(str, testStr);
}
@Nested
class WithMessage {
//-----------------------------------------------------------------------
@SuppressWarnings("unused")
@Test
void testNotNull2() {
Validate.notNull(new Object(), "MSG");
try {
Validate.notNull(null, "MSG");
fail("Expecting NullPointerException");
} catch (final NullPointerException ex) {
assertEquals("MSG", ex.getMessage());
@Test
void shouldNotThrowForNonNullReference() {
Validate.notNull(new Object(), "MSG");
}
@Test
void shouldReturnTheSameInstance() {
final String str = "Hi";
final String result = Validate.notNull(str, "MSG");
assertSame(str, result);
}
@Test
void shouldThrowExceptionWithGivenMessageForNullReference() {
final NullPointerException ex = assertThrows(
NullPointerException.class,
() -> Validate.notNull(null, "MSG"));
assertEquals("MSG", ex.getMessage());
}
}
final String str = "Hi";
final String testStr = Validate.notNull(str, "Message");
assertSame(str, testStr);
}
//-----------------------------------------------------------------------