From c70aac941f5770e7ce8e46b50a426d55c265de5c Mon Sep 17 00:00:00 2001 From: Deepankar <61615789+lemecode@users.noreply.github.com> Date: Thu, 24 Sep 2020 20:06:41 +0530 Subject: [PATCH] FSJ0320B001 --- .classpath | 7 +- build/classes/.gitignore | 3 +- build/classes/controller/BusController.class | Bin 1471 -> 3098 bytes .../classes/controller/FlightController.class | Bin 1313 -> 2923 bytes .../classes/controller/HotelController.class | Bin 1315 -> 3103 bytes .../classes/controller/TrainController.class | Bin 1309 -> 2954 bytes src/controller/BusController.java | 7 +- src/controller/FlightController.java | 7 +- src/controller/HotelController.java | 9 +-- src/controller/TrainController.java | 7 +- src/model/Bus.java | 47 ++++++++++++- src/model/Flight.java | 61 +++++++++++++++- src/model/Hotel.java | 65 +++++++++++++++++- src/model/Train.java | 49 ++++++++++++- src/services/Booking.java | 10 ++- src/services/FareCalculator.java | 64 ++++++++++++++++- src/testing/TestBooking.java | 3 +- src/testing/TestBus.java | 4 +- src/testing/TestFareCalculator.java | 3 +- src/testing/TestFlight.java | 3 +- src/testing/TestHotel.java | 3 +- src/testing/TestRunner.java | 4 +- src/testing/TestSuite.java | 4 +- src/testing/TestTrain.java | 2 - 24 files changed, 323 insertions(+), 39 deletions(-) diff --git a/.classpath b/.classpath index 2846539..054d362 100644 --- a/.classpath +++ b/.classpath @@ -8,10 +8,7 @@ - - - - - + + diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 0b6c10d..7c119f6 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,3 +1,4 @@ -/controller/ +/testing/ /model/ /services/ +/controller/ diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class index 59d8dfce65f070de37220d74d77d3703cb9ee8bc..82c83026472ce525039057db73cae0f946776981 100644 GIT binary patch literal 3098 zcma)8S#TW18U9+@-5HHW1}zAC1qK;>NM6}PAa;V*F}5WOFUXS68rjA<811&Ck#}d7 znORv*Ot?w7%zfVpRlL9hP$k*wrwd%+5%KVO!iH5-Oi z>j)o(x=p8632seO*?g!=_rd;2B@ z5`$hz8fe7^69(D^t{8D#Ia;esN&lEVRh9zj5wA!CHqG!o7AC@3ClKf!SLA4!O?9$LLuR1g@rcak7V;plXN3S?LSxxts^9z*uuE z*Nz|IRt>iZ+_2JzHCs)ReGfyP_WU!pUlKU5nh`Nv>ky%_+JwL6*GVI=W0j|?@5qu; z0o|8%4FanjSbHe8MW&USQnh83u{E)h_otJcnrfNZWwkmau z@Q$)b_z`1A6*0$H5qk5AeRorxT@0j69}N_6kA`C_??}W{6O%a3kO_ueWrjB3HTr6muGGL>qVQT4Wg-%6U zQGFVsqb5pV!AeGH5U`pPJ2-3m1w|RR$O2No%qvglG|bSY3JYRcRbm6va8y;C6X@^F z=j&&hZ|P;V^i8URWfK*Z%?*JJN4>G>@j4CEl4qi-mUJ#n(Cf$$Aq-SmFes$$W5h@8 zt(lm|8Dd7UijXBC4r-O}eUlo_3T$LIn0JaYu!e144%+2nt!#%L5nR9q^*CqZ0sNLI zPkG*Hy4O3>h&R_aq$<}#iU$uX9t3Dk z_McS+lAcboQmPWky6i@6tdV?n#=L50%hxCNmcf>y0y;j8wp_ud!L2|S64;04tL z@&skwpP@V5vxpnB>E27&*@Dqs+5StoxfRP6($UUq>Cko5x)~WZVr6M(T|;b%y08~N ziL7_yr?`#QI?;v!5_DIMNsgIBdVCQRZ=k(1@%`S^M;NE%L@Y`ESxNR&a&IirbS3GhtkFI(<2v(YsQMa5K8{=zb2` zBEm1RaPk6vJv&20u<-DE7{!EE}GjD87^wIZAT{U+lgo{C?dj}kv%X3VD4 zw?cvYBDV6mm5^;CblcH`9sKQug+8V_%LdkuVeCSl9~1>jPvB;p;)j65Etn%?Ds1&< zum|S|&4WDgB!M|kXkH*FuVO#m!2x_iEuZ5MzQ7>9W>@=$8o$L6d`GR{<4*h)ci~@b zPOUg9OpHd*e@tiz+7k4f#n5wBhu#!|-oHfXufad5n+a delta 147 zcmbOwv7ejk)W2Q(7#J8#7@Rk9-D952%5jiYjDdwgV)AK@SY8LU21X$1&maIK6(Ev8JwiYpP#J?6gE?59k->t&5~zcT Z!4@da#9#+DiVrB~0K|^b42;DLP5|pi5mx{J diff --git a/build/classes/controller/FlightController.class b/build/classes/controller/FlightController.class index 40239610fbc678ebaf66d6731c462039ac68a017..ea3fef41a39fa856eae6ca868f4d2fc23343fc19 100644 GIT binary patch literal 2923 zcma)8*;f-+9R6+y%#aKqQPk1m(z*aqr>#4&ZXlY9prBZ^t(}AmjD}2{nILx8Zg#c% zX&?2a5A91|Q0qB8J$-EblX}{IcP3&8YRi&)=g#l`mhby5`Qz_jeg&`%-)e{ntjxQ` zz;g=)=~;aRXJRtwnLE%B7g%-Pp0;N!UwYF88Ca7+P_mBjV>mhxSj1P3T^Ny`@3_TN z*yvM(jda*3+c=5dsZ+oT3x#6{zdz91)23xMMPbIy4(dASuw&?-b=g zc`7HplXk8k1ycQPo(621;dA9M9!xsEKzsjV0>}u|kGY3sATZR?|M)Gs^eGp_#la1q|EQuxtTV6^Q19G?)U5l^d4hTG_$57dlo7EVoV{I=DGI&}U6M z@{(^k#W6Xv<-A`?q8+O>tP)uNzd|su25SYDOvs=TRIlTg>>xiWJ%Q~J5LUr1PFTZ% z=M*P0oi#x(xRy!cDXiD9PGI$X9~Ouj*no`!+PLdovb`~Z{k6zfV0i@Kb8o9~*1U)u zfsHku)~4fqr2@JqBMkzz4lKM>u|-D5s-Rk1V{AdJ%&&$q_qgi^I-X|CCDs6QK@s+> zfvwmkV3395wr5YtK%u|kk?7AOB!L~+rD3N)YnUz}S=nMBC!}X!H@X>L$@YB7Gl8~; zDb4EG!}QM=Y~RL=a~fhF`(ht{Y(#>DQSfT+-nEYz#xv(tKccuMm4{{_Tv0AwoLEj!~#|s{~Hqr0N`}1cp1Z+2~qzaz9kjV-BnDc8)0h zrwzP-QGsS(1_SQk`0dy7sbxb9jaR@~}tIaPo4A-E1Cg z_X{wzlQWP9D@NmmK9a?rP{F4LhREo+fe9sEPw|tk21j5Sd-1fBm%i0!d$PwaX3(X2iS2BuJ?=Q-EC!0hViuLd*I*{h>OipRrApz@gM=7Tw=f;bQ`VRGewL2Rrh zt`bBQ^!Kx2M8`CXDpEI2mlBx4s~RrPORrwH%)V~mHN4K?r`5a|99KZ~RpexI0ynTdRbvm$ z7!EO6Bn8d$VN}J&UlT`R4n#GMfd zp%p1U#jzMmDAC4!1J|XLRLXKx9_N}$r&ip-6EO^IPH(z{C+qM)b93m{Dl}p>wXF%Y zcSW}<+Ib%x=nO5U(1kQDH1c;7Hi!DRJj`~im7yt5@1;}L9Xu1mZEWA0PG!PiO?J}y zM5hm1a1>8t2+v@Y#7^<8kL`Gs^XdwA;u?10I=b;4_TUDd!;idq8~gA(_Tx_+2+_M4 zVK~Rcy*VcCRhTgF8{Wd(WMV01srM?mTZ5md>nani3pc6lDzjo6?YzUCM&Ii2E^p}c z?n-4hM6ce%`($;LK7PPmg8rUEiC!joa~nRyM~wCcWBVANpov~4!VGA^ry&xte;BZ? oL1<{#@EMoBxj*19_3b!@&nX(i7x3zPCtj4^sIARB`5gN}R#65P2Jy*LI6^t488{ha z7z7z)Cx7Dbh-a_|>R<+9#*ILNiGd$TvN13MNjnAsAgKV61gaMT@_@=1G#E6&@{9~x g4B9{)Obq%!aV7=>216jt2b41cV&iBA#$pB&0QX-K_W%F@ diff --git a/build/classes/controller/HotelController.class b/build/classes/controller/HotelController.class index 9738d37c44afeebfb6bb8132bcc489e94f3b93ae..e8511d906b5a8395a4f94044b407c27eb88cee3a 100644 GIT binary patch literal 3103 zcma)8+jAS$9sZ6id8O6b#v*|zB#?wAu_BVC#n{F+P6MUQT0XXwNV{V9 z$VqyoZJ;f^5qgDQptMtlCt4ny1ZFzzD}CwU*S*f~x zhL4$OLEsKGVKkLj_r9fufD^r0(HGFR_#?^8q5ZE!kx%~x!#De#@ zR07jOS^r6eFp9o*!zFEU||<_3v5}Es_9g* z64V`4UY5SV(Fh2;>bOhxjPfh)QX$vn^tx+>H15Y<10NH(uhWKgM=k8begR|A^DjC6 zg22gc)Phb$b%5dn)VOgX+&lS-q%Z&UO;2r+RCpD^&Sz+f0IAz39? z$tCGqcm%`rukQGP*DGQ>awHZr3=v?D#X9Ah*o42r;ueZx@naL5Piv zni$7~fhSosZu=Dlp@m6I5l;$os?6&SrzYnw$g(Qro=IUEvj%251zZV~tXX&(%*h_F zp&^OPV46)a!WC6Wr&ciWDLiA~+?tP_+ZLY1r!|ZEM%5)gL#5oDzVjKq_1P|))^cag zfFqEuv5Hlr0&3zs%DR{_`e%kpktyx@w!zYdux+@gO*)T73rpJC{y?e;Z*p-e3O&75 zv2a0eCAl?C?gG77wNTS8r1c_WVwN$X*F6h$JRhx(F&q|nfwic~Zx@Y`>cE21S5g!; z>*)&yRs`;58(687Wnhmvz8rO`6H4ag|Fc%Q;K>=6f4(!L)*H)Jr`{*%3)aufYam;am7N17SrsuE|Bsd$AeUA&b!|2K9FZ_H{%jo++ZvRux14ZkeMD!NN=>H2y&q@~b|>4vL) zn5zU8f;-~6o^ryT$%Ym}aQoxJX>HnP<$SXh(A;#xuTD9NCDf(Ay>^H)c7y4zzbUXC z3G{L__!dKwtF#SiJ}s^s<|sHO4qQjy@4_Pke40E8UX9}(+`*X@9l{_oe2e2wY~hKm zocD6P3)@0r^AsNES|*>_eiJ)lm^he!;3oF;;I`!c(5ziZ(ZoUQ38f#1ZZ)OzK8BDB zHD+)Cd1^@U_W>LXdJv#INtA5Le}JSnqjePB78*5@yBNUp-=kXnWR0UGD7E*PvH=|i;bu7AZGCp&XM=?++D^|mbiy;m3{MN4C5M4{{+YJ1|G$4 z@EG33N#ZzyKTyJl7{y=M2>*`L_=qh}gZ)+nd5gGPE#hu9iL>xGd=IaXxV!LYO1?&_ zci~Ss!C8W5{zwhi7(_>KojR^DN(=ZcUd8uG=PA5{A8?kU-97jrrI@t*)#mIfi~I}t z5hM9s%Kb6zwrJ~NyoT4&M=Q-RUEc`;A+BA*V+? zgFR3oGY~Uw1QJXP{6Lb8fe}c$F$e%j1&Ab2y%3NGRK}pepb3^|WYA*J2I^p9&8-MGnfDXC#(;k diff --git a/build/classes/controller/TrainController.class b/build/classes/controller/TrainController.class index 167c49557346d52c778488cb5592000d897d146d..72c29862546ec983c793d876de437d8047ea9f8f 100644 GIT binary patch literal 2954 zcma)8OLP-e82)aWWTxp*ZJg*w6vwg0OD(sUfLja!q}anqOHWI+bzSP&G=-5iF?1cB>$WLt%- z^nBZO?#=WFh`R;mkdGf&PLQ<J>yxr3AbXIhT8;|OxIz?RRhbhLO?t0ddDnpMBuJ^8Cc!jBe?#VI-fqDgIKB~x~M@MR)T3RP;hOLaR_=r2``hkwyX>*Y& zz*tZYTW4TBHV7E>!l30@6EaZfFP|0tX%0zX6YkKkS)e5hm(W=mCy=AkGq44nw6AD+ zz9dbc^;%3bI<_+WnMA>u4rW^$ReKQE-^oZJGA0def(l_ROMYR>uIvTKTmJ?8UH# zq3Ozn0cv0$?j_cY0;|BBpJwntZd~Srbo+fe_J^F-={OiJ*6TP#2pre3@(DbEhcrBR zMft#CXUKPS(uFC#Pkby`DSplO12tWYkY3FJVg z2^11rH+mmD5xWyM?=)xS478vtMFCC z9m?H`c+`LgLZy+YEM$GD7*(fxdsah9;6@hlNjoonv)A%uw^hiO3Rd8H2?S_X!*K&A z@Cet%I^y3#au}#v7#2)O7*D$=ZY^G z6{iInLvDwuPXcG~jE1MD#YT@?VmC1GES{sCld8)M5bxHuo{E=3yvw)JI$mI}s4KA{ z|17JmDzj`nPS|v+h_jDnRP(9Hm2$l#3L_z=F;6*xcC*oWR}-fWV)nvmVDY&!N+8uY z3+gN^g4sA{II!|Z_E^PA%S#NqB`+^~ZPgU#)ivuiN=@<{DmhAi*7j|})8#mBV1+G; z{UbExYA?5{hvt5nt5jafj)h<{;mi;rECusPHE%3H3~|mHcM<5MvSy-*qe04g&VqAn z)9Bk$IG~WJhwr1uTl7 ze|5*I3%I2LS2;I_YArz{TV4y*RNPmVUsbsCJ=)M7N=)*sgAy9~S%uXh|25Z=9obDy z=8)Irj-+`3Ya=+1joUkt>2Tc{?MQAbuVP=~&c##M$te|`!aZt^aZW{({ZklxA5AT> zA2!85#dcD%6-xAHMOj74feNMJS4CMs%6%0|NDSlmqv<8~at zS{%YUNXEf9e_l>tBaX3=o#gFPY+7fK#*5g7v)GQ0aVI`wH~O4hrr3HeVka(<+jrQ7 zpRgOhk?SA0J9OwL;dr^~(92baUamOQz%S(d5*>O2e#BP1%n-O4-{TdoV&vL@S9uzz zhF4bO)z!)B>I}ff$?3=9k=45k~oyqG8NVBgOw#=ycLF}a2#lv9R*lR=h2kU?(pEe?-( z2791FW*}zV2qc&o_< 2) { + int o = hotel.getNoOfPersons()/2; + hotel.setOccupancy("%d Double"); + } + + if(checkInDate.isBefore(checkOutDate)) { + totalFare = hotel.getNoOfPersons()*hotel.getRates(); + } + return totalFare; + + + } + + public double book(Flight flight) { + + totalFare = flight.getNoOfPersons()*flight.getRates(); + return totalFare; + } + + public double book(Train train) { + totalFare = train.getNoOfPersons()*train.getRates(); + return totalFare; + + + } + + public double book(Bus bus) { + + totalFare = bus.getNoOfPersons()*bus.getRates(); + return totalFare; + + + } + +} \ No newline at end of file diff --git a/src/testing/TestBooking.java b/src/testing/TestBooking.java index a729b9b..cc436b8 100644 --- a/src/testing/TestBooking.java +++ b/src/testing/TestBooking.java @@ -1,6 +1,5 @@ package testing; -/* Uncomment the below code to test your application import static org.junit.Assert.*; import org.junit.Test; @@ -23,4 +22,4 @@ public void testBookingMethod() { } } } -*/ + diff --git a/src/testing/TestBus.java b/src/testing/TestBus.java index 90df968..b7e6693 100644 --- a/src/testing/TestBus.java +++ b/src/testing/TestBus.java @@ -1,6 +1,5 @@ package testing; -/* Uncomment the below code to test your application import model.Bus; import java.time.LocalDate; @@ -57,7 +56,6 @@ public void testSetDate() { } catch (Exception e) { e.printStackTrace(); } - } +} } -*/ diff --git a/src/testing/TestFareCalculator.java b/src/testing/TestFareCalculator.java index 91dddec..f68768e 100644 --- a/src/testing/TestFareCalculator.java +++ b/src/testing/TestFareCalculator.java @@ -1,6 +1,5 @@ package testing; -/* Uncomment the below code to test your application import static org.junit.Assert.*; @@ -89,4 +88,4 @@ public void testTrainMethod() { } } } -*/ + diff --git a/src/testing/TestFlight.java b/src/testing/TestFlight.java index 90127f6..814b8e3 100644 --- a/src/testing/TestFlight.java +++ b/src/testing/TestFlight.java @@ -1,6 +1,5 @@ package testing; -/* Uncomment the below code to test your application import model.Flight; import java.time.LocalDate; @@ -62,4 +61,4 @@ public void testSetDate() { } } -*/ + diff --git a/src/testing/TestHotel.java b/src/testing/TestHotel.java index 2d3565b..f90b4c2 100644 --- a/src/testing/TestHotel.java +++ b/src/testing/TestHotel.java @@ -1,6 +1,5 @@ package testing; -/* Uncomment the below code to test your application import model.Hotel; import java.time.LocalDate; @@ -62,4 +61,4 @@ public void testSetDate() { } } -*/ + diff --git a/src/testing/TestRunner.java b/src/testing/TestRunner.java index f26d18d..733173b 100644 --- a/src/testing/TestRunner.java +++ b/src/testing/TestRunner.java @@ -1,11 +1,12 @@ package testing; -/* Uncomment the below code to test your application import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.notification.Failure; +import junit.framework.TestSuite; + public class TestRunner { public static void main(String[] args) { Result result = JUnitCore.runClasses(TestSuite.class); @@ -17,4 +18,3 @@ public static void main(String[] args) { System.out.println(result.wasSuccessful()); } } -*/ diff --git a/src/testing/TestSuite.java b/src/testing/TestSuite.java index a48a79e..de6ceae 100644 --- a/src/testing/TestSuite.java +++ b/src/testing/TestSuite.java @@ -1,15 +1,15 @@ package testing; -/* Uncomment the below code to test your application import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; + @RunWith(Suite.class) @SuiteClasses({ TestBooking.class, TestBus.class, TestFareCalculator.class, TestFlight.class, TestHotel.class, TestTrain.class }) public class TestSuite { } -*/ + diff --git a/src/testing/TestTrain.java b/src/testing/TestTrain.java index 688df5c..8c9b8ce 100644 --- a/src/testing/TestTrain.java +++ b/src/testing/TestTrain.java @@ -1,6 +1,5 @@ package testing; -/* Uncomment the below code to test your application import model.Train; import java.time.LocalDate; @@ -64,4 +63,3 @@ public void testSetDate() { } } -*/