From 3dd03d19341afc5e0aa227e56acf48d94a546c98 Mon Sep 17 00:00:00 2001 From: jsymborski Date: Sat, 19 Oct 2019 11:13:18 -0600 Subject: [PATCH 1/3] Issue 60 - Added test cases inside JSONUtilTest to increase overall coverage --- .../com/intuit/payment/util/JsonUtilTest.java | 34 +++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java b/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java index 63147388..6cb28d16 100755 --- a/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java +++ b/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java @@ -30,7 +30,16 @@ * */ public class JsonUtilTest { - + + // Test class used to ensure exception is thrown inside of JsonUtil + public class ClassWithPrivateFields { + ClassWithPrivateFields(int id, String name){ + id = id; + name = name; + } + int id; + String name; + } @Test public void testSerialize() throws SerializationException{ @@ -40,13 +49,32 @@ public void testSerialize() throws SerializationException{ String result = "{\n \"number\" : \"12345\"\n}"; Assert.assertEquals(cardStr, result); } - + @Test public void testDeserialize() throws SerializationException { String cardStr = "{\"number\":\"12345\"}"; Card card = (Card) JsonUtil.deserialize(cardStr, new TypeReference() {} ); Assert.assertEquals(card.getNumber(), "12345"); } + + @Test(expectedExceptions = SerializationException.class) + public void testErrorSerialize() throws SerializationException{ + // Serializing this causes a InvalidDefinitionException to be thrown + ClassWithPrivateFields classWithPrivateFields = new ClassWithPrivateFields(1, "John"); + JsonUtil.serialize(classWithPrivateFields); + } + + @Test + public void testNullSerialization() throws SerializationException { + String cardStr = JsonUtil.serialize(null); + Assert.assertNull(cardStr); + } + + @Test(expectedExceptions = SerializationException.class) + public void testErrorDeserialize() throws SerializationException{ + String cardStr = "{\"number\":\"12345\"\"}"; + JsonUtil.deserialize(cardStr, new TypeReference() {} ); + } @SuppressWarnings("unchecked") @Test @@ -57,5 +85,5 @@ public void testDeserializeList() throws SerializationException { Assert.assertEquals(cards.get(0).getNumber(), "12345"); } - + } From 6368ca158d7b8b3dc204881c77d9b62db9784ad1 Mon Sep 17 00:00:00 2001 From: jsymborski Date: Sat, 19 Oct 2019 11:31:52 -0600 Subject: [PATCH 2/3] Minor clean up and organization of tests in JsonUtilTest --- .../com/intuit/payment/util/JsonUtilTest.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java b/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java index 6cb28d16..b395d569 100755 --- a/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java +++ b/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java @@ -42,7 +42,7 @@ public class ClassWithPrivateFields { } @Test - public void testSerialize() throws SerializationException{ + public void testSerialize() throws SerializationException { Card card = new Card.Builder().number("12345").build(); String cardStr = JsonUtil.serialize(card); Assert.assertNotNull(cardStr); @@ -51,31 +51,31 @@ public void testSerialize() throws SerializationException{ } @Test - public void testDeserialize() throws SerializationException { - String cardStr = "{\"number\":\"12345\"}"; - Card card = (Card) JsonUtil.deserialize(cardStr, new TypeReference() {} ); - Assert.assertEquals(card.getNumber(), "12345"); - } + public void testNullSerialization() throws SerializationException { + String cardStr = JsonUtil.serialize(null); + Assert.assertNull(cardStr); + } - @Test(expectedExceptions = SerializationException.class) - public void testErrorSerialize() throws SerializationException{ + @Test(expectedExceptions = SerializationException.class) + public void testErrorSerialize() throws SerializationException { // Serializing this causes a InvalidDefinitionException to be thrown ClassWithPrivateFields classWithPrivateFields = new ClassWithPrivateFields(1, "John"); JsonUtil.serialize(classWithPrivateFields); } @Test - public void testNullSerialization() throws SerializationException { - String cardStr = JsonUtil.serialize(null); - Assert.assertNull(cardStr); - } + public void testDeserialize() throws SerializationException { + String cardStr = "{\"number\":\"12345\"}"; + Card card = (Card) JsonUtil.deserialize(cardStr, new TypeReference() {} ); + Assert.assertEquals(card.getNumber(), "12345"); + } @Test(expectedExceptions = SerializationException.class) - public void testErrorDeserialize() throws SerializationException{ + public void testErrorDeserialize() throws SerializationException { String cardStr = "{\"number\":\"12345\"\"}"; JsonUtil.deserialize(cardStr, new TypeReference() {} ); } - + @SuppressWarnings("unchecked") @Test public void testDeserializeList() throws SerializationException { From 6b39a942bfc7d52908d943a87d6d992acacd1ece Mon Sep 17 00:00:00 2001 From: jsymborski Date: Sat, 19 Oct 2019 11:38:30 -0600 Subject: [PATCH 3/3] Minor spelling fix on test name in JsonUtilTest --- .../src/test/java/com/intuit/payment/util/JsonUtilTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java b/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java index b395d569..112210d5 100755 --- a/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java +++ b/payments-api/src/test/java/com/intuit/payment/util/JsonUtilTest.java @@ -51,7 +51,7 @@ public void testSerialize() throws SerializationException { } @Test - public void testNullSerialization() throws SerializationException { + public void testNullSerialize() throws SerializationException { String cardStr = JsonUtil.serialize(null); Assert.assertNull(cardStr); }