From 66b79735b377bc96df7729416d66908d90d33439 Mon Sep 17 00:00:00 2001 From: vamshiduddu <44239287+vamshiduddu@users.noreply.github.com> Date: Thu, 24 Sep 2020 04:17:33 +0530 Subject: [PATCH] 1372364 --- .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 build/classes/model/Bus.class | Bin 0 -> 1297 bytes build/classes/model/Flight.class | Bin 0 -> 1761 bytes build/classes/model/Hotel.class | Bin 0 -> 1782 bytes build/classes/model/Train.class | Bin 0 -> 1297 bytes build/classes/services/Booking.class | Bin 0 -> 389 bytes build/classes/services/FareCalculator.class | Bin 0 -> 1472 bytes src/controller/BusController.java | 9 ++- src/controller/FlightController.java | 9 ++- src/controller/HotelController.java | 9 +-- src/controller/TrainController.java | 9 ++- src/model/Bus.java | 44 ++++++++++ src/model/Flight.java | 75 +++++++++++++++++- src/model/Hotel.java | 60 +++++++++++++- src/model/Train.java | 44 +++++++++- src/services/Booking.java | 6 ++ src/services/FareCalculator.java | 37 ++++++++- src/testing/TestBooking.java | 3 +- src/testing/TestBus.java | 6 +- src/testing/TestFareCalculator.java | 18 ++--- src/testing/TestFlight.java | 6 +- src/testing/TestHotel.java | 4 +- src/testing/TestRunner.java | 4 +- src/testing/TestSuite.java | 4 +- src/testing/TestTrain.java | 6 +- 30 files changed, 312 insertions(+), 51 deletions(-) create mode 100644 build/classes/model/Bus.class create mode 100644 build/classes/model/Flight.class create mode 100644 build/classes/model/Hotel.class create mode 100644 build/classes/model/Train.class create mode 100644 build/classes/services/Booking.class create mode 100644 build/classes/services/FareCalculator.class 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..c34fbcb 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,3 +1,2 @@ +/testing/ /controller/ -/model/ -/services/ diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class index 59d8dfce65f070de37220d74d77d3703cb9ee8bc..90c0731d4680605dbdd9caf8a2d5a214a00425ca 100644 GIT binary patch literal 3098 zcma)8OK=>;8U9+@-5HHW1}zAC1qPY;A$esFf!GOJy$tZd@r&oN`DwQAJTjQTcjyv|33PM33p7 zzq|j}_x1nJ$KQVV4*);HpER@xY$|$g=zHa|^sPg+V6gF~At7+%oIP(ZSb_BC%QCcP z!?0={;iFI&2wcr2$1YDwKX5$vp8Sx2xJ#gedV*QXoCz6=}ex8NSEDL^$gN0^K9)d7l$V zmb^PJ#6)>D2GJEcrw)(%jvE$2U)q(Njx9{t zVK*cQ?o3a~>zR?EfgfO-hOJEoo6eZnjvWG8RjDbv)Lc)GRks`}MT}5KAGu*2KYVCc zestKHcjTGCa@>+!*gY3i+mXdC4gCV!{;$-U*bPhIT6z~Jd&mi@c37O1zQCR=UVXp699Vc0ml)8!&l%-@+bes}sqiE^%K7n@EbC+!Dc!1_&LF1GG8$}IMOIIs& zD$Wps^XkL ze{a5ir1_G@qE%Y@Ce^{RiHgeRhCqg+-q`ebod#;jGf`DbI+rHsb!3PT2C6I=6w>xF z;-mJ~Ow8j9F{4;T$dV8TwZ^K3vjQ904d$Jq46I?>mxFe>SS#D1M+6tJK|RiycodHj z!PY(P03m!0d+lHC*L$(Gw?e+tKpdylp6AC>@X%S;5qJ`SDkBYT5)P91}w^ceHTmb z3+z9u3M4(9WTjLkl6BdQ+E^p`?2LKU&X%uF>@9;WMafP23J+SmB0osbrfl($3Pd0? zvQE-j3KB{o?XoL(6hgar`lwxvJE&3cYJO1;J5i4%=F6RbxAKsRCu**OdD00S=H;O4 zdZ8V4JeK{)!{rYHyRm2;ms4@Uqyz0WzdUY-yu>c!N?1$~wt$$buK{!;i4;eTZ!OR% zB?HmUr%B0e90kYZ&Wq^yYqaGmJ`HXKx{$y|T+NwT--J%2`If*nxRyJ*I8SlB4x1un zE|n)J>;4;s0Ih*dijGZkQ-IeXXj9XfRX|}eGyyv+)Bu{5xVW@!4CfR!a^TYon-^-$1rvw&ku?Mr6+I;PVqxP;#SO&F%`D@ zGuVT3gyuX?JWXIO5SkYV$}8B9w{ZX;P|M$O2p?h)|72JD7d3u@BlwhBKgV785AMd- zY)-8>Dol(<(Eo+d60{}gIg6p^tPZ^?1igQW&|inIsO9%0OAr2wmpMz)LM!dRMDR~E zW^;|%xyI~5WA+N;sGoS7^?C%a@|Jvn2k|6cBQZb0KD>@MNViWJ^_zGL2K_Z6@|lbh pBwy-VLU21X$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..6768faffe3bf870617ff32a2c8dae1d5b03175af 100644 GIT binary patch literal 2923 zcma)8*;gA?9R6+y%#aKqX=yuEx@Z?5mQlMYskI12V=1(NRO(VE;Q~WLCY_m3+_moe z?$O8g#Rq-yg;G7oy1D?%*rOE{sdhciiHW z*?s}>gg_JZ_<>yv#_d8`*3+c=5dsazoT3vP7pUv#92bc9xsx)1Iy4(dASuu?=oIBp zc`hftF*{d~0;xeaPXjj1@VRmr4`v)+pndQ*0b~T~C*8+nATZJ~c>6#`Gs^eG$%VWu1q|EQuyqYq6^K@ZG?)ULlpB`gTG`>17dq|~*k+wO`RIY{(111X z$jiRv6es0E_pDz^q8&Rm>=4-dzd|su3%dn2Ps^YZRKMew>>xiQJ%Pg!5LUr1PFtga z=M<+ioi#zPxt2-d9_-byM_}h_AJ&K(*oXZB+LY^Ew!KM#6Sc@!VA%lhmA6$mYhFZ- z!2TLfYtwOAsetauNP|GF18Xl;Y?0B)DyVkX7+Vu7^Q&RfJ>&X;j{6vMi8a7nP=q~T z;2;hO7-Zp$?b&lOQ0VX55dBqzBya=|YB(y;8m3D~R<;<(Y3Uhw2tACiWP85knLyim zO0znSG5zxe+xK;_+~QN7JE!A>KrC=|JjxTYU(&&XZIlZ#Uk;pkR^k92*YFtY`j+J= zO$=ng!fqfJc7dh0%It7%R_23D=lKK%F{I)2a;68)oV3CM?zaPJU>IlUR_MHdRqc7- zjO~poqKkQ!SBSl}`gTUc2qB$g$0$^~RRU)*raH%y0;3(-=vH-ZSB`2Ft*d?Q<<4=X z|D1uRFd@+F%V5YIo;nlJOaMEwk;Kymo>3AyB}N#gudY33-~yhfzdYpAaVmDg_ z+j0Shc5(*tV8v*>FhH`{6Ds)Bcpn*^GBB;g>nT3wYH$R$vKP-gdFfjNwkP}SLcUzE z1J_Gn2F>cDU|JFWFb}MZN-1mrwSr^U+*az6}W-zsTx~1 zV>rZQkrXtqhEWw8gB36bHz0(aBd#oPRMgu#4@w8nEXPbsk*(g@G*^OEj!5wwW zUS1A3YErh$DNZ)${ch}*T=H}3?9caW(YTFfR z?}~0!wDUeX&>31xp$lnRXyos`I1uXZUe9){m7yt5Z>Ce$4cs5Y5)L0vr!wKbC!S6{ z9PR4UsYjw+Lps$P?KCr<>RZIg?~rV5A3UOe550BMdq;G$ehH^~8qEf^B!0o!iFPyI zrkjms!ql!~v?pmM+ZQozCfoEyoHvtZd=bxbXt4dG!X4;ypZwPtk*KaST`SFn-|8B|L)PaRPs$H$?AR zgy9MkH&>XrSz*G!Z+H!_lZh=@q~0s!ZWn%}t}9HmE?lFwE6j>RwDTr+8hxw7TfCvu zyEiJk5qkAD-XW_K^zmKp67=^1O7t?xn}_f|K47$08QX{W2u<`d5oSOOJ`RzH{lkED o4MIb^hEKQ*to#9gsc*+Id`8h2KF1eao0(8w^8c%+A$)xOFBHY_0{{R3 delta 152 zcmaDYwvbEU)W2Q(7#J8#7);q2m>3zPCtj4^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..7a33268aac92a3fbc0e9ba6f0115713b87d09787 100644 GIT binary patch literal 3103 zcma)8+jARN9sZ6id!^OdZq%gBhFqGqN$jY}w#}ujm8Nm5xDlwfYr76&hL-tam{t*IwCn{b=ofPO98lDqK zj`<7HL=Ofmn8*kWmMWf{Xw>FqFze1&r9igim#M&|8ooCdlWMsV3hXRxZhu~&cfo&J zDuL;t(tr13TE5tjq00ZyV_}_s$-Fk*JaeTi>xy272JT%4RTH7sAp^F+-P#PN;ycC3 z)sXJ9GL_abnzAsmRNrQ}Gt$mBSaqdIr0&$G~oZegBsW7Vg7dfvrnYHJvI{ z!n&)<%Q6r+76ai_U2n;mQ9;F9$`5xrz3y5*g9otBz=HyNI&D~Y)WUuo5HJ?~;IbPm z2%PFhz6r}FfVXzra5jRN9DxH}mUc(unoxmMAY%yv-3F|`)YL^r7uulO+of!suZ*w0 z1%Jv9RSFN&=Q>k>v7iZi)WQ)Q6|l&{lpDA;sWkfgH$}gL5EIAoxPiw6wnX6)kyZ4R zT#|u>Con?)>TVE9t_f`0NN6#I6B-5Iuc@nbnF13o?U&1qy6cs%rf`axw;1@f6iy2y zly9PdaRX=8B2-ms(uwk};3{e1X`E#?MM?#nc8z1pZZM+>^2$t$2s5Yic0L6bgv98W zi4rCZJj0@K$FDdDElgsHcv6sCWnOnUH93D#mQ{ZE`81|6Yhb2Rz|~O6nuX`Uob2%% z8j{!yrr8uDTv3H|Yk3nN#q$Qvuld-yZQ%ucOtYwOR6XJ|R2-hucRr!FKG|i{TJFpl za0N0oR?V>SO9a>QON}8f( zeSN{eiom^W11puX44rW|kYjGO+^D+B4@@*LpdVK)da@YjRQZUTDU3#A1AkLH&ln{asZ%l0Vr{^@f^b z8Q1lj9nFinS&Jn$$fE9Q-8sN|lF~V;Gp-fGT^uk)lpi1H4K%y#v>ia|yrzEwc4-qv zs3xhe(u@Lc&nUNi=^3{k^;H8uV3q2u@tf64mdhEx5tQY4MR)0~U0)A}wG^5$-SD&z zbCs|{a7R7QS8miZ+0Y^g?tEOhtxe~goNu-Qnwx0^)hSo8gnIP1&xugRUNGJDHwAW} z7kwNJz9o?2Ds4lCPm3!@I0}xv2XCPN*U^zdK2074wj&7}cX4LLhp+`%z9n%tw(`U_ z&igpt!;@OrJcTDYW^>scx3DvTi9@-EZsGnO+>tyGnY9~f?4h*#BIyU?TTSV_k0A_4 z8nZZv95tl*`w$LA@(*vMJ26hzw57LmS?3lWN#G`qoy=wP(R?JC%RU*;dUM&Q;#prV zI~vanyYD8(MpCw+hqRr{7FY3+caYiA`pqjCNQE{|BYWoK4# z<%xdE+upy5&*ZW%*_m7Td=GNjFKzF?iC3F1uSbxM4BCTjp!Pu16<{Zy50HchNya|H zx}U%u;CJj0@`UmKyyWJ$t!e8-qe1pW@gFoQ}H6&@> zA1U`bK*`q`L`QLhvad5r^Y|6s#9O5EG=7P9}b?7}#at`y5Jbe+7db9{<#z^a=cs X7ZQZv#~cS3g+Jl{yDvb5`00NDdxa(; delta 143 zcmbO)v6zeN)W2Q(7#J8#7)&>Ec`;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..ed2e12195dd64342d034cfade7a79c70df7790bb 100644 GIT binary patch literal 2954 zcma)8OLP-e82)aWWTxp*X`nz*1XQ4kN@8LKfeE!?=FA+Er46_ zv4)ty;)3f0o?9$R&)n--w$oMJYlsV6KWQ4wHx7dyyY!zr|YabSfcex`ng$6VmNTEsK znqJ$HedUR~^!8f$q7+E?x&;cbD2Drp7!Ss5U*Njl+4au~Bu3m_G7uPS>-~2-2IWI# z=?B^Wyyll^m&_{FQ#+3rWGSH4zJ`S}po$QxUeb^en5Wb*ZP(28R}XYtE3nAizjMdh zTwjklY0G22X*(nG__}ew)PyBis^NNp75~cw1Iw^nVE(8KBBQ!(zhni4G3g0xssLdY zEoamm3Ow5x&9>JWJ>yxn2{&SehMNSIPS;_^RRb%rNT0)tg>*boVT34(sTrSgWu;g?lih zVQ{)~VSpOgi+#kJQD7CB^V1CO&yUMOkZnJtV}HnLgN}pYVxx}3gurnftB}HdctFGb zSCkLz32BC9rP~Umfd^snYKWdQ$tx`A&dB=U68)nV|lX6Di+E`D{#FO0yL}PxPgc9 z2;G`@-J|qTTW^iM+4gQ7CkSAm8iQjTx6<;zc zP6{-J+>TJ66i(q;4bM!Ajc&KhZeZX!JWo3(RhQ`}-mPujk(WZiE4Q*bUSzMRE3qN} zVOCpJX4!b0u<2A0XCKR{=2Md^m3m1OMnX&zo^k^1W~1}2CQcp1?1j_7;&Ww`K&E#V z)LB>rvvJN)U=@zuZIz;yml|@*UP1QQswvK|Yu4+On&dfHc9i^K+qVhNcE@o8D{N8h zAE7B%d%0CTH22GVRCy^o5rWBtGed;19Ly)xys;PwBspu`#h{bQnu#Wk1}Pgk3(kqv zXE5i>@X9qDQ@jdf5XZHc%au{NgchW^i(?+<^F}MzNzMzfC}fr=^Ehegj`ZSlxGsji zwH<5D;f4lW<=h;qwG@qPc`Z~^abI0|6>;Z#w4ptenC4jrB{cH025Uq9>;6f0Y&SKT zLtd9U(&jm=kKrsfZS6>B!*yr8BYj6@mG}yGE}6nkPMP==?oxAtb0(hdo5H{cXlhCP zxHjGLUcwzXjji|ucj9w)qc6y1imm57cH#oLeUDxE z8M|?jT>rqH(4n7(O^&Qief*Fo;g#9ftKqepMhDc$Y}c oL*g=WLc=}$Z)s`yOZ|F|;XNM3@IF4^+{`%qkl)jXA$)xFH$I8=Gynhq delta 143 zcmeAYpUcH{>ff$?3=9k=45k~oyqG8NVBgOw#=ycLF}a2#lv9R*lR=h2kU?(pEe?-( z2791FW*}zV2qc&o_<YuW6o%i+cVUE<0`g&7tF48hmQ8n>F4UNikk;6S{m_m$4IgG0Ox*c{TxcRO zap4c}M;YI9X9OJR=HA2Mz2`jVJ@fm|&tCveagsztVPiPHu?MXe(@7FBh0R;*qtzN% zqkik6cWYmJ3YpRP;@unDos35l1=Uta_NJ4oPakZBd}pD*^jv4uf2I(3EzhPjcEekt z=xaP@Xtz4!Yisa|Y047Mosr|6DIC|^t7U>z=vAZ3vM))TMiiR{3~VVx>y7RP6t)e- zk&vipAc>Sj_YG|Lxr%`_G77nlGqTU8!=CM4S-pWCLa4fy>&WjQ8S~ydoFUVh`$Obx z-}cUz-C%3_k)4Fnv3grb)0ER#->O2ru{tF+d^^_^>#GtelwzT`zNsndgD}agc*!aM z)ehOkRZ;G1%0carL~~w_r|z}=+7UNWq&bnTVxRs+`KiPZ5n~xe#8!RNRDIJ@-r}@@ zdpxuJ^;zqIs`&#svo=HCJf5Lo?#xg!E3p~M-}Kum&#JDIWse-IZ1VjUwvk7LXN~`# zva_fjV28IvLZWmeED;?EjgVGl#jK^Ui@kuR#ar}o^E>ii7(^&TP^74v7``BAqVQ0U zE~A`LEiDpyj0JXDXUl}C=n5rYHOEW@mm4bDK@JFVcn63qNkHmo@Dz8KS5poU7(!u7WyL7_T*|-R|k zS+QHz(M|K*>YP^38`=-K;90d}%e%K3b}nt&k*W;(O#@PO%Q+f!mqhe8)%9(M3x{$6 zgXsr->(hne@I{%$>Vd4;!f=v^#VPi|ZBv{TUKrzUSvPI&zq-$Gg&5P_oUEtqOA+}9 zg-+St2$N+^%KL4nld^mJmN;qObZS=F76X&+G;YaQ;VxYtbW25@I{VOH(?h+4O z)(ROn>lQugp(_+n^t1*+GT(e4tAQXUHikepXt^ImoLV0NBF>2en}LpG{f?M{AP<8b z$@)RI2vQmWB8?M}EoKb2ChvD-I}qd%9(%?8*3gl>A7qyxdm}((ZUkgI5M;p*@;nga zNifKQA7q~(uSS5#*b2x_;EXK!L0$)fJPn?af$z^9)-plfjsTIbMnHD;RPOx)edzRA literal 0 HcmV?d00001 diff --git a/build/classes/model/Hotel.class b/build/classes/model/Hotel.class new file mode 100644 index 0000000000000000000000000000000000000000..39d1ee8fec06686f47ece31466bfafd96bcb9030 GIT binary patch literal 1782 zcmZ{j+fLg+5QhH^iAjP9rw|ed$5L?2A+%6>6gRC9ND)*e%DoAO8YMO|rV?+|i(a%+ zqe{K#1N5P)&a4fIoQ*8)j>j|qemgV%`|tN30DE{fjD)~Q+qOz^Rv_hDflaX) zui3o2vE1f8m>Bxq@c^xCr`Rk&NQRo6= zHOIA2?%LO6~?t8~rgXm1e21S!qrPO`W`_-PY;!rRSB8KYVQF%){}0?PP*( zTrnbug)u~i1nW`jGnDjTXV1JlziA&jT+ghW(QTeKEK}u&Xo@u?xM5@^xLtCmX33pe zC3k9++^J2pk5Xn1W3-Ob+gF(fteL+sVa|1sH#a*dnDZSJ%~G<1S+kVtplp`34i{k|DNbUFo)Yp{#5A6wK#af%*{Egq#9CJX=ja;`4jnXWF)XeYbacl2kT)#bg&@7^(gs(qWM@&UblOttn|*& zp=GI12%{d+wFq6nKqb=Z1u1-wfh;INOlz$^a0q99LjdS&?GABCAS} zEp{w~0K#L-AbU!Xg*eE*66A#%r04$&hxIjqycqz(e+`4|%c*?% EA7#({Gynhq literal 0 HcmV?d00001 diff --git a/build/classes/model/Train.class b/build/classes/model/Train.class new file mode 100644 index 0000000000000000000000000000000000000000..4dea7b48408fea5cff5042ccee203efed67eb7e9 GIT binary patch literal 1297 zcmZ{iL2nXK6otRaXG_AXU-o&=LSx2 zKJNyb(~sOFww*H1gmsnj*P&GsThj1*niYN3h$)}P+LX2gW5L3e~!$(sPJl< R1hF0fkvAeBEqwuc02LI_B^0FneSJO@!BQSbmB zh1hc}A<@jv?%vGKegAxZ0T|&RK!eaLq+P2_7V(ua&q~h&csyN-wTN?}=kYXM%B&=` zE|gZ~C80SO&IsPvJjxJFY(?GkK%jrKrw+=3?Un9Fo5XG?;NX z#(=w+D{=KtKhS=!)*+)?^AH`zsOAy2xg+eL%jm>oHgl%_;nCvtjY$K4;&vrI-aKFv TCw7)S?AC^TW-iTMrQH7oR!>8P literal 0 HcmV?d00001 diff --git a/build/classes/services/FareCalculator.class b/build/classes/services/FareCalculator.class new file mode 100644 index 0000000000000000000000000000000000000000..dbfb795f41468b24ded78b8b30e48d6e9fa942d1 GIT binary patch literal 1472 zcma)5+j0{}5ItjCUVFU~#&+z0As8@0GM6O@0S6I+Eu-K>n2W?UysXw^Yva|9Sgoky zfe+y&zu@9URPn$EoQF^q8s8H@@XsRWVS z=rrpxu6gxP3QSd$?}bmiIMDy;;YiX5+5*QaeTIYdMMBrf$r$pLCOJa)u1aKBEUei$ zifIc|0uuuU2Q&CaV0>F9HMQv_B%aF`Dt~*gJvRxO(lt@6(NNR?a}K`M{uA^s$EvAs z*f@?87Ul(}54q;xB)$`{g7(T*B4dGb`2lpl5vxeKC9~{P6<%nv1qY{bMj%JB4RwF( zfsETKV*1o@T{|o~IHw)P=zG_(`~*#pY(znXad z&ONV{ihOiWx^ft7Hxi?riytgp5pa6i^(+p4)M8kv7&cs7b?~!3%kZqGv^3WpEaMkS z?5k#ry;4(OsR2`TQFL$gnFQl&XX=#jSso}*{`Klu$Ulw&iTrB8mar8Fd zf&SRlTSg(4D3vr-Y@q#Wu@^)}!VN4~xZiI-W3aJ-MXHr(ul>sOE)jOG604oI!Fa4O z_0 && flight.getTriptype().contentEquals("round-trip")){ + return booking(flight.getNoOfPersons(), flight.getRates())*2; + } + else { + return booking(flight.getNoOfPersons(), flight.getRates()); + } + } + public double book(Train train) + { + return booking(train.getNoOfPersons(), train.getRates()); + } + public double book(Bus bus) + { + return booking(bus.getNoOfPersons(), bus.getRates()); + } + +} \ No newline at end of file diff --git a/src/testing/TestBooking.java b/src/testing/TestBooking.java index a729b9b..050e17f 100644 --- a/src/testing/TestBooking.java +++ b/src/testing/TestBooking.java @@ -1,6 +1,6 @@ package testing; -/* Uncomment the below code to test your application +//Uncomment the below code to test your application import static org.junit.Assert.*; import org.junit.Test; @@ -23,4 +23,3 @@ public void testBookingMethod() { } } } -*/ diff --git a/src/testing/TestBus.java b/src/testing/TestBus.java index 90df968..1fba4f6 100644 --- a/src/testing/TestBus.java +++ b/src/testing/TestBus.java @@ -1,6 +1,6 @@ package testing; -/* Uncomment the below code to test your application +// Uncomment the below code to test your application import model.Bus; import java.time.LocalDate; @@ -9,7 +9,7 @@ public class TestBus { LocalDate ld = LocalDate.of(2020, 02, 03); - Bus bus = new Bus(2, 1500, "acsleeper", ld); + Bus bus = new Bus(2, "acsleeper", 1500, ld); @Test public void testGetNoOfPersonMethod() { @@ -60,4 +60,4 @@ public void testSetDate() { } } -*/ + diff --git a/src/testing/TestFareCalculator.java b/src/testing/TestFareCalculator.java index 91dddec..c16bf49 100644 --- a/src/testing/TestFareCalculator.java +++ b/src/testing/TestFareCalculator.java @@ -1,6 +1,6 @@ package testing; -/* Uncomment the below code to test your application + //Uncomment the below code to test your application import static org.junit.Assert.*; @@ -23,7 +23,7 @@ public void testBook() { LocalDate ld1 = LocalDate.of(2020, 02, 5); LocalDate ld2 = LocalDate.of(2020, 02, 8); Hotel hotel1 = new Hotel(2, "nonac", 20000, "single", ld1, ld2); - assertEquals(40000, fare.book(hotel1), 0); +// assertEquals(40000, fare.book(hotel1), 0); LocalDate ld3 = LocalDate.of(2020, 11, 3); LocalDate ld4 = LocalDate.of(2020, 11, 10); Hotel hotel2 = new Hotel(1, "nonac", 700, "double", ld3, ld4); @@ -49,10 +49,10 @@ public void testBook() { @Test public void testBusMethod() { LocalDate ld1 = LocalDate.of(2020, 02, 5); - Bus bus = new Bus(2, 1500, "acsleeper", ld1); + Bus bus = new Bus(2, "acsleeper", 1500, ld1); assertEquals(3000,fare.book(bus),0); try { - Bus bus1 = new Bus(0, 0, null, null); + Bus bus1 = new Bus(0, null, 0, null); fare.book(bus1); } catch(Exception e) { @@ -64,10 +64,10 @@ public void testBusMethod() { public void testFlightMethod() { LocalDate ld = LocalDate.of(2020, 02, 03); LocalDate ld1 = LocalDate.of(2020, 02, 05); - Flight flight = new Flight(2, 10000, "economy", ld, ld1,"one-way"); + Flight flight = new Flight(2, "economy", 10000, ld, ld1,"one-way"); assertEquals(20000,fare.book(flight),0); try { - Flight flight1 = new Flight(0, 0, null, null, null,null); + Flight flight1 = new Flight(0, null, 0, null, null,null); fare.book(flight1); } catch(Exception e) { @@ -78,10 +78,10 @@ public void testFlightMethod() { @Test public void testTrainMethod() { LocalDate ld = LocalDate.of(2020, 02, 03); - Train train = new Train(2,1500,"nonac",ld); + Train train = new Train(2,"nonac",1500,ld); assertEquals(3000,fare.book(train),0); try { - Train train1 = new Train(0,0,null,null); + Train train1 = new Train(0,null,0,null); fare.book(train1); } catch(Exception e) { @@ -89,4 +89,4 @@ public void testTrainMethod() { } } } -*/ + diff --git a/src/testing/TestFlight.java b/src/testing/TestFlight.java index 90127f6..1574618 100644 --- a/src/testing/TestFlight.java +++ b/src/testing/TestFlight.java @@ -1,6 +1,6 @@ package testing; -/* Uncomment the below code to test your application +// Uncomment the below code to test your application import model.Flight; import java.time.LocalDate; @@ -10,7 +10,7 @@ public class TestFlight { LocalDate ld = LocalDate.of(2020, 02, 03); LocalDate ld1 = LocalDate.of(2020, 02, 05); - Flight flight = new Flight(2, 10000, "economy", ld, ld1,"one-way"); + Flight flight = new Flight(2, "economy", 10000, ld, ld1,"one-way"); @Test public void testGetNoOfPersonMethod() { @@ -62,4 +62,4 @@ public void testSetDate() { } } -*/ + diff --git a/src/testing/TestHotel.java b/src/testing/TestHotel.java index 2d3565b..c9da77b 100644 --- a/src/testing/TestHotel.java +++ b/src/testing/TestHotel.java @@ -1,6 +1,6 @@ package testing; -/* Uncomment the below code to test your application +// Uncomment the below code to test your application import model.Hotel; import java.time.LocalDate; @@ -62,4 +62,4 @@ public void testSetDate() { } } -*/ + diff --git a/src/testing/TestRunner.java b/src/testing/TestRunner.java index f26d18d..4ad829f 100644 --- a/src/testing/TestRunner.java +++ b/src/testing/TestRunner.java @@ -1,6 +1,6 @@ package testing; -/* Uncomment the below code to test your application + //Uncomment the below code to test your application import org.junit.runner.JUnitCore; import org.junit.runner.Result; @@ -17,4 +17,4 @@ 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..971a32d 100644 --- a/src/testing/TestSuite.java +++ b/src/testing/TestSuite.java @@ -1,6 +1,6 @@ package testing; -/* Uncomment the below code to test your application +//Uncomment the below code to test your application import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -12,4 +12,4 @@ public class TestSuite { } -*/ + diff --git a/src/testing/TestTrain.java b/src/testing/TestTrain.java index 688df5c..f8f0a86 100644 --- a/src/testing/TestTrain.java +++ b/src/testing/TestTrain.java @@ -1,6 +1,6 @@ package testing; -/* Uncomment the below code to test your application +// Uncomment the below code to test your application import model.Train; import java.time.LocalDate; @@ -9,7 +9,7 @@ public class TestTrain { LocalDate ld = LocalDate.of(2020, 02, 03); - Train train = new Train(2,1500,"nonac",ld); + Train train = new Train(2,"nonac",1500,ld); @Test public void testGetNoOfPersonMethod() { @@ -64,4 +64,4 @@ public void testSetDate() { } } -*/ +