From 2ac1ccbbb967d4f6ca050186219480d25f23c443 Mon Sep 17 00:00:00 2001 From: Sandip Date: Mon, 30 Jul 2018 01:52:40 +0530 Subject: [PATCH] BAEL-1979 Removed the System.out.println() statements and converted the assertTrue to assertEquals wherever possible. --- .../java/com/baeldung/snakeyaml/Contact.java | 7 +-- .../java/com/baeldung/snakeyaml/Customer.java | 6 +-- .../JavaToYAMLSerializationUnitTest.java | 2 - .../YAMLToJavaDeserialisationUnitTest.java | 50 ++++++++++--------- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java b/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java index 5559c2c339..a808747786 100644 --- a/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java +++ b/libraries/src/main/java/com/baeldung/snakeyaml/Contact.java @@ -4,7 +4,8 @@ public class Contact { private String type; - private Integer number; + private int number; + public String getType() { return type; @@ -14,11 +15,11 @@ public class Contact { this.type = type; } - public Integer getNumber() { + public int getNumber() { return number; } - public void setNumber(Integer number) { + public void setNumber(int number) { this.number = number; } diff --git a/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java b/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java index da35976d37..c741f6dc85 100644 --- a/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java +++ b/libraries/src/main/java/com/baeldung/snakeyaml/Customer.java @@ -6,7 +6,7 @@ public class Customer { private String firstName; private String lastName; - private Integer age; + private int age; private List contactDetails; private Address homeAddress; @@ -26,11 +26,11 @@ public class Customer { this.lastName = lastName; } - public Integer getAge() { + public int getAge() { return age; } - public void setAge(Integer age) { + public void setAge(int age) { this.age = age; } diff --git a/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java b/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java index c1b6c80353..f6836f6d56 100644 --- a/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java +++ b/libraries/src/test/java/com/baeldung/snakeyaml/JavaToYAMLSerializationUnitTest.java @@ -23,7 +23,6 @@ public class JavaToYAMLSerializationUnitTest { Yaml yaml = new Yaml(); StringWriter writer = new StringWriter(); yaml.dump(data, writer); - System.out.println(writer.toString()); String expectedYaml = "name: Silenthand Olleander\nrace: Human\ntraits: [ONE_HAND, ONE_EYE]\n"; assertEquals(expectedYaml, writer.toString()); } @@ -48,7 +47,6 @@ public class JavaToYAMLSerializationUnitTest { customer.setFirstName("Greg"); customer.setLastName("McDowell"); Yaml yaml = new Yaml(); - System.out.println(yaml.dumpAs(customer, Tag.MAP, null)); String expectedYaml = "{age: 45, contactDetails: null, firstName: Greg, homeAddress: null, lastName: McDowell}\n"; assertEquals(expectedYaml, yaml.dumpAs(customer, Tag.MAP, null)); } diff --git a/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java index 0b9cd860f9..a0245c0a4d 100644 --- a/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java +++ b/libraries/src/test/java/com/baeldung/snakeyaml/YAMLToJavaDeserialisationUnitTest.java @@ -1,20 +1,15 @@ package com.baeldung.snakeyaml; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.InputStream; -import java.util.Date; -import java.util.Map; - import org.junit.Test; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; -import com.baeldung.snakeyaml.Contact; -import com.baeldung.snakeyaml.Customer; +import java.io.InputStream; +import java.util.Date; +import java.util.Map; + +import static org.junit.Assert.*; public class YAMLToJavaDeserialisationUnitTest { @@ -25,6 +20,9 @@ public class YAMLToJavaDeserialisationUnitTest { .getClassLoader() .getResourceAsStream("yaml/customer.yaml"); Map obj = yaml.load(inputStream); + assertEquals("John", obj.get("firstName")); + assertEquals("Doe", obj.get("lastName")); + assertEquals(20, obj.get("age")); System.out.println(obj); } @@ -35,6 +33,9 @@ public class YAMLToJavaDeserialisationUnitTest { .getClassLoader() .getResourceAsStream("yaml/customer.yaml"); Customer customer = yaml.load(inputStream); + assertEquals("John", customer.getFirstName()); + assertEquals("Doe", customer.getLastName()); + assertEquals(20, customer.getAge()); System.out.println(customer); } @@ -45,6 +46,9 @@ public class YAMLToJavaDeserialisationUnitTest { .getClassLoader() .getResourceAsStream("yaml/customer_with_type.yaml"); Customer customer = yaml.load(inputStream); + assertEquals("John", customer.getFirstName()); + assertEquals("Doe", customer.getLastName()); + assertEquals(20, customer.getAge()); System.out.println(customer); } @@ -53,9 +57,9 @@ public class YAMLToJavaDeserialisationUnitTest { Yaml yaml = new Yaml(); Map document = yaml.load("3.0: 2018-07-22"); assertNotNull(document); - assertTrue(document.size() == 1); - assertTrue(document.containsKey(Double.valueOf(3.0))); - assertTrue(document.get(Double.valueOf(3.0)) instanceof Date); + assertEquals(1, document.size()); + assertTrue(document.containsKey(3.0d)); + assertTrue(document.get(3.0d) instanceof Date); } @Test @@ -68,22 +72,21 @@ public class YAMLToJavaDeserialisationUnitTest { assertNotNull(customer); assertEquals("John", customer.getFirstName()); assertEquals("Doe", customer.getLastName()); - assertTrue(customer.getAge() == 31); + assertEquals(31, customer.getAge()); assertNotNull(customer.getContactDetails()); - assertTrue(customer.getContactDetails() - .size() == 2); + assertEquals(2, customer.getContactDetails().size()); assertEquals("mobile", customer.getContactDetails() .get(0) .getType()); - assertTrue(customer.getContactDetails() + assertEquals(123456789,customer.getContactDetails() .get(0) - .getNumber() == 123456789); + .getNumber()); assertEquals("landline", customer.getContactDetails() .get(1) .getType()); - assertTrue(customer.getContactDetails() + assertEquals(456786868, customer.getContactDetails() .get(1) - .getNumber() == 456786868); + .getNumber()); assertNotNull(customer.getHomeAddress()); assertEquals("Xyz, DEF Street", customer.getHomeAddress() .getLine()); @@ -103,10 +106,9 @@ public class YAMLToJavaDeserialisationUnitTest { assertNotNull(customer); assertEquals("John", customer.getFirstName()); assertEquals("Doe", customer.getLastName()); - assertTrue(customer.getAge() == 31); + assertEquals(31, customer.getAge()); assertNotNull(customer.getContactDetails()); - assertTrue(customer.getContactDetails() - .size() == 2); + assertEquals(2, customer.getContactDetails().size()); assertEquals("mobile", customer.getContactDetails() .get(0) .getType()); @@ -126,7 +128,7 @@ public class YAMLToJavaDeserialisationUnitTest { count++; assertTrue(object instanceof Customer); } - assertTrue(count == 2); + assertEquals(2, count); } }