From ed2fbc4ac8b902af89d5c35ef6d01f2cf2220bdf Mon Sep 17 00:00:00 2001
From: "surajdesai1297@gmail.com" <suraj@LAPTOP-C83DOH9J.localdomain>
Date: Wed, 9 Sep 2020 22:57:50 +0530
Subject: [PATCH] FSJ0820B107

---
 .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             |   6 +-
 src/controller/FlightController.java          |   8 +-
 src/controller/HotelController.java           |   7 +-
 src/controller/TrainController.java           |   7 +-
 src/model/Bus.java                            |  49 ++++++++++++
 src/model/Flight.java                         |  72 +++++++++++++++++-
 src/model/Hotel.java                          |  72 +++++++++++++++++-
 src/model/Train.java                          |  51 ++++++++++++-
 src/services/Booking.java                     |   7 ++
 src/services/FareCalculator.java              |  30 +++++++-
 src/testing/TestBooking.java                  |   4 +-
 src/testing/TestBus.java                      |   4 +-
 src/testing/TestFareCalculator.java           |   4 +-
 src/testing/TestFlight.java                   |   4 +-
 src/testing/TestHotel.java                    |   4 +-
 src/testing/TestRunner.java                   |   5 +-
 src/testing/TestSuite.java                    |   7 +-
 src/testing/TestTrain.java                    |   4 +-
 24 files changed, 315 insertions(+), 40 deletions(-)

diff --git a/.classpath b/.classpath
index 2846539..054d362 100644
--- a/.classpath
+++ b/.classpath
@@ -8,10 +8,7 @@
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_241">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 0b6c10d..600bb33 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1,3 +1,4 @@
-/controller/
 /model/
 /services/
+/controller/
+/testing/
diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class
index 59d8dfce65f070de37220d74d77d3703cb9ee8bc..8971f0aa019d59d7a9c28a427c0392a06e8369e8 100644
GIT binary patch
literal 3098
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

