From d04b10c40a072895af962c735ef66dbe6194d7ca Mon Sep 17 00:00:00 2001
From: Amanda <amandafaithdev@gmail.com>
Date: Tue, 3 Dec 2024 16:28:41 -0600
Subject: [PATCH 1/2] Save current working version

---
 .idea/gradle.xml                              |   1 +
 .idea/workspace.xml                           | 199 +++++++++++++++---
 .../techjobs/oo/CoreCompetency.java           |  12 ++
 .../java/org/launchcode/techjobs/oo/Job.java  | 105 +++++++++
 .../org/launchcode/techjobs/oo/JobField.java  |  71 +++++++
 .../org/launchcode/techjobs/oo/Location.java  |   4 +
 .../launchcode/techjobs/oo/PositionType.java  |  31 +++
 .../org/launchcode/techjobs/oo/JobTest.java   | 116 ++++++++++
 8 files changed, 511 insertions(+), 28 deletions(-)
 create mode 100644 src/main/java/org/launchcode/techjobs/oo/JobField.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 14746e766..2a65317ef 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 39e269e34..33bbef91d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,31 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="59ff47a6-ece6-4e2e-b777-6247aa1f282e" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.jar" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradlew" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/gradlew.bat" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/settings.gradle" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/Employer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/Job.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/Location.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/Main.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/PositionType.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/org/launchcode/techjobs/oo/AbstractTest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/org/launchcode/techjobs/oo/JobTest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/org/launchcode/techjobs/oo/TestTaskFive.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/org/launchcode/techjobs/oo/TestTaskFour.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/org/launchcode/techjobs/oo/TestTaskSix.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/org/launchcode/techjobs/oo/TestTaskThree.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/org/launchcode/techjobs/oo/TestTaskTwo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/Job.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/Job.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/Location.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/Location.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/PositionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/launchcode/techjobs/oo/PositionType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/org/launchcode/techjobs/oo/JobTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/org/launchcode/techjobs/oo/JobTest.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,6 +23,16 @@
       <ProjectState />
     </projectState>
   </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <task path="$PROJECT_DIR$">
+          <activation />
+        </task>
+        <projects_view />
+      </state>
+    </system>
+  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -51,6 +43,21 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;amandafaith&quot;
+  }
+}</component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;https://github.com/amandafaith/ga2-techjobs-oo-java-graded-17.git&quot;,
+    &quot;accountId&quot;: &quot;c677d1d9-ed6e-4216-b8bf-bf6563de2189&quot;
+  }
+}</component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 2
+}</component>
   <component name="ProjectId" id="2Qn6e2NCqVj233XTVZ3RW2TzDBN" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -59,12 +66,124 @@
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
+    "Gradle.Build ga2-techjobs-oo-java-graded-17.executor": "Run",
+    "Gradle.JobTest (1).executor": "Run",
+    "Gradle.JobTest.executor": "Run",
+    "Gradle.JobTest.testJobConstructorSetsAllFields.executor": "Run",
+    "Gradle.JobTest.testJobsForEquality.executor": "Run",
+    "Gradle.JobTest.testSettingJobId.executor": "Run",
+    "Gradle.JobTest.testToStringContainsCorrectLabelsAndData.executor": "Run",
+    "Gradle.JobTest.testToStringHandlesEmptyField.executor": "Run",
+    "Gradle.JobTest.testToStringStartsAndEndsWithNewLine.executor": "Run",
+    "Gradle.TestTaskTwo.executor": "Run",
+    "Gradle.Tests in 'org.launchcode.techjobs.oo'.executor": "Run",
+    "JUnit.JobTest.executor": "Run",
+    "JUnit.org.launchcode.techjobs.oo in techjobs-oo-java17-graded.main.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true"
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "git-widget-placeholder": "main",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "C:/Users/afhol/Desktop/LaunchCode/java-projects/ga2-techjobs-oo-java-graded-17"
   }
 }]]></component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Gradle.Tests in 'org.launchcode.techjobs.oo'">
