From 3608038d7a58a0dd99c16ab1bb2019e81fe90a24 Mon Sep 17 00:00:00 2001
From: jwala5 <dubeyshiva98@gmail.com>
Date: Sun, 29 Mar 2020 21:27:02 +0530
Subject: [PATCH] FSJ0320A004

---
 build/classes/.gitignore                      |   1 +
 build/classes/controller/BusController.class  | Bin 1471 -> 1689 bytes
 .../classes/controller/FlightController.class | Bin 1313 -> 1561 bytes
 .../classes/controller/HotelController.class  | Bin 1315 -> 3103 bytes
 .../classes/controller/TrainController.class  | Bin 1309 -> 553 bytes
 src/controller/BusController.java             |   4 +-
 src/controller/FlightController.java          |   4 +-
 src/controller/HotelController.java           |   8 +-
 src/controller/TrainController.java           |  10 +-
 src/model/Bus.java                            |  49 ++++++++++
 src/model/Flight.java                         |  66 ++++++++++++-
 src/model/Hotel.java                          |  65 ++++++++++++-
 src/model/Train.java                          |  65 ++++++++++++-
 src/services/Booking.java                     |  14 +++
 src/services/FareCalculator.java              |  91 +++++++++++++++++-
 src/testing/TestBooking.java                  |   4 +-
 src/testing/TestBus.java                      |   4 +-
 src/testing/TestFareCalculator.java           |   4 +-
 src/testing/TestFlight.java                   |   4 +-
 src/testing/TestHotel.java                    |   3 +-
 src/testing/TestRunner.java                   |   4 +-
 src/testing/TestSuite.java                    |   3 +-
 src/testing/TestTrain.java                    |   4 +-
 23 files changed, 374 insertions(+), 33 deletions(-)

diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 0b6c10d..aa6d612 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1,3 +1,4 @@
 /controller/
 /model/
 /services/
+/testing/
diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class
index 59d8dfce65f070de37220d74d77d3703cb9ee8bc..767d6321e95c040c6aa99434f4debd5d6e89ca69 100644
GIT binary patch
delta 366
zcmdnbJ(HK~)W2Q(7#J8#7(6#}-D9q2XRu>r;Ll1dOVrOv%uCmIEh@?{;$U!KWH=C-
zSCm?upHr5aqL7@QTacNPSdy8ar%+IopOllDTWqDk#pzU9tdN|TmzQ6nkd&$bS6-5@
zkf=~nS&&LlMH*0vTVheFb7D?%DbRxaA_C@-qL_=pmcfaKfr~+X@(bpJtU?Sd3?h@)
zvBdI9FmNzPG6*tA0ZHk}60DxVCJf9#$iTq0o540x$bLJ6<9;BIiGd$TvN13MNm~X1
iAjtz}a{=`Vf#sdSqzi*9kmdu*xdE|zGy`KXg9iX&pkSB)

