From 21bf7de24731e06a4f3010886e7335f039f62a62 Mon Sep 17 00:00:00 2001
From: Al Taaj Kautsar Supangkat <al.taaj@ui.ac.id>
Date: Mon, 7 Jun 2021 08:39:50 +0700
Subject: [PATCH] Completing the timetableListTest and assignmentListTest
---
Timetable.csv | 10 +++
.../test/repository/AssignmentListTest.class | Bin 2877 -> 3184 bytes
.../java/repository/AssignmentListTest.java | 9 ++-
.../java/repository/TimetableListTest.java | 72 +++++++++++++++++-
4 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/Timetable.csv b/Timetable.csv
index ade1188..2388723 100644
--- a/Timetable.csv
+++ b/Timetable.csv
@@ -1 +1,11 @@
st,t1,rpl
+null,test,RPL
+null,test,RPL,RPL
+null,test,RPL,RPL,RPL
+null,test,RPL,RPL,RPL,RPL
+null,test,RPL,RPL,RPL,RPL,RPL
+null,test,RPL
+null,test,RPL,RPL
+null,test,RPL,RPL,RPL
+null,test,RPL,RPL,RPL,RPL
+null,test,RPL,RPL,RPL,RPL,RPL
diff --git a/build/classes/java/test/repository/AssignmentListTest.class b/build/classes/java/test/repository/AssignmentListTest.class
index 126c180935a921f2500f8b9bd9f3101196c03136..1c1a174f0b7f19721c80518b27aac6022d84330c 100644
GIT binary patch
delta 1249
zcmdlh_CbQ{)W2Q(7#J9=8G1Kzc{3YvF=#Vb^Dx*j*fKKkrl*!T78hrx=jEp6l`t~c
zY4~I%mL=-vB<7{-2bUCO=A~O}`b<`2)R4F4VvuC8=V5SQaAaf<MA7G$n43CzH;bf-
zDT6Z)gA0QtBLh!jadB!<iECkLVootPgByc8JA(%ggC~R6<RoS#2_KL$Uq%L24Np(a
zFp!J<c^Cp10w=F#c4Z8n{E=CLBZwiChk=zLY_cGW0$T(RLnK4gWOEh`wiq6UScbUC
zsVwS@36pzSWaW~07?MG5;wZ_7xR{F}l_8CtA)SXIgTZm~eHNL?tgK7LL{XgVlUZC6
zl3H9cc?IhXRTLSJC?kUqMmTJ?VPj@w?40btZphNj$e=X&7@N}M>Fnm*91M&MtPE@n
zj0{<mZ?bFXXEQJ`@G&qmFffQRurP=-a5G3S<S;NW@GvkkFffQS<TB(jfIvP28v_$V
z)?@<?HEV<(Sq5$fIR+61c_cleP(1|<3}AZ-LE0ILp!z3rXw`%C3o)=TFfb@H@Gz(_
z2s5ZMNHC~@%@AW?Vqjp9gqk7Dz{XI_P{P2-PzrSuM5K&?kpX6YIoSLPi1`c*4Dk%i
zU^C=5F{lYCXl-GT*~Xv+W^ZG#+Qwk#Q!k{Ty@SDNBLf2i69d96S`0i4+6)p5It+3Q
zx=3!3hq^_Aft^8-p%TO9D!9#649wt=)Y-(KwvEAHCxa^^gALebge$f&7}SF$Y^7Ne
zWOgukBb*_|z{<eDV93D3V8kH7V9cPxV8WoyU<!7M0>ogbQ+OB@7^)d+7#JB;7&sVe
z8EP1q(1N25?x+r^qs-tAnY^EqyB_K^h{ODl9BeDil7i|kDF!wM1_nz89tJB02?lEh
zB?cP?JqB9_QwBREx0ylRCcz*Fb(<azx79PSG1N0LWHB%>G&3-R)0ypVhM-8TEexXD
z8A5h2gu|T*i8+YtwlPEt#e>vrV@TY_kg|ipNoxxO?+%7=L<lM|a4;}1I5F@sI5S8w
zxG<<OxH9N4xG@+pxH6bBxHH%=cz|8Z!%zxJ-L_CCBc~(|h6Zq|1-VWcoQ@b6xOX#X
zM{Z}x+{~Z`vWpR%Xh2zrfkBLcnV}J!kea|Tz{|kM(9FQd(2~l~%FxEp&cMLH#lXnW
L!O+Ff;~)tDFaXhY
delta 988
zcmew$u~&@i)W2Q(7#J9=8Jah8c{B5JGgvd&urt{5FxWBJPv&M(Qg`HGaAI&~WZ+3G
zE>0~faV;!O%qeDMVAb&S)C}Wd&}MMuVQ^z`pX|!ws_4ncAe@z0mZ+bZuOCp9nO72A
zQk0sQ%f;Zq;LXFp%HT73HH!k99}j~+L%`&VEE;S<JPg4MA(Q{Js56F5R%ewJjNoC2
zWQby9;3&xtE-A{)OP_p>SyDfSA(ovXj)x&0Bqad0Atx~}T_2)^k%6V8C^MIf!IU8p
z<XFqeHLS}gTeD4@{EO{BOFbil&g2GmrOEOfJS>fj3`$^5Acr|OI|CyFD+3z?BSZ4!
z$s8K`DGUq@d<@JC3=E<SEDYid+zb*7sSFGZJPeEs3=HB7X$<KMAdtbp#=yjoJoy!e
z8e__2K~7<Hgep;}s!Rq3u*q2<4Gcz59p0Q;^&ne>7+4q>7?c@!7*rU98B`f07}UTv
zi7_xSFfd3$%@Af_W5{O6VPIs)g}MSFlE=Wv05d-yY<>a6d<F)FDh6h-4|Fy$sBL2~
z*vVkU$Y8UHK}|?OYYT(SHU_Q9xm+9>R*Vd`(kuxwI~W``GB7YOF@PK;#=y$Jz@Wvz
z!=TL|!JxyS!l28b&7cQ%m;%I5sKa;|6c`E_iWnFfR2VoIiW!O+n9v+l0&&pfyIczO
zP!~Y#cR_NOtu#vtsuQFb*cccXj2L(rj2R>tOc<0HOd0eT%ot1=%#oa726cu6gB;Wu
zdN`a>%D~1@&%}_-z`)SVzzmK?+uaNvky=|AM7J||?O^al4w_92Y7p0LV+a%q1*zG_
z5WbBedIv*-))ofd9SpvRz*1u10OuM$1{($`23rO-20I2F273l020I2*1_uTk21l@q
zc^FDTiN_Y|WaMb$U?>A85s>SY!4c2Ez`dJ6J90Zi(q;xVkX?-6hykTg1_m((W`=Tb
nWL1Czo0ox+p^|}-p(>T3nxTfFmVtqRi-D1$j-i2}$w3kTc5IxF
diff --git a/src/test/java/repository/AssignmentListTest.java b/src/test/java/repository/AssignmentListTest.java
index dfec702..f5f3911 100644
--- a/src/test/java/repository/AssignmentListTest.java
+++ b/src/test/java/repository/AssignmentListTest.java
@@ -31,12 +31,19 @@ public class AssignmentListTest {
}
@Test
- void getAssignmentList(){
+ void getAssignmentListTest(){
assignmentList.addAssignment("name", assignment);
List<Assignment> TestList = assignmentList.getAssignmentList();
assertNotEquals(null, TestList);
}
+ @Test
+ void getAssignmentTest(){
+ assignmentList.addAssignment("name", assignment);
+ String name = assignmentList.getAssignment("name").getAssignmentName();
+ assertEquals("name", name);
+ }
+
@Test
void addAssignmentTest(){
int before = assignmentList.getAssignmentList().size();
diff --git a/src/test/java/repository/TimetableListTest.java b/src/test/java/repository/TimetableListTest.java
index 020cd57..f905da1 100644
--- a/src/test/java/repository/TimetableListTest.java
+++ b/src/test/java/repository/TimetableListTest.java
@@ -1,16 +1,34 @@
package repository;
+import Softeng.Group3.SiJadwal.Main;
+import Softeng.Group3.SiJadwal.actor.RoleType;
import Softeng.Group3.SiJadwal.actor.User;
+import Softeng.Group3.SiJadwal.model.Assignment;
import Softeng.Group3.SiJadwal.model.Timetable;
+import Softeng.Group3.SiJadwal.model.Course;
+import Softeng.Group3.SiJadwal.repository.CourseList;
import Softeng.Group3.SiJadwal.repository.TimetableList;
+import Softeng.Group3.SiJadwal.repository.UserList;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.sql.Time;
+import java.util.ArrayList;
+import java.util.List;
+
import static org.junit.jupiter.api.Assertions.*;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class TimetableListTest {
+ private final PrintStream standardOut = System.out;
+ private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream();
+ private static final List<Course> courses = new ArrayList<>();
+
+
@Test
void getAllTimetableList() {
TimetableList timetableList = new TimetableList();
@@ -21,23 +39,75 @@ class TimetableListTest {
@Test
void getTimetableList() {
TimetableList timetableList = new TimetableList();
- Timetable timetableA = new Timetable();
+ Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+ courses.add(rpl);
+
User A = new User();
+ Timetable timetableA = new Timetable("test", courses, A);
+ timetableList.addTimetable("test", timetableA);
+ assertNotEquals(null, timetableList.getTimetableList(A));
+
}
@Test
void getTimetable() {
+ TimetableList timetableList = new TimetableList();
+ Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+ courses.add(rpl);
+
+ User A = new User();
+ Timetable timetableA = new Timetable("test", courses, A);
+ timetableList.addTimetable("test", timetableA);
+
+ assertEquals("test", timetableList.getTimetable("test", A).getTimetableName());
+
}
@Test
void addTimetable() {
+ TimetableList timetableList = new TimetableList();
+ Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+ courses.add(rpl);
+
+ User A = new User();
+ Timetable timetableA = new Timetable("test", courses, A);
+ int before = timetableList.getTimetableList(A).size();
+ timetableList.addTimetable("test", timetableA);
+ int after = timetableList.getTimetableList(A).size();
+
+ assertEquals(before + 1, after);
}
@Test
void listToString() {
+ System.setOut(new PrintStream(outputStreamCaptor));
+ TimetableList timetableList = new TimetableList();
+ Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+ courses.add(rpl);
+
+ User A = new User();
+ Timetable timetableA = new Timetable("test", courses, A);
+ timetableList.addTimetable("test", timetableA);
+
+
+ timetableList.listToString(timetableList.getTimetableList(A));
+ assertEquals("1. test", outputStreamCaptor.toString().trim());
+ System.setOut(standardOut);
}
@Test
void deleteTimetable() {
+ TimetableList timetableList = new TimetableList();
+ Course rpl = new Course("RPL", "Ade", new Time(500), new Time(1000));
+ courses.add(rpl);
+
+ User A = new User();
+ Timetable timetableA = new Timetable("test", courses, A);
+ timetableList.addTimetable("test", timetableA);
+ int before = timetableList.getTimetableList(A).size();
+ timetableList.deleteTimetable(timetableA);
+ int after = timetableList.getTimetableList(A).size();
+
+ assertEquals(before - 1, after);
}
}
\ No newline at end of file
--
GitLab