+    <configuration name="JobTest.testJobsForEquality" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" value="" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value=":test" />
+            <option value="--tests" />
+            <option value="&quot;org.launchcode.techjobs.oo.JobTest.testJobsForEquality&quot;" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>true</RunAsTest>
+      <method v="2" />
+    </configuration>
+    <configuration name="JobTest.testToStringContainsCorrectLabelsAndData" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" value="" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value=":test" />
+            <option value="--tests" />
+            <option value="&quot;org.launchcode.techjobs.oo.JobTest.testToStringContainsCorrectLabelsAndData&quot;" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>true</RunAsTest>
+      <method v="2" />
+    </configuration>
+    <configuration name="JobTest.testToStringHandlesEmptyField" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" value="" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value=":test" />
+            <option value="--tests" />
+            <option value="&quot;org.launchcode.techjobs.oo.JobTest.testToStringHandlesEmptyField&quot;" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>true</RunAsTest>
+      <method v="2" />
+    </configuration>
+    <configuration name="JobTest.testToStringStartsAndEndsWithNewLine" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" value="" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value=":test" />
+            <option value="--tests" />
+            <option value="&quot;org.launchcode.techjobs.oo.JobTest.testToStringStartsAndEndsWithNewLine&quot;" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+      <DebugAllEnabled>false</DebugAllEnabled>
+      <RunAsTest>true</RunAsTest>
+      <method v="2" />
+    </configuration>
     <configuration name="Tests in 'org.launchcode.techjobs.oo'" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -86,12 +205,36 @@
       <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
       <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
       <DebugAllEnabled>false</DebugAllEnabled>
-      <ForceTestExec>true</ForceTestExec>
+      <RunAsTest>true</RunAsTest>
       <method v="2" />
     </configuration>
+    <configuration name="JobTest" type="JUnit" factoryName="JUnit">
+      <module name="techjobs-oo-java17-graded.test" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+      <option name="ALTERNATIVE_JRE_PATH" value="17" />
+      <option name="PACKAGE_NAME" value="org.launchcode.techjobs.oo" />
+      <option name="MAIN_CLASS_NAME" value="org.launchcode.techjobs.oo.JobTest" />
+      <option name="METHOD_NAME" value="" />
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <list>
+      <item itemvalue="Gradle.JobTest.testToStringHandlesEmptyField" />
+      <item itemvalue="Gradle.JobTest.testJobsForEquality" />
+      <item itemvalue="Gradle.JobTest.testToStringContainsCorrectLabelsAndData" />
+      <item itemvalue="Gradle.JobTest.testToStringStartsAndEndsWithNewLine" />
+      <item itemvalue="Gradle.Tests in 'org.launchcode.techjobs.oo'" />
+      <item itemvalue="JUnit.JobTest" />
+    </list>
     <recent_temporary>
       <list>
         <item itemvalue="Gradle.Tests in 'org.launchcode.techjobs.oo'" />
+        <item itemvalue="Gradle.JobTest.testToStringHandlesEmptyField" />
+        <item itemvalue="Gradle.JobTest.testToStringContainsCorrectLabelsAndData" />
+        <item itemvalue="Gradle.JobTest.testToStringStartsAndEndsWithNewLine" />
+        <item itemvalue="Gradle.JobTest.testJobsForEquality" />
       </list>
     </recent_temporary>
   </component>
