From b5357e267e1e99c8acecf3a7147a43af7c992f0d Mon Sep 17 00:00:00 2001 From: "koastiebratt@gmail.com" Date: Fri, 25 Sep 2020 00:42:33 -0400 Subject: [PATCH 1/3] 1:5 completed, please finish --- pom.xml | 3 +- src/main/java/com/dtcc/projects/DelTech.java | 4 + .../java/com/dtcc/projects/Instructor.java | 20 ++++ src/main/java/com/dtcc/projects/Learner.java | 7 ++ src/main/java/com/dtcc/projects/Person.java | 14 +++ src/main/java/com/dtcc/projects/Student.java | 15 +++ src/main/java/com/dtcc/projects/Teacher.java | 7 ++ .../com/dtcc/projects/TestInstructor.java | 100 ++++++++++++++++++ .../java/com/dtcc/projects/TestPerson.java | 17 +++ .../java/com/dtcc/projects/TestStudent.java | 42 ++++++++ .../com/dtcc/projects/Instructor.class | Bin 0 -> 906 bytes .../classes/com/dtcc/projects/Learner.class | Bin 0 -> 136 bytes target/classes/com/dtcc/projects/Person.class | Bin 0 -> 613 bytes .../classes/com/dtcc/projects/Student.class | Bin 0 -> 561 bytes .../classes/com/dtcc/projects/Teacher.class | Bin 0 -> 216 bytes .../com/dtcc/projects/TestInstructor.class | Bin 0 -> 2162 bytes .../com/dtcc/projects/TestPerson.class | Bin 0 -> 797 bytes .../com/dtcc/projects/TestStudent.class | Bin 0 -> 1204 bytes 18 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/dtcc/projects/DelTech.java create mode 100644 src/main/java/com/dtcc/projects/Instructor.java create mode 100644 src/main/java/com/dtcc/projects/Learner.java create mode 100644 src/main/java/com/dtcc/projects/Student.java create mode 100644 src/main/java/com/dtcc/projects/Teacher.java create mode 100644 src/test/java/com/dtcc/projects/TestInstructor.java create mode 100644 src/test/java/com/dtcc/projects/TestStudent.java create mode 100644 target/classes/com/dtcc/projects/Instructor.class create mode 100644 target/classes/com/dtcc/projects/Learner.class create mode 100644 target/classes/com/dtcc/projects/Person.class create mode 100644 target/classes/com/dtcc/projects/Student.class create mode 100644 target/classes/com/dtcc/projects/Teacher.class create mode 100644 target/test-classes/com/dtcc/projects/TestInstructor.class create mode 100644 target/test-classes/com/dtcc/projects/TestPerson.class create mode 100644 target/test-classes/com/dtcc/projects/TestStudent.class diff --git a/pom.xml b/pom.xml index a98015f..a7497cf 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,8 @@ 1.0-SNAPSHOT - UTF-8 + 1.8 + 1.8 diff --git a/src/main/java/com/dtcc/projects/DelTech.java b/src/main/java/com/dtcc/projects/DelTech.java new file mode 100644 index 0000000..c69a7ed --- /dev/null +++ b/src/main/java/com/dtcc/projects/DelTech.java @@ -0,0 +1,4 @@ +package com.dtcc.projects; + +public class DelTech { +} diff --git a/src/main/java/com/dtcc/projects/Instructor.java b/src/main/java/com/dtcc/projects/Instructor.java new file mode 100644 index 0000000..ce550b2 --- /dev/null +++ b/src/main/java/com/dtcc/projects/Instructor.java @@ -0,0 +1,20 @@ +package com.dtcc.projects; + +public class Instructor extends Person implements Teacher { + + + @Override + public void teach(Student student, double numberOfHours) { + student.learn(numberOfHours); + } + + @Override + public void lecture(Student[] student, double numberOfHours) { + double numberOfHoursPerStudent = numberOfHours / student.length; + for(int i = 0; i < student.length; i++){ + Student temp_student = student[i]; + temp_student.learn(numberOfHoursPerStudent); + student[i] = temp_student; + } + } +} diff --git a/src/main/java/com/dtcc/projects/Learner.java b/src/main/java/com/dtcc/projects/Learner.java new file mode 100644 index 0000000..55c5c31 --- /dev/null +++ b/src/main/java/com/dtcc/projects/Learner.java @@ -0,0 +1,7 @@ +package com.dtcc.projects; + +public interface Learner { + + public void learn(double numberOfHours); + +} diff --git a/src/main/java/com/dtcc/projects/Person.java b/src/main/java/com/dtcc/projects/Person.java index ff9713e..73fdb23 100644 --- a/src/main/java/com/dtcc/projects/Person.java +++ b/src/main/java/com/dtcc/projects/Person.java @@ -1,4 +1,18 @@ package com.dtcc.projects; public class Person { + + String name; + + public Person(){} + + public Person(String name){ + this.name = name; + } + + public String getName(){return this.name;} + + public void setName(String name){ + this.name = name; + } } diff --git a/src/main/java/com/dtcc/projects/Student.java b/src/main/java/com/dtcc/projects/Student.java new file mode 100644 index 0000000..ec12a37 --- /dev/null +++ b/src/main/java/com/dtcc/projects/Student.java @@ -0,0 +1,15 @@ +package com.dtcc.projects; + +public class Student extends Person implements Learner { + + private double totalStudyTime; + + @Override + public void learn(double numberOfHours) { + //Increment total study time by val + totalStudyTime += numberOfHours; + } + + //returns total study time, future calcs + public double getTotalStudyTime(){return this.totalStudyTime;} +} diff --git a/src/main/java/com/dtcc/projects/Teacher.java b/src/main/java/com/dtcc/projects/Teacher.java new file mode 100644 index 0000000..62b0b56 --- /dev/null +++ b/src/main/java/com/dtcc/projects/Teacher.java @@ -0,0 +1,7 @@ +package com.dtcc.projects; + +public interface Teacher { + + public void teach(Student student, double numberOfHours); + public void lecture(Student[] student, double numberOfHours); +} diff --git a/src/test/java/com/dtcc/projects/TestInstructor.java b/src/test/java/com/dtcc/projects/TestInstructor.java new file mode 100644 index 0000000..e78743d --- /dev/null +++ b/src/test/java/com/dtcc/projects/TestInstructor.java @@ -0,0 +1,100 @@ +package com.dtcc.projects; + +import junit.framework.Assert; +import org.junit.Test; + +public class TestInstructor { + + @Test + public void testImplementation(){ + //Create new teach + Instructor zc = new Instructor(); + zc.setName("Zan"); + + //Create New Student + Student cs = new Student(); + cs.setName("Cedric"); + + //Havn't studied yet should be 0 + double bookMark1 = cs.getTotalStudyTime(); + + //Zan teaches student, have to call teacher interface + zc.teach(cs, 2); + + //Get students study time + double bookMark2 = cs.getTotalStudyTime(); + + Assert.assertEquals(0.0, bookMark1); + Assert.assertEquals(2.0, bookMark2); + + } + + @Test + public void testInheritance(){ + //Creates an instructor + Instructor kb = new Instructor(); + //Set name only exists in Person + kb.setName("Kaleb"); + String temp_val = kb.getName(); + Assert.assertEquals("Kaleb", temp_val ); + } + + @Test + public void testTeach(){ + //Create new teach + Instructor zc = new Instructor(); + zc.setName("Zan"); + + //Create New Student + Student cs = new Student(); + cs.setName("Cedric"); + + //Havn't studied yet should be 0 + double bookMark1 = cs.getTotalStudyTime(); + + //Zan teaches student, have to call teacher interface + zc.teach(cs, 2); + + //Due to last statment we should hope this is true + double bookMark2 = cs.getTotalStudyTime(); + + Assert.assertEquals(0.0, bookMark1); + Assert.assertEquals(false, (cs.getTotalStudyTime() == 1)); + Assert.assertEquals(2.0, bookMark2); + } + + @Test + public void testLecture(){ + + //Create new teach + Instructor zc = new Instructor(); + zc.setName("Zan"); + + //Create New Student + Student cs = new Student(); + cs.setName("Cedric"); + + //Creates second student + Student ez = new Student(); + ez.setName("Emad"); + + //Created a roster of students + Student[] roster = new Student[2]; + roster[0] = cs; + roster[1] = ez; + + //Teach the whole class 2 hours each + zc.lecture(roster, 4); + + //Cedric Gets a special tutor session, so should have 4 total + zc.teach(cs, 2); + + //Checking Roster + Assert.assertEquals(2.0, roster[1].getTotalStudyTime()); + Assert.assertEquals(4.0, roster[0].getTotalStudyTime()); + + //Checking each student manually + Assert.assertEquals(2.0, ez.getTotalStudyTime()); + Assert.assertEquals(4.0, cs.getTotalStudyTime()); + } +} diff --git a/src/test/java/com/dtcc/projects/TestPerson.java b/src/test/java/com/dtcc/projects/TestPerson.java index 040f78f..c952890 100644 --- a/src/test/java/com/dtcc/projects/TestPerson.java +++ b/src/test/java/com/dtcc/projects/TestPerson.java @@ -1,4 +1,21 @@ package com.dtcc.projects; +import org.junit.Assert; +import org.junit.Test; + public class TestPerson { + + @Test + public void testSetName(){ + + //Starts with null _>setName(); + Person person = new Person(); + person.setName("Billy-Bob"); + + //Single arg constructor calls same logic as getName(); + Person person1 = new Person("Swag"); + + Assert.assertEquals("Billy-Bob", person.getName()); + Assert.assertEquals("Swag", person1.getName()); + } } diff --git a/src/test/java/com/dtcc/projects/TestStudent.java b/src/test/java/com/dtcc/projects/TestStudent.java new file mode 100644 index 0000000..5986bac --- /dev/null +++ b/src/test/java/com/dtcc/projects/TestStudent.java @@ -0,0 +1,42 @@ +package com.dtcc.projects; + +import org.junit.*; +import org.junit.Test; + +public class TestStudent { + + + @Test + public void testImplementation(){ + Student Jess = new Student(); + double temp = Jess.getTotalStudyTime(); + Assert.assertEquals(0, temp, 0); + } + + @Test + public void testInheritance(){ + Student Emad = new Student(); + Emad.setName("Emad"); + Assert.assertEquals("Emad", Emad.getName()); + } + + @Test + public void testLearn(){ + + //Creates Student + Student cedric = new Student(); + + //Cedric learns for 2 hours + cedric.learn(2); + + //Checking get study time, ensuring returning total; + double bookMark1 = cedric.getTotalStudyTime(); + + //Adding two more hours to total study, ensuring saving increments + cedric.learn(2); + double bookMark2 = cedric.getTotalStudyTime(); + + Assert.assertEquals(2, bookMark1 , 0); + Assert.assertEquals(4, bookMark2, 0); + } +} diff --git a/target/classes/com/dtcc/projects/Instructor.class b/target/classes/com/dtcc/projects/Instructor.class new file mode 100644 index 0000000000000000000000000000000000000000..a2656be577c9550355649ac428fa98fead1d5328 GIT binary patch literal 906 zcmaJ<-D(p-7(J8S?C6>rTa8IWVSjRl(BFd26G zIt)9bG&xbB9(VTQu}-s4C+U_zQL7+47HE0rAbUFNt5|RC7=1aOW&*1VpaM&AZtmsL zZjz<6Aa*!ApmLVdY}|72gObY`B0dO8T-J`YB- z)wn$x3)Qp8EU$dJje94-yPyOIQewS?4cw;aqV);X&bFyMPGW)j+19>UwMx(J&D|CU zDo8nRdt3(AVDZ=BXX1Zi@uoSR7npT;3*N=eZxCM?6mXHJlNT+xj7w7hE-?b*C0yod zhIeyXqJ8fx3a8U9SwKXQT!x`doZ*}@n5c{^Ije(ZtPm}571w60pJ~;w`<_4fkUX-j zhfc-uCm+%9E6)ALvMy^j<(SlE@4X{F{rzdAt=xE%F9R(~np~z#l|oHM8_YK;V(e_w wK$VyZdyNpiA&K~a8IYH~@jK2!lCg8)d0eokUuy1suBNREw>fsug; XXcq$mBMTz~GXo2V#lQ+AnHbmrhI=0? literal 0 HcmV?d00001 diff --git a/target/classes/com/dtcc/projects/Person.class b/target/classes/com/dtcc/projects/Person.class new file mode 100644 index 0000000000000000000000000000000000000000..55e67ec17703146f096e7821ed31c4bf3e4b61c1 GIT binary patch literal 613 zcmZ{g%}&BV6ot=}+DiFHK;q6FU}87!G;B;*5j4TDFQvf}XiZyuE=@EhE_?tV%6Mj4 zfru`8XYTZzbHAC-ulElC7ie41(a0l*riqq`V*x#IR-Qn8xNsgFd+7vodz?gmFuxQq zuKd7H`U1I5cS7lPIHR;O^aF3SUQNB|&Y3QiIdq-n#EE>_XNP)n@5cfsLpNO6v&41n zhbUZlZW7zKUKED`2Q)kTW91}s?j<9|)#!BhB^1Oz0&5(uBi9@F5~PqOpUb-xVdAie z0~iAB{}=?S+k4+kB_2-sJUX9C@S~em=bmA#d3H8e^{@8^@yr7a7OSBSO%%8iiiFFcD|X(_wo7m4&V?i8#&aAFtKH!VWDYZTcDz1<%NAUA3qF&sT2@hfx>YR z1?oh=+}j@tNTuqgf1})H{^Td(oZ*)rEWG-)aDnE?Pl=+ literal 0 HcmV?d00001 diff --git a/target/classes/com/dtcc/projects/Teacher.class b/target/classes/com/dtcc/projects/Teacher.class new file mode 100644 index 0000000000000000000000000000000000000000..5c1a75a2eb882c972e13a1a1fb89cab89f93ca78 GIT binary patch literal 216 zcmaiup$@_@6h-eF+X@4LMS&cK8XT6ONDw0!ROuREDJv;0ABW%r_$We~;1H;roSfvI z*Zc7VFh`%E$50S5r-VEa#^qX?3$LA&{Ax|3q`UFT`C7GZv7GJ*Ob6zzB23EtKe?!k zw^FUnI{1Ta{7`n*h`S(+eviHaVHg#zMSJ9%LyX7?gd{WrNlNG-1;S>?0|`-)qx%5? Cwm2aG literal 0 HcmV?d00001 diff --git a/target/test-classes/com/dtcc/projects/TestInstructor.class b/target/test-classes/com/dtcc/projects/TestInstructor.class new file mode 100644 index 0000000000000000000000000000000000000000..d920fc88cf22e910cc091df9f5bd016b989c43d7 GIT binary patch literal 2162 zcmb7_-BS~16vm%7*<@pgfZ?NjSdAY@0)YT(RZt4@p+JC^q*$T0vsqSHNOp0vu~Vlv zz3pAS>5TtCuX_`jI<5EqQMJ#z3HbnrnTBC^-?Q&~&U1d}A$<7vuYUmC!m}`XaYx17 zFnqWZ!aaGPR52AsP_FOG`=q=)2+r_?{KzfSVSI_1FlO;EggF_Rmx~2?Sq$M(aHhS! z`LT*670Uv_`=({O(*pi@VpBkwvv&-EwzO#(Yo$WYaI#u1&qy?F>so$Ob4vkcvay+&svsUsn4wK zY1`RN?U%^Flgw0Yo=|Jga7}xNzR9>@oQyJGWtzD@= z9?Ke-b8=*AZ+Wqaqu@H=siT zD_Y*jMeqdQ%E(iB*`je43ffKt+xSi(cDh2daB{B`T+d0z2&hHFUDFC|vnzfYur%j| zUBk_Cc6q7yrz}V6*_PuDxE1i1<7dE}mpK{=&)X%>+A4=yGS;8V!t;rS(v=OIZFj{W z&mGG9(RL0}v&Ev}P;*4{9u{7dv^?E3*eJZx*HlBkYDCIV*-E9^&UjaE7J4<%3csCO4Bt;REj69}9De@Nk zqL8Y{5WfMh;u^(v<0h_SfP$|ejvE++pJ)5{JjfFXo{_B%@h&i2Yiy7E{fzb18*67{ z!)07pjkYI`5Unfi_9|ba(g7;HL5+jd7xz@fDp_i(qDXqGI*4rqqpZ@bKz8M!6$-OT zwA*zB{}-)a!fyNh4OHb1DE=dKoQCc9rael~pr8;XwPKvmCW!Vnk=>=hDFS;y*waY! z|IHR=8h~%tTFcacFVuif)_^Cgz{gl80pCZ?Euf-Dg-=D$?}rc{`KBr46XFD&@fw{N zjVI^*`YbwC8?KE+J88qf-v~}By^24X=~a}G%y6&LiLNp}JGN#84&O}>+p#&j_`oxb zA?eqV6I&$dlMa4J#{!Fl`iM}M33Y`~*9d2we%rtpGDMsu*e94H))hR%_xyPQ4Zk3V o-=H^ueq96oYYp_zRnXUAabN@V+8EE>vsCb^N$`2xC z*mJ#j>Rd|CbFPwj;(Ic6F8ox!^OH1=1`I2bqM`pdt31!p{7>J%9;2vw%CLQ& zMN&-tkw^uxPogN6T#7g%^tu}-fiubI8*(JUYQs27JpZ*&W7o?$o=o^BZo$GTLt}B^ z0?e>{D#Gx~@o7A^@EC1c$?!7|RA1Xd2VDa_3w<0h>@JFwG#X9uoRCL>^LDJ3!eFE~ zJJ{;D<@Hb|A_@j-|3+|AvDxV^mXK=sy(ekvC!}ie+{5b>0G18AeTc5#rV^{mvFu!Bj){hFOL^KJa#7&Z0BT$3nTO{7YW{%x2q~}-@2bA9; Xe1mH4lBeMw^{YV}`B>X@YH0oi*LAQW literal 0 HcmV?d00001 diff --git a/target/test-classes/com/dtcc/projects/TestStudent.class b/target/test-classes/com/dtcc/projects/TestStudent.class new file mode 100644 index 0000000000000000000000000000000000000000..95cc55e56ad5ecbf873d321ec2aec431ab1badd1 GIT binary patch literal 1204 zcmZvaZ%@-u6vm%BN;_s@V-y4t2MDfXN)_-A4hh6zf|;1eLiCME*WHZ5)?#~S;wSNQ z_y&k3egHp|@!Y#*8{n4Qo^$Rw=XcK2{`vd!H-HUnr;tJ3fSp1Dd3h94SV1v~dFecq z$0He8)pw{s{$$9}cQPH%z+(eX81yYa@WnR6kX<-p&|Zgi&XBJ70Y7NBYCNjCwI)Tf zmC$pWM{eXxzZ=xVu^%(!Dqh%f>caD!vnV{_o`{_)kHw*A*LfgHR4vHeZ=E%Hivq6j z!+=Dg-xsl%`xdHjtpMaT?n zwR+-ybxn*TOOxH)zq^5nHLM%hF!2=6OgzU66PtJ`-I9qdykeNUSv-Its02ApH)uHT zYf@Z>@dg)FTD~bM->RgEdVi!*rZ2;89P@~hO;;IvU)pYyl+x{Txh!9`5p!|i%F;=@ z(q|ls$PXGNl|h(JhGiFSrZD6O3p>M=2J*TQ*=o4i(Oa{LjRmCX^OZjhv<ME#Xl5De+fGON2k71gM6RP+#a|=o8G)n&ojH$l!7?QQ!zVdbkcc}j;49wy#G3MxAPI6Cib3N`yx=T=Oy2s7x z=P literal 0 HcmV?d00001 From edac53e0f998b10a73a7f389a01ba0ec766276dc Mon Sep 17 00:00:00 2001 From: "koastiebratt@gmail.com" Date: Mon, 28 Sep 2020 17:15:47 -0400 Subject: [PATCH 2/3] 1-8 minus 8's test complete --- .../java/com/dtcc/projects/Classroom.java | 22 +++++++++ src/main/java/com/dtcc/projects/DelTech.java | 21 ++++++++ .../java/com/dtcc/projects/Instructor.java | 5 ++ .../java/com/dtcc/projects/JavaAcademy.java | 23 +++++++++ src/main/java/com/dtcc/projects/Student.java | 4 ++ .../java/com/dtcc/projects/TestClassRoom.java | 23 +++++++++ .../java/com/dtcc/projects/TestDeltech.java | 46 ++++++++++++++++++ .../com/dtcc/projects/TestInstructor.java | 2 +- .../com/dtcc/projects/TestJavaAcademy.java | 48 +++++++++++++++++++ 9 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/dtcc/projects/Classroom.java create mode 100644 src/main/java/com/dtcc/projects/JavaAcademy.java create mode 100644 src/test/java/com/dtcc/projects/TestClassRoom.java create mode 100644 src/test/java/com/dtcc/projects/TestDeltech.java create mode 100644 src/test/java/com/dtcc/projects/TestJavaAcademy.java diff --git a/src/main/java/com/dtcc/projects/Classroom.java b/src/main/java/com/dtcc/projects/Classroom.java new file mode 100644 index 0000000..5194e97 --- /dev/null +++ b/src/main/java/com/dtcc/projects/Classroom.java @@ -0,0 +1,22 @@ +package com.dtcc.projects; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.Map; + +public class Classroom { + + private static ArrayList students = JavaAcademy.getStudents(); + private static ArrayList instructors = DelTech.getInstructors(); + + public static Map getRoster(){ + Map temp_map = new LinkedHashMap<>(); + for(Instructor temp_instructors:instructors) { + temp_map.put(temp_instructors.getName(), "Instructor"); + } + for(Student temp_student:students){ + temp_map.put(temp_student.getName(), "Student"); + } + return temp_map; + } +} diff --git a/src/main/java/com/dtcc/projects/DelTech.java b/src/main/java/com/dtcc/projects/DelTech.java index c69a7ed..0c0a706 100644 --- a/src/main/java/com/dtcc/projects/DelTech.java +++ b/src/main/java/com/dtcc/projects/DelTech.java @@ -1,4 +1,25 @@ package com.dtcc.projects; +import java.util.ArrayList; +import java.util.List; + public class DelTech { + + private static ArrayList instructorList = new ArrayList(); + + static { // static initializer + String[] instructorNames = {"Brian", "Kaleb", "Zan"}; + for (String instructorName : instructorNames) { + Instructor instructor = new Instructor(instructorName); + hire(instructor); + } + } + + public static ArrayList getInstructors(){return instructorList;} + public static void hire(Instructor teacher){ + instructorList.add(teacher); + } + public static void fireStaff(){ + instructorList.clear(); + } } diff --git a/src/main/java/com/dtcc/projects/Instructor.java b/src/main/java/com/dtcc/projects/Instructor.java index ce550b2..4ef027a 100644 --- a/src/main/java/com/dtcc/projects/Instructor.java +++ b/src/main/java/com/dtcc/projects/Instructor.java @@ -2,6 +2,11 @@ public class Instructor extends Person implements Teacher { + public Instructor(){} + + public Instructor(String name){ + this.name = name; + } @Override public void teach(Student student, double numberOfHours) { diff --git a/src/main/java/com/dtcc/projects/JavaAcademy.java b/src/main/java/com/dtcc/projects/JavaAcademy.java new file mode 100644 index 0000000..766fbad --- /dev/null +++ b/src/main/java/com/dtcc/projects/JavaAcademy.java @@ -0,0 +1,23 @@ +package com.dtcc.projects; + +import java.util.ArrayList; + +public class JavaAcademy { + + private static ArrayList studentList = new ArrayList(); + + static { // static initializer + String[] studentNames = { "Jessica", "Emad", "Cedric", "Lolu", "Apoorva", "Vara", "Craig", "Robert", + "Stephen", "Ferdinand", "Charu" }; + for (String studentName : studentNames) { + Student student = new Student(studentName); + studentList.add(student); + } + } + + public static ArrayList getStudents(){return studentList;} + public static void recruitStudent(Student student){studentList.add(student);} + public static void removeStudents(){studentList.clear();} + + +} diff --git a/src/main/java/com/dtcc/projects/Student.java b/src/main/java/com/dtcc/projects/Student.java index ec12a37..c2dba00 100644 --- a/src/main/java/com/dtcc/projects/Student.java +++ b/src/main/java/com/dtcc/projects/Student.java @@ -4,6 +4,10 @@ public class Student extends Person implements Learner { private double totalStudyTime; + public Student(){} + + public Student(String name){this.name = name;} + @Override public void learn(double numberOfHours) { //Increment total study time by val diff --git a/src/test/java/com/dtcc/projects/TestClassRoom.java b/src/test/java/com/dtcc/projects/TestClassRoom.java new file mode 100644 index 0000000..4405818 --- /dev/null +++ b/src/test/java/com/dtcc/projects/TestClassRoom.java @@ -0,0 +1,23 @@ +package com.dtcc.projects; + +import jdk.internal.net.http.common.Pair; +import org.junit.Assert; +import org.junit.Test; + +import java.util.LinkedHashMap; +import java.util.Map; + +public class TestClassRoom { + + @Test + public void rosterTest(){ + + //Teachers: {"Brian", "Kaleb", "Zan"} + //Students: { "Jessica", "Emad", "Cedric", + // "Lolu", "Apoorva", "Vara", + // "Craig", "Robert", "Stephen", + // "Ferdinand", "Charu" } + Map temp_map = Classroom.getRoster(); + + } +} diff --git a/src/test/java/com/dtcc/projects/TestDeltech.java b/src/test/java/com/dtcc/projects/TestDeltech.java new file mode 100644 index 0000000..161b837 --- /dev/null +++ b/src/test/java/com/dtcc/projects/TestDeltech.java @@ -0,0 +1,46 @@ +package com.dtcc.projects; + +import junit.framework.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; + +public class TestDeltech extends DelTech { + + @Before + public void setup(){ + //Fires everyone, blank list for every test + fireStaff(); + } + + @Test + public void testFireStaff(){ + ArrayList temp_list = new ArrayList(); + temp_list = getInstructors(); + Assert.assertEquals(true, temp_list.isEmpty()); + } + + @Test + public void testHireStaff(){ + //All people were fired, hires new overlord Cedric + Instructor cs = new Instructor("Cedric"); + Instructor zn = new Instructor("Zan"); + + //Officially hires him and adds to Instructor roster + hire(cs); + hire(zn); + + //Creates temp test arrayList + ArrayList temp_list = new ArrayList(); + + //Copy + temp_list = getInstructors(); + + String temp_string1 = temp_list.get(0).getName(); + String temp_string2 = temp_list.get(1).getName(); + + Assert.assertEquals("Cedric", temp_string1); + Assert.assertEquals("Zan", temp_string2); + } +} diff --git a/src/test/java/com/dtcc/projects/TestInstructor.java b/src/test/java/com/dtcc/projects/TestInstructor.java index e78743d..66f06de 100644 --- a/src/test/java/com/dtcc/projects/TestInstructor.java +++ b/src/test/java/com/dtcc/projects/TestInstructor.java @@ -19,7 +19,7 @@ public void testImplementation(){ double bookMark1 = cs.getTotalStudyTime(); //Zan teaches student, have to call teacher interface - zc.teach(cs, 2); + zc.teach(cs, 2.0); //Get students study time double bookMark2 = cs.getTotalStudyTime(); diff --git a/src/test/java/com/dtcc/projects/TestJavaAcademy.java b/src/test/java/com/dtcc/projects/TestJavaAcademy.java new file mode 100644 index 0000000..928618c --- /dev/null +++ b/src/test/java/com/dtcc/projects/TestJavaAcademy.java @@ -0,0 +1,48 @@ +package com.dtcc.projects; + +import junit.framework.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; + +public class TestJavaAcademy extends JavaAcademy { + + @Before + public void setup(){ + //Everbody failed! kick them out + removeStudents(); + } + + @Test + public void testRemoveStudents(){ + ArrayList temp_list = new ArrayList(); + temp_list = getStudents(); + Assert.assertEquals(true, temp_list.isEmpty()); + } + + @Test + public void testRecruitStudents(){ + //All people failed, Realized Cedric was star pupil, dropped by mistake + //Add him back to system... Kaleb was a sucky prof and needed lessons /s + Student cs = new Student("Cedric"); + Student kb = new Student("Kaleb"); + + //Officially added back to student roster + recruitStudent(cs); + recruitStudent(kb); + + //Creates temp test arrayList + ArrayList temp_list = new ArrayList(); + + //Copy + temp_list = getStudents(); + + //Get name or else mem location + String temp_string1 = temp_list.get(0).getName(); + String temp_string2 = temp_list.get(1).getName(); + + Assert.assertEquals("Cedric", temp_string1); + Assert.assertEquals("Kaleb", temp_string2); + } +} From 84a778eebe82d435868e517a5a35f9a911891290 Mon Sep 17 00:00:00 2001 From: "koastiebratt@gmail.com" Date: Wed, 30 Sep 2020 12:46:06 -0400 Subject: [PATCH 3/3] Changed from to --- .../java/com/dtcc/projects/Classroom.java | 23 +++++++++-------- .../java/com/dtcc/projects/TestClassRoom.java | 25 +++++++++++-------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/dtcc/projects/Classroom.java b/src/main/java/com/dtcc/projects/Classroom.java index 5194e97..6bec628 100644 --- a/src/main/java/com/dtcc/projects/Classroom.java +++ b/src/main/java/com/dtcc/projects/Classroom.java @@ -1,22 +1,25 @@ package com.dtcc.projects; import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.HashMap; + public class Classroom { private static ArrayList students = JavaAcademy.getStudents(); private static ArrayList instructors = DelTech.getInstructors(); - public static Map getRoster(){ - Map temp_map = new LinkedHashMap<>(); - for(Instructor temp_instructors:instructors) { - temp_map.put(temp_instructors.getName(), "Instructor"); + public static HashMap getRoster(){ + //Adds instructors to class + HashMap roster = new HashMap<>(); + for(Instructor instructor : instructors){ + roster.put(instructor.getName(), instructor); + } + + for(Student student : students){ + roster.put(student.getName(), student); } - for(Student temp_student:students){ - temp_map.put(temp_student.getName(), "Student"); - } - return temp_map; + + return roster; } } diff --git a/src/test/java/com/dtcc/projects/TestClassRoom.java b/src/test/java/com/dtcc/projects/TestClassRoom.java index 4405818..67ff08d 100644 --- a/src/test/java/com/dtcc/projects/TestClassRoom.java +++ b/src/test/java/com/dtcc/projects/TestClassRoom.java @@ -1,23 +1,28 @@ package com.dtcc.projects; -import jdk.internal.net.http.common.Pair; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; public class TestClassRoom { @Test - public void rosterTest(){ + public void testRoster(){ + //gets roster + HashMap clazz = Classroom.getRoster(); - //Teachers: {"Brian", "Kaleb", "Zan"} - //Students: { "Jessica", "Emad", "Cedric", - // "Lolu", "Apoorva", "Vara", - // "Craig", "Robert", "Stephen", - // "Ferdinand", "Charu" } - Map temp_map = Classroom.getRoster(); + for(Instructor instructor: DelTech.getInstructors()){ + //Ensures instructor exists in class + Assert.assertTrue(clazz.containsKey(instructor.getName())); + //Ensure names match + Assert.assertEquals(instructor, clazz.get(instructor.getName())); + } + for(Student student: JavaAcademy.getStudents()){ + Assert.assertTrue(clazz.containsKey(student.getName())); + Assert.assertEquals(student, clazz.get(student.getName())); + } } }