From d83bbcb570510c17284c4ff25e183f8425a09ef8 Mon Sep 17 00:00:00 2001 From: Terri Penn Date: Sat, 30 Sep 2023 20:14:01 -0500 Subject: [PATCH 1/2] Change AbstractTest.java/getJobString() to use %n instead of hardcoding \n. --- .../org/launchcode/techjobs/oo/AbstractTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/launchcode/techjobs/oo/AbstractTest.java b/src/test/java/org/launchcode/techjobs/oo/AbstractTest.java index 6c1de76d6..4232e1a62 100644 --- a/src/test/java/org/launchcode/techjobs/oo/AbstractTest.java +++ b/src/test/java/org/launchcode/techjobs/oo/AbstractTest.java @@ -68,12 +68,12 @@ protected int getJobId(Job job) throws ClassNotFoundException, NoSuchMethodExcep } protected String getJobString (Job job) throws NoSuchMethodException, ClassNotFoundException, InvocationTargetException, IllegalAccessException, NoSuchFieldException { - return String.format("\nID: %d\n" + - "Name: %s\n" + - "Employer: %s\n" + - "Location: %s\n" + - "Position Type: %s\n" + - "Core Competency: %s\n", getJobId(job), getJobFieldString(job, "name", true), getJobFieldString(job, "employer", true), getJobFieldString(job, "location", true), + return String.format("%nID: %d%n" + + "Name: %s%n" + + "Employer: %s%n" + + "Location: %s%n" + + "Position Type: %s%n" + + "Core Competency: %s%n", getJobId(job), getJobFieldString(job, "name", true), getJobFieldString(job, "employer", true), getJobFieldString(job, "location", true), getJobFieldString(job, "positionType", true), getJobFieldString(job, "coreCompetency", true)); } From 591a789c99c38595e41e4cd98ffd061ce4d35aac Mon Sep 17 00:00:00 2001 From: Terri Penn Date: Sun, 1 Oct 2023 14:17:29 -0500 Subject: [PATCH 2/2] Change TestTaskFive.testToStringStartsAndEndsWithNewLine() to use startsWith() and endsWith() to handle multi-character line separators (e.g. Windows \r\n) --- .../java/org/launchcode/techjobs/oo/TestTaskFive.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/launchcode/techjobs/oo/TestTaskFive.java b/src/test/java/org/launchcode/techjobs/oo/TestTaskFive.java index fa9f4f7bf..ec552645c 100644 --- a/src/test/java/org/launchcode/techjobs/oo/TestTaskFive.java +++ b/src/test/java/org/launchcode/techjobs/oo/TestTaskFive.java @@ -10,8 +10,7 @@ import java.lang.reflect.Method; import static java.lang.System.lineSeparator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; /** * Created by LaunchCode @@ -36,10 +35,9 @@ public void testTestToStringStartsAndEndsWithNewLineExists () throws ClassNotFou @Test public void testToStringStartsAndEndsWithNewLine() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException { Job job = createJob("Web Developer", "LaunchCode", "StL", "Back-end developer", "Java"); - String firstChar = String.valueOf(job.toString().charAt(0)); - String lastChar = String.valueOf(job.toString().charAt(job.toString().length()-1)); - assertEquals(firstChar, lineSeparator()); - assertEquals(lastChar, lineSeparator()); + String jobString = job.toString(); + assertTrue(jobString.startsWith(lineSeparator())); + assertTrue(jobString.endsWith(lineSeparator())); } @Test