From aabedea5e9b63dfa29b2a54455e4d330481d2099 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Fri, 24 Jan 2025 20:10:40 +0000 Subject: [PATCH 1/7] Added German --- src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java | 2 +- src/org/launchcode/java/demos/lsn1datatypes/Message.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java b/src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java index a375d208a..5609d58c0 100644 --- a/src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java +++ b/src/org/launchcode/java/demos/lsn1datatypes/HelloMethods.java @@ -3,7 +3,7 @@ public class HelloMethods { public static void main(String[] args) { - String message = Message.getMessage("fr"); + String message = Message.getMessage("de"); System.out.println(message); } diff --git a/src/org/launchcode/java/demos/lsn1datatypes/Message.java b/src/org/launchcode/java/demos/lsn1datatypes/Message.java index 9d42bfa1b..82d9ca66e 100644 --- a/src/org/launchcode/java/demos/lsn1datatypes/Message.java +++ b/src/org/launchcode/java/demos/lsn1datatypes/Message.java @@ -8,6 +8,8 @@ public static String getMessage(String lang) { return "¡Hola, Mundo!"; } else if (lang.equals("fr")) { return "Bonjour, le monde!"; + } else if (lang.equals("de")) { + return "Hallo, Welt!"; } else { return "Hello, World!"; } From 4e295e7c3f4b0e7cd45bb5220759a0b0b9a66b22 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Fri, 24 Jan 2025 20:20:52 +0000 Subject: [PATCH 2/7] removed the import --- .../launchcode/java/demos/lsn1datatypes/TempConverter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java b/src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java index 89d9fbc01..7a49cca9b 100644 --- a/src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java +++ b/src/org/launchcode/java/demos/lsn1datatypes/TempConverter.java @@ -1,14 +1,14 @@ package org.launchcode.java.demos.lsn1datatypes; -import java.util.Scanner; +//import java.util.Scanner; public class TempConverter { public static void main(String[] args) { double fahrenheit; double celsius; - Scanner input; + java.util.Scanner input; - input = new Scanner(System.in); + input = new java.util.Scanner(System.in); System.out.println("Enter the temperature in Fahrenheit: "); fahrenheit = input.nextDouble(); input.close(); From 1c4439406cd9fd5ed716dc8a5ce9e1cc7ff77f52 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Fri, 24 Jan 2025 21:11:48 +0000 Subject: [PATCH 3/7] instantiate --- src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java b/src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java index 7ea3d53ee..ebf8312ca 100644 --- a/src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java +++ b/src/org/launchcode/java/demos/lsn3classes1/SchoolPractice.java @@ -3,5 +3,6 @@ public class SchoolPractice { public static void main(String[] args) { // Instantiate your Student class for part 2 here! + Student amit = new Student("Amit Kapila",3,1,4.0); } } From 8b1707e1853c6a73fe3a9bc24a7016809ce194a9 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Fri, 24 Jan 2025 21:14:10 +0000 Subject: [PATCH 4/7] student methods --- .../java/demos/lsn3classes1/Student.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/org/launchcode/java/demos/lsn3classes1/Student.java b/src/org/launchcode/java/demos/lsn3classes1/Student.java index 73f21c5fc..c8a7b93e4 100644 --- a/src/org/launchcode/java/demos/lsn3classes1/Student.java +++ b/src/org/launchcode/java/demos/lsn3classes1/Student.java @@ -6,6 +6,55 @@ public class Student { private String name; + + public String getName() { + return name; + } + + public Student(String name) { + this.name = name; + } + + public Student(String name, int studentId, int numberOfCredits, double gpa) { + this.name = name; + this.studentId = studentId; + this.numberOfCredits = numberOfCredits; + this.gpa = gpa; + } + + public int getStudentId() { + return studentId; + } + + public void setStudentId(int studentId) { + this.studentId = studentId; + } + + public int getNumberOfCredits() { + return numberOfCredits; + } + + private void setNumberOfCredits(int numberOfCredits) { + this.numberOfCredits = numberOfCredits; + } + + public double getGpa() { + return gpa; + } + + public void setGpa(double gpa) { + this.gpa = gpa; + } + + public Student(String name, int studentId) { + this.name = name; + this.studentId = studentId; + } + + public void setName(String aName) { + name = aName; + } + private int studentId; private int numberOfCredits = 0; private double gpa = 0.0; From c7208e854b747e3a1931705e5f62d4b480e1003c Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Fri, 24 Jan 2025 21:17:33 +0000 Subject: [PATCH 5/7] Course methods --- .../java/demos/lsn4classes2/Course.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/org/launchcode/java/demos/lsn4classes2/Course.java b/src/org/launchcode/java/demos/lsn4classes2/Course.java index cb04bc96a..4e4e39e46 100644 --- a/src/org/launchcode/java/demos/lsn4classes2/Course.java +++ b/src/org/launchcode/java/demos/lsn4classes2/Course.java @@ -1,6 +1,7 @@ package org.launchcode.java.demos.lsn4classes2; import java.util.ArrayList; +import java.util.Objects; public class Course { private String topic; @@ -10,8 +11,21 @@ public class Course { // TODO: Add your custom 'toString' method here. Make sure it returns a well-formatted String rather than // just the class fields. + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Course course = (Course) o; + return Objects.equals(topic, course.topic) && Objects.equals(instructor, course.instructor) && Objects.equals(enrolledStudents, course.enrolledStudents); + } + + @Override + public int hashCode() { + return Objects.hash(topic, instructor, enrolledStudents); + } + // TODO: Add your custom 'equals' method here. Consider which fields should match in order to call two // Course objects equal. -} +} \ No newline at end of file From 5f8d26c9c806daa17c70f355f6e66b43a4acfd20 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Fri, 24 Jan 2025 22:46:51 +0000 Subject: [PATCH 6/7] Student 5.5.2 --- .../java/demos/lsn4classes2/Student.java | 36 +++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/src/org/launchcode/java/demos/lsn4classes2/Student.java b/src/org/launchcode/java/demos/lsn4classes2/Student.java index b51eb666a..263d59327 100644 --- a/src/org/launchcode/java/demos/lsn4classes2/Student.java +++ b/src/org/launchcode/java/demos/lsn4classes2/Student.java @@ -1,5 +1,7 @@ package org.launchcode.java.demos.lsn4classes2; +import java.util.Objects; + public class Student { private static int nextStudentId = 1; @@ -30,21 +32,49 @@ public String studentInfo() { //TODO: Uncomment and complete the getGradeLevel method here: -// public String getGradeLevel() { -// // Determine the grade level of the student based on numberOfCredits -// } + public String getGradeLevel(int credits) { + // Determine the grade level of the student based on numberOfCredits + if(credits <= 29) { + return "Freshman"; + } else if (credits <= 59) { + return "Sophomore"; + } else if (credits <= 89) { + return "Junior"; + } else { + return "Senior"; + } + } // TODO: Complete the addGrade method. public void addGrade(int courseCredits, double grade) { // Update the appropriate fields: numberOfCredits, gpa + double totalQualityScore = this.gpa * this.numberOfCredits; + totalQualityScore += courseCredits * grade; + this.numberOfCredits += courseCredits; + this.gpa = totalQualityScore/this.numberOfCredits; } // TODO: Add your custom 'toString' method here. Make sure it returns a well-formatted String rather // than just the class fields. + @Override + public String toString() { + String studentReport = String.format("%s is a %s with %d credits and a GPA of %.2f", this.name, this.getGradeLevel(this.numberOfCredits), this.getNumberOfCredits(), this.getGpa()); + return studentReport; + } + + // TODO: Add your custom 'equals' method here. Consider which fields should match in order to call two // Student objects equal. + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Student student = (Student) o; + return getStudentId() == student.getStudentId();} + public String getName() { return name; } From 86ced8aa144fb8251c82d6abd44aa7885baac199 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Sat, 25 Jan 2025 00:05:58 +0000 Subject: [PATCH 7/7] 6.2 JUnit --- .../demos/lsn5unittesting/test/CarTest.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java b/src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java index 7cde639dc..88abe225b 100644 --- a/src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java +++ b/src/org/launchcode/java/demos/lsn5unittesting/test/CarTest.java @@ -1,9 +1,33 @@ package org.launchcode.java.demos.lsn5unittesting.test; +import org.junit.Before; +import org.junit.Test; +import org.launchcode.java.demos.lsn5unittesting.main.Car; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + public class CarTest { + Car test_car; + + @Before + public void createCarObject() { + test_car = new Car("Toyota","Prius",10,50); + } + //TODO: add emptyTest so we can configure our runtime environment (remove this test before pushing to your personal GitLab account) + @Test + public void emptyTest() { + assertEquals(10,10,.001); + } //TODO: constructor sets gasTankLevel properly + @Test + public void testInitialGasTank() { + //Car test_car = new Car("Toyota","Prius",10,50); + //assertEquals(10, test_car.getGasTankLevel(),.001); + assertFalse(test_car.getGasTankLevel() == 0); + } //TODO: gasTankLevel is accurate after driving within tank range //TODO: gasTankLevel is accurate after attempting to drive past tank range //TODO: can't have more gas than tank size, expect an exception