delta 147
zcmbOwv7ejk)W2Q(7#J8#7@Rk9-D952%5jiYjDdwgV)AK@SY8<h4hC5UK?XSnNe21J
zrkoz}4E8|9%s|Yz5lApG@B>LU21X$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..95e6f978e2d2eb70383232b4d4a021e6bba776c3 100644
GIT binary patch
literal 2923
zcma)8*>@9F9R6;acBaX+rGWwilvV8#U{n^R0R&pA(c0Fw6bo*X^tK&HGjV283a;RW
zEAB@h^~DE$@ug5X$K&x)`I9{AcW2U)rhs<Iy>sVxf6Mp%mi+PeFTVoVkFPbv1UBd0
zV&J)jg7mEZf-^l6^e!K0hzo2zXV2O5mM^`zf()#gAShW+@MAPO5Lm-kj$Ig+p6|HD
zQ`tTN@uWZ#_4t8Z494w3S=Q5}`Vj&Rhn=Dm92KbR>>3w{_qvlZfjTrBNFXWDGT;>D
zV0ktty)ipikOHXzH%|jL&G5N$7!PI~U!Z;99sy(o>L=aDWgsxpIdJblM&!$7=?9tr
z6!S|AOlFktiIekrSqd1ouVKR~tSS&K3u!O~)+#qF$F;IU%P(|n7T9Q=K6zqKcCg=?
zbL0iza*C63e(yQIlteqWY1k@o|NjcXz;^5qST`+$N>F`{U$TSzjPwK!L_k;tyEtu)
z2A)%#&UDoTz3N&fiCwr~!+iqVR{F3?)W8Gi5YVPv?}F`33LL9Nz5>f#0AGGvg|p^G
z<Op=scv_o|OG*WFPevL9Y8_a8sbY(aPF6v+qsG{(Seai9lkTwV2Ra^P%q7+Ub3qaI
zuz`KpFJO>`VcWB3WuVZ1;I8PeAS8i<cvQn90<B@Xgk)ulft;3}fkWtFd?nlSCC>!f
z?xZxU<1o`dU$A{&2g@x!<+-yujtRs9SH}sSko}Sl7Hp%Om-%ww%&`*t@q~uQS=YBM
zM`>ap3l??*xv&c?y%lDMa_3||$aI}aU;u*}o?goIz?qd+SipUDAPo#*m~Ms63s}{j
z_s-bfs3N+UXL*I#TPts8G>j0^S$2#<rCTNN48~OFI3+OJnaxJms+0SUitce(eYa~|
z=|64YSxg8t`!X1Gho*)jnh9WMHj+4N;5j9sQ(}Z+`s&&X242KV^p}UdiiWX^C3dqF
zuq_o}XeVbN4_1uE3;iUEJ)we64GfXdDFf3=yq@A?t_DY71AFnDlb62LZ+o)WF67Gv
zJ8-=OX3(rY3I=9Tq~|%;J<sgw9H<5})77V=M2e@vNuctW>E?qurh+&gFky1#fI)Or
z6IThM3i_pN7}qh!qKec_(WM0DaY@6)73tOImf6=0yn<I5{G6H>LsJT<zDgE^ltfY)
z9j~+N*YwKBz&QJ+YM7iM#c+O9Q6;j>@~{|!kcCv0w-x_MpDKvxeZ8k>RNw}-r)unu
z8N(qai=?1=C5)=r7_5Lfa2G<@IpWF!XC=$8X*96&=byGq;cU}zjg4Yuo4s4hBDkY&
z*~`m*M@`DM+7Z52si7Yu<)X@=amRNE_3>iS4eW4kaj1lm-JbCF@=NQq%vIX4nxr8y
zB*==;#ttxiHPf*P^=RO#@hJwKr}PU+ei}U4$5n8x@4k+vpF@!rekLdiv>}cSSi_wW
z3857!KE<&X>nPF2eFN9^*cd9yQF)wasdQ@7BDTaZxF@}P5j*Q}TXS>h)@C$f3$?X}
z+PkA$745u_PIQG9Q|LyT78?1x8+$_id+%gB*2>V7r?=86YY`8{a03U9rc;@4-xE)#
zjzqiqbn3Ba*N{#fk9L|FPxUU~<hMw+whtWCe}LY)_Ub|1tiOS$dK%3JwIpuhnThr`
z-He-!X2R62W3(q}CfgS<ZYJCG1)MRHW_$t9b7@?F%_Xq_c@r}e*Kw}LFby-gfb)l%
z(ka(WF5=}nq*LXMO*e3%^6*-SSx<}EQiWO_6dySv41RSmNbGv-<Zc&{xsTrzJ8+a}
z^%AdsBJ~t88o^#n;6e71hu9t-#wC(`nUYs=0N3yczTu4e4n6o08G>{ezvBr0q!xwV
z_YsE6Ox#*#;#P$T1Ha)7yh$e3V}W|Fkh|^piTAHC(YmSO7<Ub{_YL0SPNQ#ic$+tL
zdUv_98=+V4;9ashK_B1aE<t}^M2TJ|d2>JB#|Mn|JI3@OK0*_{OoSQGf{*FvF2w#}
qz`6#Zp<Tl#T>6*)fWOqY;}|}rXbhj>bFR%ys4w{c<yi<HU;PW4KJTmm

delta 129
zcmaDYwvbEU)W2Q(7#J8#7);q2m>3zPCtj4^sIASs`5b!=V?2XBP>LCd88-q6CI)^W
z$;QA4B<&akfTRLMl0lF`2*?8}W6)sG1j{orXfbF5bucmL1I3vb3>XZ7G#^mT2#AfN
J85oNhOaM;A4!!^Y

diff --git a/build/classes/controller/HotelController.class b/build/classes/controller/HotelController.class
index 9738d37c44afeebfb6bb8132bcc489e94f3b93ae..e8511d906b5a8395a4f94044b407c27eb88cee3a 100644
GIT binary patch
literal 3103
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
X@Is6byvebjQTR*#zx6CcfM5Lw*^?$?

delta 143
zcmbO)v6zeN)W2Q(7#J8#7)&>Ec`;A+<T%PI$-u%OHCdQ5lvAF8lR<$&kU?>BA*V+?
zgFR3oGY~Uw1QJXP{6Lb8fe}c$F$e%j1&Ab2y%3NGRK}pepb3^|WYA*J2I^p9&<Bb$
XF&Hoy0%<;=oDmQkM>8-MGnfDXC#(;k