diff --git a/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java b/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java
index 2b36909aa..399ac422d 100644
--- a/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java
+++ b/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java
@@ -41,4 +41,16 @@ public int hashCode() {
     // TODO: Use the "Generate" tool to add a getter and setter for the 'value' field but
     //  ONLY a getter for the 'id' field.
 
+
+    public String getValue() {
+        return value;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }
diff --git a/src/main/java/org/launchcode/techjobs/oo/Job.java b/src/main/java/org/launchcode/techjobs/oo/Job.java
index 6e561377e..15346fa55 100644
--- a/src/main/java/org/launchcode/techjobs/oo/Job.java
+++ b/src/main/java/org/launchcode/techjobs/oo/Job.java
@@ -16,10 +16,115 @@ public class Job {
     // TODO: Add two constructors - one to initialize a unique ID and a second to initialize the
     //  other five fields. The second constructor should also call the first in order to initialize
     //  the 'id' field.
+    public Job() {
+        this.id = nextId;
+        nextId++;
+    }
+
+    public Job(String name, Employer employer, Location location, PositionType positionType, CoreCompetency coreCompetency) {
+        this();
+        this.name = name;
+        this.employer = employer;
+        this.location = location;
+        this.positionType = positionType;
+        this.coreCompetency = coreCompetency;
+
+    }
 
     // TODO: Add custom equals and hashCode methods. Consider two Job objects "equal" when their id fields
     //  match.
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Job job = (Job) o;
+        return id == job.id;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(id);
+    }
+
+
     // TODO: Add getters for each field EXCEPT nextId. Add setters for each field EXCEPT nextID
     //  and id.
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Employer getEmployer() {
+        return employer;
+    }
+
+    public void setEmployer(Employer employer) {
+        this.employer = employer;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    public void setLocation(Location location) {
+        this.location = location;
+    }
+
+    public PositionType getPositionType() {
+        return positionType;
+    }
+
+    public void setPositionType(PositionType positionType) {
+        this.positionType = positionType;
+    }
+
+    public CoreCompetency getCoreCompetency() {
+        return coreCompetency;
+    }
+
+    public void setCoreCompetency(CoreCompetency coreCompetency) {
+        this.coreCompetency = coreCompetency;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    //create a toString method that passes:
+    //that the returned string starts and ends with a blank line
+    @Override
+    public String toString() {
+//        to pass first test:
+//        return System.lineSeparator() + System.lineSeparator();
+
+//        to pass second test:
+//        String result = System.lineSeparator();
+//        result += "ID: " + getId() + "\n";
+//        result += "Name: " + getName() + "\n";
+//        result += "Employer: " + getEmployer().getValue() + "\n";
+//        result += "Location: " + getLocation().getValue() + "\n";
+//        result += "Position Type: " + getPositionType().getValue() + "\n";
+//        result += "Core Competency: " + getCoreCompetency().getValue() + "\n";
+//        result += System.lineSeparator();
+//
+//        return result;
+
+//        to pass third test:
+        String result = System.lineSeparator();
+        result += "ID: " + getId() + System.lineSeparator();
+        result += "Name: " + (name == null || name.isBlank() ? "Data not available" : name) + System.lineSeparator();
+        result += "Employer: " + (employer == null || employer.getValue() == null || employer.getValue().isBlank() ? "Data not available" : employer.getValue()) + System.lineSeparator();
+        result += "Location: " + (location == null || location.getValue() == null || location.getValue().isBlank() ? "Data not available" : location.getValue()) + System.lineSeparator();
+        result += "Position Type: " + (positionType == null || positionType.getValue() == null || positionType.getValue().isBlank() ? "Data not available" : positionType.getValue()) + System.lineSeparator();
+        result += "Core Competency: " + (coreCompetency == null || coreCompetency.getValue() == null || coreCompetency.getValue().isBlank() ? "Data not available" : coreCompetency.getValue()) + System.lineSeparator();
+        return result;
+
+    }
+
+    
 }
diff --git a/src/main/java/org/launchcode/techjobs/oo/JobField.java b/src/main/java/org/launchcode/techjobs/oo/JobField.java
new file mode 100644
index 000000000..b345cdeb2
--- /dev/null
+++ b/src/main/java/org/launchcode/techjobs/oo/JobField.java
@@ -0,0 +1,71 @@
+package org.launchcode.techjobs.oo;
+
+public abstract class JobField {
+
+    //what fields do Employer, Location, Position Type and Location all have in common?
+        //private int id;
+    //    private static int nextId = 1;
+    //    private String value;
+
+    //Which constructors are the same in all four classes
+        //the empty constructors
+        //the constructor with String value as an argument
+
+    //what getters and setters do all of the classes share
+        //getValue
+        //getId
+        //setValue
+
+    //which custom methods are identical in all the classes
+        //toString
+            //confused about hashCode
+            //confused about equals
+            //these are slightly different for each class, but not sure if
+            //maybe that is an error and those need to be fixed?
+            //or they are supposed to be slightly different?
+
+    private int id;
+    private static int nextId = 1;
+    private String value;
+
+
+    public JobField() {
+        id = nextId;
+        nextId++;
+    }
+
+    public JobField(String value) {
+        this();
+        this.value = value;
+    }
+
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public static int getNextId() {
+        return nextId;
+    }
+
+
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    public abstract boolean equals();
+
+
+
+
+}
diff --git a/src/main/java/org/launchcode/techjobs/oo/Location.java b/src/main/java/org/launchcode/techjobs/oo/Location.java
index ac8fc977b..b1aee2300 100644
--- a/src/main/java/org/launchcode/techjobs/oo/Location.java
+++ b/src/main/java/org/launchcode/techjobs/oo/Location.java
@@ -15,6 +15,10 @@ public Location() {
 
     // TODO: Add a constructor that takes a string as a parameter and assigns it to the 'value' field. The
     //  constructor should also call the empty constructor in order to initialize the 'id' field.
+    public Location(String value) {
+        this();
+        this.value = value;
+    }
 
 
     // Custom toString, equals, and hashCode methods:
diff --git a/src/main/java/org/launchcode/techjobs/oo/PositionType.java b/src/main/java/org/launchcode/techjobs/oo/PositionType.java
index 9287914e4..984fad975 100644
--- a/src/main/java/org/launchcode/techjobs/oo/PositionType.java
+++ b/src/main/java/org/launchcode/techjobs/oo/PositionType.java
@@ -1,5 +1,7 @@
 package org.launchcode.techjobs.oo;
 
+import java.util.Objects;
+
 public class PositionType {
 
     private int id;
@@ -17,10 +19,27 @@ public PositionType(String value) {
     }
 
     // TODO: Add a custom toString() method that returns the data stored in 'value'.
+    public String toString() {
+        return value;
+    }
 
     // TODO: Add custom equals and hashCode methods. Consider two PositionType objects "equal" when
     //  their id fields match.
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PositionType that = (PositionType) o;
+        return id == that.id;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(id);
+    }
+
+
     // Getters and Setters:
 
     public int getId() {
@@ -35,4 +54,16 @@ public void setValue(String value) {
         this.value = value;
     }
 
+
+
+
+
+
+
+
 }
+
+
+
+
+
diff --git a/src/test/java/org/launchcode/techjobs/oo/JobTest.java b/src/test/java/org/launchcode/techjobs/oo/JobTest.java
index 2d781f8e5..74b50a244 100644
--- a/src/test/java/org/launchcode/techjobs/oo/JobTest.java
+++ b/src/test/java/org/launchcode/techjobs/oo/JobTest.java
@@ -1,5 +1,121 @@
 package org.launchcode.techjobs.oo;
 
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotEquals;
+
+
 public class JobTest {
     //TODO: Create your unit tests here
+    @Test
+    public void testSettingJobId() {
+        //create two Job objects using the empty constructor
+        //use assertNotEquals to verify that the IDs of the
+        //two objects are distinct
+        Job test_job1 = new Job();
+        Job test_job2 = new Job();
+        assertNotEquals("Ids should be distinct", test_job1.getId(), test_job2.getId());
+
+    }
+
+    @Test
+    public void testJobConstructorSetsAllFields() {
+        Job test_job3 = new Job("Product tester", new Employer("ACME"), new Location("Desert"), new PositionType("Quality control"), new CoreCompetency("Persistence"));
+
+        assertEquals("Product tester", test_job3.getName());
+        assertEquals("ACME", test_job3.getEmployer().getValue());
+        assertEquals("Desert", test_job3.getLocation().getValue());
+        assertEquals("Quality control", test_job3.getPositionType().getValue());
+        assertEquals("Persistence", test_job3.getCoreCompetency().getValue());
+
+        assertTrue(test_job3.getName() instanceof String);
+        assertTrue(test_job3.getEmployer() instanceof Employer);
+        assertTrue(test_job3.getLocation() instanceof Location);
+        assertTrue(test_job3.getPositionType() instanceof PositionType);
+        assertTrue(test_job3.getCoreCompetency() instanceof CoreCompetency);
+    }
+
+    @Test
+    public void testJobsForEquality() {
+        Job test_job4 = new Job("name1", new Employer("employer1"), new Location("location1"), new PositionType("position1"), new CoreCompetency("competency1"));
+        Job test_job5 = new Job("name1", new Employer("employer1"), new Location("location1"), new PositionType("position1"), new CoreCompetency("competency1"));
+
+        assertNotEquals("Jobs should not be equal if their IDs differ", test_job4, test_job5);
+    }
+
+    //when passed a Job object, it should return a string that contains
+    //a blank line before and after the job info.
+
+    //If a field is empty, the method should add "Data not available" after the label
+    //Use assertEquals to verify that the characters are correct
+    @Test
+    public void testToStringStartsAndEndsWithNewLine() {
+        Job test_job6 = new Job("name2", new Employer("employer2"), new Location("location2"), new PositionType("position2"), new CoreCompetency("competency2"));
+        String result = test_job6.toString();
+        String lineSeparator = System.lineSeparator();
+
+        //Checks that the first character is a new line
+        assertEquals("The string should start with a new line", lineSeparator.charAt(0), result.charAt(0));
+
+        //Checks that the last character is a new line
+        assertEquals("The string should end with a new line", lineSeparator.charAt(lineSeparator.length() - 1), result.charAt(result.length() - 1));
+
+    }
+
+    //The string should contain a label for each field,
+    //followed by the data stored in that field.
+    //Each field should be on its own line
+    //ex: ID: _____
+    //ex: Name: _____
+    @Test
+    public void testToStringContainsCorrectLabelsAndData() {
+        Job test_job7 = new Job("name3", new Employer("employer3"), new Location("location3"), new PositionType("position3"), new CoreCompetency("competency3"));
+
+        String result = test_job7.toString();
+
+        String expected = System.lineSeparator() + "ID: " + test_job7.getId() + System.lineSeparator() +
+                "Name: " + test_job7.getName() + System.lineSeparator() +
+                "Employer: " + test_job7.getEmployer().getValue() + System.lineSeparator() +
+                "Location: " + test_job7.getLocation().getValue() + System.lineSeparator() +
+                "Position Type: " + test_job7.getPositionType().getValue() + System.lineSeparator() +
+                "Core Competency: " + test_job7.getCoreCompetency().getValue() + System.lineSeparator();
+
+
+        //Check that the string contains the right data for each field
+        assertTrue("The string should contain the correct ID", result.contains("ID: " + test_job7.getId()));
+        assertTrue("The string should contain the correct name", result.contains("Name: " + test_job7.getName()));
+        assertTrue("The string should contain the correct employer", result.contains("Employer: " + test_job7.getEmployer().getValue()));
+        assertTrue("The string should contain the correct location", result.contains("Location: " + test_job7.getLocation()));
+        assertTrue("The string should contain the correct position type", result.contains("Position Type: " + test_job7.getPositionType().getValue()));
+        assertTrue("The string should contain the correct core competency", result.contains("Core Competency: " + test_job7.getCoreCompetency().getValue()));
+
+    }
+
+
+    //If a field is empty, the method should add
+    //"Data not available" after the label
+    @Test
+    public void testToStringHandlesEmptyField() {
+        Job test_job8 = new Job(
+                "Software Developer",
+                new Employer(""),
+                null, // Location is null
+                new PositionType(""),
+                new CoreCompetency("")
+        );
+
+        String result = test_job8.toString();
+
+        String expected = System.lineSeparator()
+                + "ID: " + test_job8.getId() + System.lineSeparator()
+                + "Name: Software Developer" + System.lineSeparator()
+                + "Employer: Data not available" + System.lineSeparator()
+                + "Location: Data not available" + System.lineSeparator()
+                + "Position Type: Data not available" + System.lineSeparator()
+                + "Core Competency: Data not available" + System.lineSeparator();
+
+        assertEquals(expected, result);
+
+
+    }
 }

From b25dae57fc5f589d429d65ddfa00cfc6786f1c2c Mon Sep 17 00:00:00 2001
From: Amanda <amandafaithdev@gmail.com>
Date: Tue, 3 Dec 2024 19:10:43 -0600
Subject: [PATCH 2/2] final version

---
 .../techjobs/oo/CoreCompetency.java           | 47 +---------------
 .../org/launchcode/techjobs/oo/Employer.java  | 45 +--------------
 .../java/org/launchcode/techjobs/oo/Job.java  | 19 +------
 .../org/launchcode/techjobs/oo/JobField.java  | 49 +++++++----------
 .../org/launchcode/techjobs/oo/Location.java  | 49 +----------------
 .../java/org/launchcode/techjobs/oo/Main.java | 28 ++++++----
 .../launchcode/techjobs/oo/PositionType.java  | 55 +------------------
 .../org/launchcode/techjobs/oo/JobTest.java   |  2 +-
 8 files changed, 47 insertions(+), 247 deletions(-)

diff --git a/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java b/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java
index 399ac422d..06c31f279 100644
--- a/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java
+++ b/src/main/java/org/launchcode/techjobs/oo/CoreCompetency.java
@@ -2,55 +2,12 @@
 
 import java.util.Objects;
 
-public class CoreCompetency {
+public class CoreCompetency extends JobField {
 
-    private int id;
-    private static int nextId = 1;
-    private String value;
-
-    public CoreCompetency() {
-        this.id = nextId;
-        nextId++;
-    }
 
     public CoreCompetency(String value) {
-        this();
-        this.value = value;
-    }
-
-    // Custom toString, equals, and hashCode methods:
-
-    @Override
-    public String toString() {
-        return value;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof CoreCompetency)) return false;
-        CoreCompetency that = (CoreCompetency) o;
-        return id == that.id;
+        super(value);
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
 
-    // TODO: Use the "Generate" tool to add a getter and setter for the 'value' field but
-    //  ONLY a getter for the 'id' field.
-
-
-    public String getValue() {
-        return value;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
 }
diff --git a/src/main/java/org/launchcode/techjobs/oo/Employer.java b/src/main/java/org/launchcode/techjobs/oo/Employer.java
index 701cd9bab..89edbf52e 100644
--- a/src/main/java/org/launchcode/techjobs/oo/Employer.java
+++ b/src/main/java/org/launchcode/techjobs/oo/Employer.java
@@ -2,54 +2,13 @@
 
 import java.util.Objects;
 
-public class Employer {
+public class Employer extends JobField {
 
-    private int id;
-    private static int nextId = 1;
-    private String value;
-
-    public Employer() {
-        id = nextId;
-        nextId++;
-    }
 
     public Employer(String value) {
-        this();
-        this.value = value;
-    }
-
-    // Custom toString, equals, and hashCode methods:
-
-    @Override
-    public String toString() {
-        return value;
-    }
-
-    @Override
-    public boolean equals(Object o) {  // Two objects are equal if they have the same id.
-        if (this == o) return true;
-        if (!(o instanceof Employer)) return false;
-        Employer employer = (Employer) o;
-        return getId() == employer.getId();
+        super(value);
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(getId());
-    }
-
-    // Getters and Setters:
-
-    public int getId() {
-        return id;
-    }
 
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
 
 }
diff --git a/src/main/java/org/launchcode/techjobs/oo/Job.java b/src/main/java/org/launchcode/techjobs/oo/Job.java
index 15346fa55..c2bb80ac9 100644
--- a/src/main/java/org/launchcode/techjobs/oo/Job.java
+++ b/src/main/java/org/launchcode/techjobs/oo/Job.java
@@ -95,26 +95,9 @@ public int getId() {
         return id;
     }
 
-    //create a toString method that passes:
-    //that the returned string starts and ends with a blank line
+ 
     @Override
     public String toString() {
-//        to pass first test:
-//        return System.lineSeparator() + System.lineSeparator();
-
-//        to pass second test:
-//        String result = System.lineSeparator();
-//        result += "ID: " + getId() + "\n";
-//        result += "Name: " + getName() + "\n";
-//        result += "Employer: " + getEmployer().getValue() + "\n";
-//        result += "Location: " + getLocation().getValue() + "\n";
-//        result += "Position Type: " + getPositionType().getValue() + "\n";
-//        result += "Core Competency: " + getCoreCompetency().getValue() + "\n";
-//        result += System.lineSeparator();
-//
-//        return result;
-
-//        to pass third test:
         String result = System.lineSeparator();
         result += "ID: " + getId() + System.lineSeparator();
         result += "Name: " + (name == null || name.isBlank() ? "Data not available" : name) + System.lineSeparator();
diff --git a/src/main/java/org/launchcode/techjobs/oo/JobField.java b/src/main/java/org/launchcode/techjobs/oo/JobField.java
index b345cdeb2..a6a720c05 100644
--- a/src/main/java/org/launchcode/techjobs/oo/JobField.java
+++ b/src/main/java/org/launchcode/techjobs/oo/JobField.java
@@ -1,36 +1,17 @@
 package org.launchcode.techjobs.oo;
 
-public abstract class JobField {
-
-    //what fields do Employer, Location, Position Type and Location all have in common?
-        //private int id;
-    //    private static int nextId = 1;
-    //    private String value;
-
-    //Which constructors are the same in all four classes
-        //the empty constructors
-        //the constructor with String value as an argument
+import java.util.Objects;
 
-    //what getters and setters do all of the classes share
-        //getValue
-        //getId
-        //setValue
-
-    //which custom methods are identical in all the classes
-        //toString
-            //confused about hashCode
-            //confused about equals
-            //these are slightly different for each class, but not sure if
-            //maybe that is an error and those need to be fixed?
-            //or they are supposed to be slightly different?
+public abstract class JobField {
 
+    private String value;
     private int id;
     private static int nextId = 1;
-    private String value;
+
 
 
     public JobField() {
-        id = nextId;
+        this.id = nextId;
         nextId++;
     }
 
@@ -40,6 +21,7 @@ public JobField(String value) {
     }
 
 
+
     public String getValue() {
         return value;
     }
@@ -52,9 +34,7 @@ public int getId() {
         return id;
     }
 
-    public static int getNextId() {
-        return nextId;
-    }
+
 
 
 
@@ -63,7 +43,20 @@ public String toString() {
         return value;
     }
 
-    public abstract boolean equals();
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof JobField jobField)) return false;
+        return getId() == jobField.getId();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getId());
+    }
+
+
 
 
 
diff --git a/src/main/java/org/launchcode/techjobs/oo/Location.java b/src/main/java/org/launchcode/techjobs/oo/Location.java
index b1aee2300..f49a73141 100644
--- a/src/main/java/org/launchcode/techjobs/oo/Location.java
+++ b/src/main/java/org/launchcode/techjobs/oo/Location.java
@@ -2,57 +2,12 @@
 
 import java.util.Objects;
 
-public class Location {
+public class Location extends JobField {
 
-    private int id;
-    private static int nextId = 1;
-    private String value;
-
-    public Location() {
-        id = nextId;
-        nextId++;
-    }
-
-    // TODO: Add a constructor that takes a string as a parameter and assigns it to the 'value' field. The
-    //  constructor should also call the empty constructor in order to initialize the 'id' field.
     public Location(String value) {
-        this();
-        this.value = value;
-    }
-
-
-    // Custom toString, equals, and hashCode methods:
-
-    @Override
-    public String toString() {
-        return value;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof Location)) return false;
-        Location location = (Location) o;
-        return getId() == location.getId();
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getId());
-    }
-
-    // Getters and Setters:
-
-    public int getId() {
-        return id;
+        super(value);
     }
 
-    public String getValue() {
-        return value;
-    }
 
-    public void setValue(String value) {
-        this.value = value;
-    }
 
 }
diff --git a/src/main/java/org/launchcode/techjobs/oo/Main.java b/src/main/java/org/launchcode/techjobs/oo/Main.java
index b9d9cc02b..c82c4090c 100644
--- a/src/main/java/org/launchcode/techjobs/oo/Main.java
+++ b/src/main/java/org/launchcode/techjobs/oo/Main.java
@@ -1,19 +1,23 @@
 package org.launchcode.techjobs.oo;
+
+
+import java.util.ArrayList;
+
 public class Main {
 
     public static void main(String[] args) {
-//        Job job1 = new Job("Product tester", new Employer("ACME"), new Location("Desert"), new PositionType("Quality control"), new CoreCompetency("Persistence"));
-//        Job job2 = new Job("Web Developer", new Employer("LaunchCode"), new Location("St. Louis"), new PositionType("Front-end developer"), new CoreCompetency("JavaScript"));
-//        Job job3 = new Job("Ice cream tester", new Employer(""), new Location("Home"), new PositionType("UX"), new CoreCompetency("Tasting ability"));
-//
-//        ArrayList<Job> jobs = new ArrayList<>();
-//        jobs.add(job1);
-//        jobs.add(job2);
-//        jobs.add(job3);
-//
-//        for (Job job : jobs){
-//            System.out.println(job);
-//        }
+       Job job1 = new Job("Product tester", new Employer("ACME"), new Location("Desert"), new PositionType("Quality control"), new CoreCompetency("Persistence"));
+       Job job2 = new Job("Web Developer", new Employer("LaunchCode"), new Location("St. Louis"), new PositionType("Front-end developer"), new CoreCompetency("JavaScript"));
+       Job job3 = new Job("Ice cream tester", new Employer(""), new Location("Home"), new PositionType("UX"), new CoreCompetency("Tasting ability"));
+
+        ArrayList<Job> jobs = new ArrayList<>();
+        jobs.add(job1);
+        jobs.add(job2);
+        jobs.add(job3);
+
+        for (Job job : jobs){
+            System.out.println(job);
+        }
     }
 
 }
diff --git a/src/main/java/org/launchcode/techjobs/oo/PositionType.java b/src/main/java/org/launchcode/techjobs/oo/PositionType.java
index 984fad975..18a486fd4 100644
--- a/src/main/java/org/launchcode/techjobs/oo/PositionType.java
+++ b/src/main/java/org/launchcode/techjobs/oo/PositionType.java
@@ -2,65 +2,14 @@
 
 import java.util.Objects;
 
-public class PositionType {
+public class PositionType extends JobField {
 
-    private int id;
-    private static int nextId = 1;
-    private String value;
-
-    public PositionType() {
-        id = nextId;
-        nextId++;
-    }
 
     public PositionType(String value) {
-        this();
-        this.value = value;
-    }
-
-    // TODO: Add a custom toString() method that returns the data stored in 'value'.
-    public String toString() {
-        return value;
-    }
-
-    // TODO: Add custom equals and hashCode methods. Consider two PositionType objects "equal" when
-    //  their id fields match.
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        PositionType that = (PositionType) o;
-        return id == that.id;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(id);
+        super(value);
     }
 
 
-    // Getters and Setters:
-
-    public int getId() {
-        return id;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-
-
-
-
-
-
-
 }
 
 
diff --git a/src/test/java/org/launchcode/techjobs/oo/JobTest.java b/src/test/java/org/launchcode/techjobs/oo/JobTest.java
index 74b50a244..6f8b0477a 100644
--- a/src/test/java/org/launchcode/techjobs/oo/JobTest.java
+++ b/src/test/java/org/launchcode/techjobs/oo/JobTest.java
@@ -85,7 +85,7 @@ public void testToStringContainsCorrectLabelsAndData() {
         assertTrue("The string should contain the correct ID", result.contains("ID: " + test_job7.getId()));
         assertTrue("The string should contain the correct name", result.contains("Name: " + test_job7.getName()));
         assertTrue("The string should contain the correct employer", result.contains("Employer: " + test_job7.getEmployer().getValue()));
-        assertTrue("The string should contain the correct location", result.contains("Location: " + test_job7.getLocation()));
+        assertTrue("The string should contain the correct location", result.contains("Location: " + test_job7.getLocation().getValue()));
         assertTrue("The string should contain the correct position type", result.contains("Position Type: " + test_job7.getPositionType().getValue()));
         assertTrue("The string should contain the correct core competency", result.contains("Core Competency: " + test_job7.getCoreCompetency().getValue()));