delta 146
zcmbQqyPuou)W2Q(7#J8#7@Rk9-D947mgOL;7y}D~#N^4WvAi-291OAyf(&vDk__^b
z|FU|<*#p%w12N-9Ai>1I4<y+b7=ffeg8-0JfJg$h2myIOWejEv=3se71`7sDpbjPm
aTc9`-gB=6NC_bQ^0}wk#GcXo2H~|1?_Y#-@

diff --git a/build/classes/controller/FlightController.class b/build/classes/controller/FlightController.class
index 40239610fbc678ebaf66d6731c462039ac68a017..6d9d7b5a4b7cdf8c558db5d4ae46c2839df6c070 100644
GIT binary patch
delta 363
zcmZ3;HIql+)W2Q(7#J8#7;M-Xm>3zPCtj4^sIARh&(2`L$iSbKSeB@tlbDyT?^;xp
zU&O&+#K>?gG_NSNI6tQ>HANvgKer$=C$S_mKTn~cC_gDDHMiJGfs4~ECo?^xL?Jmb
zFE77DAt_Y>uA?MhAyJ{EvLF?|A|zFbMXAn-Imx9!Yx0W-8A*a-E(U!D6CMUG22(}`
z(aDTVB8*|1!<cg!gH0HifslcLYd3>_q>$lu2IKue9uosUkYr<E1d;{}0zi@n%;sVc
cWDo+&n}JDl1`8m~2b8k}VykEd#$pC*0C4qSEC2ui

delta 128
zcmbQqvye;R)W2Q(7#J8#7);q2m>3zPCtj4^sIASsIg%xpG0q++!wkfX8-WB913!>t
zV_*c5b_@bQQUM~#AjlvD<N=j2XfSAk<rx{Y7_@;pm>Bed;!F$%42D3O4=85@#KzGK
IjKvHl0O$4%>Hq)$

diff --git a/build/classes/controller/HotelController.class b/build/classes/controller/HotelController.class
index 9738d37c44afeebfb6bb8132bcc489e94f3b93ae..be4ceeea4e0b50ba1260581f20056bc725fe127a 100644
GIT binary patch
literal 3103
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
Xq(FiY{FvhaqwpvEfBSie5I_A7s*EN=

delta 120
zcmbO)v6zeN)W2Q(7#J8#7)&>Ec`<MH<S1Z_XRrr~Fat5;Mj*k&zz-zZ7#M-18-oCl
zRDeh_2r>u(c|c_h8Vs6Xc}4~;25q1YCI)?=I1_^bgCUUS1Iifzv2ip5V=;pX02we0
AQ~&?~

diff --git a/build/classes/controller/TrainController.class b/build/classes/controller/TrainController.class
index 167c49557346d52c778488cb5592000d897d146d..78f74986aa1aed7dbd7a32062deeab1fd1ed285f 100644
GIT binary patch
literal 553
zcmZ`$&re!G5dIdaz!Sw%y)->cIN5~Ag_9W5l(r{g4^R`2%X<@9Tz1L6g~(rKqKV#{
z_%9jfQKQkMm-+GSH}lQx{C&K+1JK2O1to>gsdq7WYdLgAK^xb9$tx%;>`wJkcdT|7
zo!{drr%_?^*f<kU6gCdNo+*_3KH~~%3XNCp&k%g5VoTxSj|-f8yX1^gKbsq?qw$XB
z!H+G^@*_%W!<CErinu5ud5iv%9kqrWmX>3yP2Y&G<|5A7TXLI>%Q-}9^{vkH?><|#
zq<SqRl}u~+2d7qtwQN!wO_&_#(u(40&h&0+O0{!7(!^v;+7Y|d`rNpSH9JXA#daMZ
zu%oblFnC>f7=w^{#fLNo#_{Q5Hs&zWvZF$C;8ShSbTCE!43^`><O*K~|Gz*_AsPBb
zNcop3`s}?M_OQ?gK~5njg?Pwlo8l`Hbp<Vu<QCQQW^#@Cy<{ac#1<S#v@5p$kA;tD
LN~Z8hYzcc$D#Mzj

literal 1309
zcma)5SyK~15dJ#Xh9q185fC|4<YrXhDV7(Pu~KLOh6kTE$p}L&yK#3C_**_%_}~xl
zM_KkB2Hc3cTRXioeSF>DbbtTx^&5b7Y#2xo#_Nu)UB|MdD-K;#*_)lcffQl#)NGp<
z!jo>>l3JW--4w5RIS3C31FTY}Rh6!%9Q%EFi$HG(y&T8Wrmd@{)sksO^dBN*o+?}E
zXN2VZLY0u(bQ&^;B>D=-Ay4S9C|mBe&T7&<G;5Y56e~`h0ZfMBeRP=8C(0vCRBq0{
zL`XNBU8xEC^Oe8Xu`fThq^C>&H1nEVmn`|I=e95EvZ=Xh&%o_2sv?FuMh3<RLw*`U
zIimcwqsZb8VN@J#zgj8p?TEIL=blh@Ltd<&dd)oUV#>fIVfMdDC}0{hgyCbUqoTHy
z*EDtgM7o5HkO*O!_OUq7uCk9y3$dcR+)8=e$E<+|gsI<i=rS$fA?66iN5?%k-3H-B
zocV~B8wl@cukmcS;pGtKVwuLf@mEkn)|FudLOg+PrwEI0v~i89nHX4Ct=wOkhV#zx
zxWRG<PRp&!9pyLdaBPrPebNYH`z>3mGg(!h;zoXH+m1Ga_TjsYftekpIFhx96~Cd|
z{x~tP(EhMu20TdqU|}3-WLO%!OCZaqoE7rC7Wib1C9zB|enIc&z@(qo9Ge0oNMRHM
z{8tE#Fo+`WQW(N8TioLR49gL=@`Kelc#36lsW^U#i3IjmmX<GZFNv$jeL-3i=;8Jq
z#AFbCG4zU}vp?ps5Fi$@h$Tko;ddD;LHyM}Vn1ixpx`SgziMDNfS3-I9SFYu2!bMr
X1O!_r@Cc7t_Ob61{?<N#Jgol&uq{r{

diff --git a/src/controller/BusController.java b/src/controller/BusController.java
index f1f8372..a9aee35 100644
--- a/src/controller/BusController.java
+++ b/src/controller/BusController.java
@@ -28,7 +28,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 +72,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..f401ca9 100644
--- a/src/controller/FlightController.java
+++ b/src/controller/FlightController.java
@@ -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..14e58ec 100644
--- a/src/controller/HotelController.java
+++ b/src/controller/HotelController.java
@@ -12,8 +12,8 @@
 
 
 
-/*import model.Hotel;
-import services.FareCalculator;*/
+import model.Hotel;
+import services.FareCalculator;
 
 
 
@@ -33,7 +33,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 +67,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..f0d07c1 100644
--- a/src/controller/TrainController.java
+++ b/src/controller/TrainController.java
@@ -11,9 +11,9 @@
 import javax.servlet.http.HttpServletResponse;
 
 
-/**
- * Servlet implementation class TrainController
- */
+
+ Servlet implementation class TrainController
+ 
 @WebServlet("/train")
 public class TrainController extends HttpServlet {
 	private static final long serialVersionUID = 1L;
@@ -31,7 +31,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 +68,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..248af42 100644
--- a/src/model/Bus.java
+++ b/src/model/Bus.java
@@ -1,3 +1,52 @@
 package model;
 
+import java.time.LocalDate;
+
 // Type your code
+
+//class bus
+public class Bus{
+
+	//instance variables/arguments
+	private int noOfPersons;
+	private String busType;
+	private int rates;
+	private LocalDate date;
+	
+	
+	//getter and setter
+	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;
+	}
+	
+	//constructor
+	public Bus(int noOfPersons, int rates, String busType, LocalDate date) {
+		super();
+		this.noOfPersons = noOfPersons;
+		this.busType = busType;
+		this.rates = rates;
+		this.date = date;
+	}
+	
+}
\ No newline at end of file
diff --git a/src/model/Flight.java b/src/model/Flight.java
index 9ac54b5..7570702 100644
--- a/src/model/Flight.java
+++ b/src/model/Flight.java
@@ -1,3 +1,67 @@
 package model;
 
-//Type your code 
\ No newline at end of file
+import java.time.LocalDate;
+
+//Type your code
+
+//class flight
+public class Flight{
+	
+	//instance variables/arguments
+	private int noOfPersons;
+	private String classType;
+	private int rates;
+	private LocalDate from;
+	private LocalDate to;
+	private String triptype;
+	
+	//getter and setter
+	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;
+	}
+	
+	//constructor
+	public Flight(int noOfPersons, int rates, String classType, LocalDate from, LocalDate to, String triptype) {
+		super();
+		this.noOfPersons = noOfPersons;
+		this.classType = classType;
+		this.rates = rates;
+		this.from = from;
+		this.to = to;
+		this.triptype = triptype;
+	}
+		
+}
\ No newline at end of file
diff --git a/src/model/Hotel.java b/src/model/Hotel.java
index b21180d..6b19704 100644
--- a/src/model/Hotel.java
+++ b/src/model/Hotel.java
@@ -1,2 +1,65 @@
 package model;
-// Type your code
\ No newline at end of file
+
+import java.time.LocalDate;
+
+// Type your code
+
+//class hotel
+public class Hotel{
+	private int noOfPersons;
+	private String roomType;
+	private int rates;
+	private String occupancy;
+	private LocalDate fromdate;
+	private LocalDate todate;
+	
+	//getter and setter
+	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;
+	}
+	
+	//constructor
+	public Hotel(int noOfPersons, String roomType, int rates, String occupancy, LocalDate fromdate, LocalDate todate) {
+		super();
+		this.noOfPersons = noOfPersons;
+		this.roomType = roomType;
+		this.rates = rates;
+		this.occupancy = occupancy;
+		this.fromdate = fromdate;
+		this.todate = todate;
+	}
+		
+}
\ No newline at end of file
diff --git a/src/model/Train.java b/src/model/Train.java
index b21180d..6b19704 100644
--- a/src/model/Train.java
+++ b/src/model/Train.java
@@ -1,2 +1,65 @@
 package model;
-// Type your code
\ No newline at end of file
+
+import java.time.LocalDate;
+
+// Type your code
+
+//class hotel
+public class Hotel{
+	private int noOfPersons;
+	private String roomType;
+	private int rates;
+	private String occupancy;
+	private LocalDate fromdate;
+	private LocalDate todate;
+	
+	//getter and setter
+	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;
+	}
+	
+	//constructor
+	public Hotel(int noOfPersons, String roomType, int rates, String occupancy, LocalDate fromdate, LocalDate todate) {
+		super();
+		this.noOfPersons = noOfPersons;
+		this.roomType = roomType;
+		this.rates = rates;
+		this.occupancy = occupancy;
+		this.fromdate = fromdate;
+		this.todate = todate;
+	}
+		
+}
\ No newline at end of file
diff --git a/src/services/Booking.java b/src/services/Booking.java
index fe2c822..94d4c77 100644
--- a/src/services/Booking.java
+++ b/src/services/Booking.java
@@ -2,3 +2,17 @@
 
 // Type your code
 
+//parent class
+public class Booking{
+	
+	//method returning rates
+	public double booking(int noOfPersons,int rates)
+	{
+	
+        double d=(double)noOfPersons*rates;
+        return d;
+		
+}
+	
+	
+}
\ No newline at end of file
diff --git a/src/services/FareCalculator.java b/src/services/FareCalculator.java
index 6d38ab5..94e90a3 100644
--- a/src/services/FareCalculator.java
+++ b/src/services/FareCalculator.java
@@ -1,3 +1,92 @@
 package services;
 
-// Type your code
\ No newline at end of file
+import java.time.LocalDate;
+
+import model.Bus;
+import model.Flight;
+import model.Hotel;
+import model.Train;
+
+// Type your code
+
+
+//child class inhereted from parent
+public class FareCalculator extends Booking
+{
+	Booking b=new Booking();
+	
+		//method hotel
+		public double book(Hotel hotel)
+		{
+			int noOfPersons=hotel.getNoOfPersons();
+			String roomType =hotel.getRoomType();
+			int rates=hotel.getRates();
+			String occupancy=hotel.getOccupancy();
+			LocalDate fromdate=hotel.getFromdate();
+			LocalDate todate=hotel.getTodate();
+                double d=0;
+			if(todate.isAfter(fromdate))
+			{
+				Double data1;
+			
+		          data1 =  b.booking(noOfPersons, rates);
+		          return data1;
+			}
+			else
+				return d;
+			
+		}
+		
+		
+		//method flight
+		public double book(Flight flight) {
+			int noOfPersons=flight.getNoOfPersons();
+			String classType=flight.getClassType();
+			int rates=flight.getRates();
+			LocalDate from=flight.getFrom();
+			LocalDate to=flight.getTo();
+			String triptype=flight.getTriptype();
+			
+			double data=0;
+			
+			//condition check
+			if(triptype=="One-way")
+			{
+			data =b.booking(noOfPersons, rates);
+			}
+			else
+			{
+				if(to.isAfter(from))
+					data=b.booking(noOfPersons, rates);
+			}
+			
+			return  data ;                      
+			
+		}
+		
+		//method train
+		public double book(Train train)
+		{
+			int noOfPersons=train.getNoOfPersons();
+			String berth=train.getBerth();
+			int rates=train.getRates();
+			LocalDate date=train.getDate();
+			double data =b.booking(noOfPersons, rates);
+			
+			return  data ;
+			
+		}
+
+	//method bus
+	public double book(Bus bus)
+	{
+		int noOfPersons=bus.getNoOfPersons();
+		String busType=bus.getBusType();
+		int rates=bus.getRates();
+		LocalDate date=bus.getDate();
+		double data =b.booking(noOfPersons, rates);
+		
+		return  data ;
+	}
+	
+  }
diff --git a/src/testing/TestBooking.java b/src/testing/TestBooking.java
index a729b9b..ff65976 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
+
 
 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..f144daf 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
+
 
 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 32cb953..91adab2 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..e7ba39b 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..1fddd1b 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,3 @@ public void testSetDate() {
 	}
 
 }
-*/
diff --git a/src/testing/TestRunner.java b/src/testing/TestRunner.java
index f26d18d..a9c7bac 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..50bd596 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,3 @@
 public class TestSuite {
 
 }
-*/
diff --git a/src/testing/TestTrain.java b/src/testing/TestTrain.java
index 688df5c..d77ab2f 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() {
 	}
 }
 
-*/
+