diff --git a/build/classes/controller/TrainController.class b/build/classes/controller/TrainController.class
index 167c49557346d52c778488cb5592000d897d146d..94a0f167a652a04526a4c4aede0f46dd9ea0ab91 100644
GIT binary patch
literal 2954
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

delta 143
zcmeAYpUcH{>ff$?3=9k=45k~oyqG8NVBgOw#=ycLF}a2#lv9R*lR=h2kU?(pEe?-(
z2791FW*}zV2qc&o_<<xF10#@hXAl6A3J^)4dLbYWsEk2_K@%*`$e_ib4b;KJpbr#h
XVlZGZ1k!v!IU^u8j%HviW-tK&nuQRr

diff --git a/src/controller/BusController.java b/src/controller/BusController.java
index f1f8372..c2d2956 100644
--- a/src/controller/BusController.java
+++ b/src/controller/BusController.java
@@ -9,6 +9,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import model.*;
+import services.*;
 
 @WebServlet(urlPatterns= {"/bus"})
 public class BusController extends HttpServlet {
@@ -28,7 +30,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*
+
 		
 			int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String bustype=request.getParameter("bustype");
@@ -72,6 +74,6 @@ else if(bustype.equals("nonacsemisleeper")) {
 		request.setAttribute("busfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/busView.jsp");
 		dispatcher.forward(request, response);
-*/	}
+}
 	
 }
diff --git a/src/controller/FlightController.java b/src/controller/FlightController.java
index 7760e3c..2f8e8f4 100644
--- a/src/controller/FlightController.java
+++ b/src/controller/FlightController.java
@@ -9,8 +9,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-
+import model.*;
+import services.*;
 
 @WebServlet("/flight")
 public class FlightController extends HttpServlet {
@@ -29,7 +29,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String classtype=request.getParameter("class");
 		String from=request.getParameter("from");
 		String to=request.getParameter("to");
@@ -59,6 +59,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		request.setAttribute("flightfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/flightView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
 }
diff --git a/src/controller/HotelController.java b/src/controller/HotelController.java
index 0c39e3b..a9a5df0 100644
--- a/src/controller/HotelController.java
+++ b/src/controller/HotelController.java
@@ -10,7 +10,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
+import model.*;
+import services.*;
 
 /*import model.Hotel;
 import services.FareCalculator;*/
@@ -33,7 +34,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+	int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String roomtype=request.getParameter("roomtype");
 		String occupancy=request.getParameter("occupancy");
 		String from=request.getParameter("from");
@@ -67,6 +68,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/hotelOutputView.jsp");
 		dispatcher.forward(request, response);
 	
-*/	}
+	}
 	
 }
