From d74a663f1318f434e2f09419e642319290eafe87 Mon Sep 17 00:00:00 2001 From: Tom Howlett Date: Thu, 6 Oct 2022 11:51:30 +0100 Subject: [PATCH 1/2] Added a second parameter --- src/main/java/devoxx/NullPointerDereference.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/devoxx/NullPointerDereference.java b/src/main/java/devoxx/NullPointerDereference.java index af0fe34..c60ec38 100644 --- a/src/main/java/devoxx/NullPointerDereference.java +++ b/src/main/java/devoxx/NullPointerDereference.java @@ -2,15 +2,16 @@ public class NullPointerDereference { - public int getNumberOfPawsPlusOne(String animal) { + public int getNumberOfPawsPlusOne(String animal, String fred) { String trimmedAnimal = trim(animal); + String trimmedFred = trim(fred); int paws; if ("dog".equals(trimmedAnimal)) { paws = 4; } else if (trimmedAnimal.equals("tom")) { // NullPointer issue raised paws = 5; - } else if (trimmedAnimal.equals("Martin")) { // NullPointer issue raised + } else if (trimmedFred.equals("Martin")) { // NullPointer issue raised paws = 3; } else if ("Centipede".equals(trimmedAnimal)) { paws = 100; From 71577b32e37d37d0c5350670e5f91e8668fa46a2 Mon Sep 17 00:00:00 2001 From: Tom Howlett Date: Thu, 6 Oct 2022 11:56:28 +0100 Subject: [PATCH 2/2] Added a second parameter, fixed tests --- src/test/java/devoxx/NullPointerDereferenceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/devoxx/NullPointerDereferenceTest.java b/src/test/java/devoxx/NullPointerDereferenceTest.java index ff83213..7e9851b 100644 --- a/src/test/java/devoxx/NullPointerDereferenceTest.java +++ b/src/test/java/devoxx/NullPointerDereferenceTest.java @@ -10,11 +10,11 @@ public class NullPointerDereferenceTest { @Test public void shouldGetDogPaws() { - assertEquals(underTest.getNumberOfPawsPlusOne("dog"), 4); + assertEquals(underTest.getNumberOfPawsPlusOne("dog", "basset"), 4); } @Test(expected = NullPointerException.class) public void ignoredTestThatWouldCoverBug() { - underTest.getNumberOfPawsPlusOne(""); + underTest.getNumberOfPawsPlusOne("", ""); } }