diff --git a/src/controller/TrainController.java b/src/controller/TrainController.java
index dcc07df..50ed9be 100644
--- a/src/controller/TrainController.java
+++ b/src/controller/TrainController.java
@@ -9,7 +9,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
+import model.*;
+import services.*;
 
 /**
  * Servlet implementation class TrainController
@@ -31,7 +32,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 	
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+	int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String berth=request.getParameter("berth");
 		String date=request.getParameter("to");
 		System.out.println(numberOfPersons);
@@ -68,6 +69,6 @@ else if(berth.equals("nonac")) {
 		request.setAttribute("trainfare", trainfare);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/trainView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+}
 
 }
diff --git a/src/model/Bus.java b/src/model/Bus.java
index 430ca5d..ef8ba42 100644
--- a/src/model/Bus.java
+++ b/src/model/Bus.java
@@ -1,3 +1,52 @@
 package model;
 
 // Type your code
+import java.time.LocalDate;
+
+public class Bus{
+	private int noOfPersons;
+	private String busType;
+	private int rates;
+	private LocalDate date;
+	
+	public Bus(int noOfPersons, int rates, String busType, LocalDate date){
+		this.noOfPersons = noOfPersons;
+		this.rates = rates;
+		this.busType = busType;
+		this.date = date;
+	}
+
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+
+	public String getBusType() {
+		return busType;
+	}
+
+	public void setBusType(String busType) {
+		this.busType = busType;
+	}
+
+	public int getRates() {
+		return rates;
+	}
+
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+
+	public LocalDate getDate() {
+		return date;
+	}
+
+	public void setDate(LocalDate date) {
+		this.date = date;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/model/Flight.java b/src/model/Flight.java
index 9ac54b5..4652667 100644
--- a/src/model/Flight.java
+++ b/src/model/Flight.java
@@ -1,3 +1,73 @@
 package model;
+import java.time.LocalDate;
 
-//Type your code 
\ No newline at end of file
+//Type your code 
+
+public class Flight{
+	
+	private int noOfPersons;
+	private String classType;
+	private int rates;
+	private LocalDate from;
+	private LocalDate to;
+	private String triptype;
+	
+	public Flight(int noOfPersons,int rates,String classType, LocalDate from,LocalDate to,String triptype) {
+		this.noOfPersons = noOfPersons;
+		this.rates = rates;
+		this.from = from;
+		this.to = to;
+		this.triptype = triptype;
+		this.classType = classType;
+	}
+
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+
+	public String getClassType() {
+		return classType;
+	}
+
+	public void setClassType(String classType) {
+		this.classType = classType;
+	}
+
+	public int getRates() {
+		return rates;
+	}
+
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+
+	public LocalDate getFrom() {
+		return from;
+	}
+
+	public void setFrom(LocalDate from) {
+		this.from = from;
+	}
+
+	public LocalDate getTo() {
+		return to;
+	}
+
+	public void setTo(LocalDate to) {
+		this.to = to;
+	}
+
+	public String getTriptype() {
+		return triptype;
+	}
+
+	public void setTriptype(String triptype) {
+		this.triptype = triptype;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/model/Hotel.java b/src/model/Hotel.java
index b21180d..31b38ae 100644
--- a/src/model/Hotel.java
+++ b/src/model/Hotel.java
@@ -1,2 +1,72 @@
 package model;
-// Type your code
\ No newline at end of file
+// Type your code
+import java.time.LocalDate;
+
+public class Hotel{
+	private int noOfPersons;
+	private String roomType;
+	private int rates;
+	private String occupancy;
+	private LocalDate fromdate;
+	private LocalDate todate;
+	
+	 public Hotel(int noOfPersons, String roomType, int rates,String occupancy,LocalDate fromdate,LocalDate todate) {
+		 this.noOfPersons = noOfPersons;
+		 this.roomType = roomType;
+		 this.rates = rates;
+		 this.occupancy = occupancy;
+		 this.fromdate = fromdate;
+		 this.todate = todate;
+	 }
+
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+
+	public String getRoomType() {
+		return roomType;
+	}
+
+	public void setRoomType(String roomType) {
+		this.roomType = roomType;
+	}
+
+	public int getRates() {
+		return rates;
+	}
+
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+
+	public String getOccupancy() {
+		return occupancy;
+	}
+
+	public void setOccupancy(String occupancy) {
+		this.occupancy = occupancy;
+	}
+
+	public LocalDate getFromdate() {
+		return fromdate;
+	}
+
+	public void setFromdate(LocalDate fromdate) {
+		this.fromdate = fromdate;
+	}
+
+	public LocalDate getTodate() {
+		return todate;
+	}
+
+	public void setTodate(LocalDate todate) {
+		this.todate = todate;
+	}
+	
+	 
+	
+}
diff --git a/src/model/Train.java b/src/model/Train.java
index b21180d..5c2d340 100644
--- a/src/model/Train.java
+++ b/src/model/Train.java
@@ -1,2 +1,51 @@
 package model;
-// Type your code
\ No newline at end of file
+// Type your code
+import java.time.LocalDate;
+
+public class Train{
+	private int noOfPersons;
+	private String berth;
+	private int rates;
+	private LocalDate date;
+	
+	public Train(int noOfPersons, int rates, String berth, LocalDate date) {
+		this.noOfPersons = noOfPersons;
+		this.rates = rates;
+		this.berth = berth;
+		this.date = date;
+	}
+
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+
+	public String getBerth() {
+		return berth;
+	}
+
+	public void setBerth(String berth) {
+		this.berth = berth;
+	}
+
+	public int getRates() {
+		return rates;
+	}
+
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+
+	public LocalDate getDate() {
+		return date;
+	}
+
+	public void setDate(LocalDate date) {
+		this.date = date;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/src/services/Booking.java b/src/services/Booking.java
index fe2c822..ffd1e32 100644
--- a/src/services/Booking.java
+++ b/src/services/Booking.java
@@ -2,3 +2,10 @@
 
 // Type your code
 
+public class Booking{
+	
+	public double booking(int noOfPersons,int rates) {
+		
+		return (double)noOfPersons*rates;
+	}
+}
\ No newline at end of file
diff --git a/src/services/FareCalculator.java b/src/services/FareCalculator.java
index 6d38ab5..af35ea5 100644
--- a/src/services/FareCalculator.java
+++ b/src/services/FareCalculator.java
@@ -1,3 +1,31 @@
 package services;
 
-// Type your code
\ No newline at end of file
+// Type your code
+import model.*;
+
+
+public class FareCalculator extends Booking{
+	
+	public double book(Hotel hotel) {
+		if(hotel.getTodate().isAfter(hotel.getFromdate()))
+			return booking(hotel.getNoOfPersons(), hotel.getRates());
+		return 0;
+	}
+	
+	public double book(Flight flight) {
+		
+		if(flight.getTriptype().contentEquals("one-way"))
+			return booking(flight.getNoOfPersons(), flight.getRates());
+		else if(flight.getTriptype().contentEquals("round trip"))
+			return booking(flight.getNoOfPersons(), flight.getRates())*2;
+		return 0;
+	}
+	
+	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..c674be0 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,4 @@ public void testBookingMethod() {
 		}
 	}
 }
-*/
+
diff --git a/src/testing/TestBus.java b/src/testing/TestBus.java
index 90df968..11c514b 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;
@@ -60,4 +60,4 @@ public void testSetDate() {
 	}
 }
 
-*/
+
diff --git a/src/testing/TestFareCalculator.java b/src/testing/TestFareCalculator.java
index 91dddec..1f50e31 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.*;
 
@@ -89,4 +89,4 @@ public void testTrainMethod() {
 		}
 	}
 }
-*/
+
diff --git a/src/testing/TestFlight.java b/src/testing/TestFlight.java
index 90127f6..71a92de 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;
@@ -62,4 +62,4 @@ public void testSetDate() {
 	}
 }
 
-*/
+
diff --git a/src/testing/TestHotel.java b/src/testing/TestHotel.java
index 2d3565b..32266ae 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..73f13fe 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
+/* Uncomment the below code to test your application */
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 
+
 public class TestRunner {
 	public static void main(String[] args) {
 		Result result = JUnitCore.runClasses(TestSuite.class);
@@ -17,4 +18,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..8427811 100644
--- a/src/testing/TestSuite.java
+++ b/src/testing/TestSuite.java
@@ -1,15 +1,14 @@
 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;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ TestBooking.class, TestBus.class, TestFareCalculator.class, TestFlight.class, TestHotel.class,
-		TestTrain.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..91e5791 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;
@@ -64,4 +64,4 @@ public void testSetDate() {
 	}
 }
 
-*/
+