Fix XlsxReder methods, modify tests

Author: startrug

tests/test_search_flight.py

@@ -16,39 +16,39 @@ def test_search_flight_general(self):
         search_flight.open_flights_tab()
         search_flight.set_trip_type("One Way")
         search_flight.set_cabin_class("First")  # Cabin class: Economy, First, Business
-        search_flight.set_loc_from("LUZ")
-        search_flight.set_loc_to("OSL")
-        search_flight.set_start_date("2019", "Dec", "14")
+        search_flight.set_loc_from("LIS")
+        search_flight.set_loc_to("JFK")
+        search_flight.set_start_date("2019", "Dec", "31")
         search_flight.set_adults_number(2)
         search_flight.set_kids_number(4)
         search_flight.set_infants_number(1)
         search_flight.search_perform()
 
-    @allure.title("Search flight test: from Warsaw to Aruba")
-    @allure.description("This is test of searching flight from Warsaw to Aruba and return")
-    def test_search_flight_round_trip(self):
+    @allure.title("Search flight test: one way")
+    @allure.description("This is test of searching one way flight")
+    @pytest.mark.parametrize("data", XlsxReader.get_xlsx_flights_data())
+    def test_search_flight_one_way(self, data):
         search_flight = SearchFlightsForm(self.driver)
         search_flight.open_page()
         search_flight.open_flights_tab()
-        search_flight.set_round_trip()
-        search_flight.set_cabin_class("Economy")  # Cabin class: Economy, First, Business
-        search_flight.set_loc_from("WAW")
-        search_flight.set_loc_to("AUA")
-        search_flight.set_start_date("2020", "Nov", "27")
-        search_flight.set_end_date("2020", "Dec", "30")
-        search_flight.set_adults_number(1)
-        search_flight.set_kids_number(0)
-        search_flight.set_infants_number(0)
+        search_flight.set_one_way()
+        search_flight.set_cabin_class(data.cabin_class)
+        search_flight.set_loc_from(data.location_from)
+        search_flight.set_loc_to(data.location_to)
+        search_flight.set_start_date(data.start_year, data.start_month, data.start_day)
+        search_flight.set_adults_number(data.adults_num)
+        search_flight.set_kids_number(data.kids_num)
+        search_flight.set_infants_number(data.infants_num)
         search_flight.search_perform()
 
-    @allure.title("Search flight data-driven tests")
-    @allure.description("This is data-driven tests of searching flight")
+    @allure.title("Search flight test: round trip")
+    @allure.description("This is test of searching round trip flight")
     @pytest.mark.parametrize("data", XlsxReader.get_xlsx_flights_data())
-    def test_search_flight_data_driven(self, data):
+    def test_search_flight_round_trip(self, data):
         search_flight = SearchFlightsForm(self.driver)
         search_flight.open_page()
         search_flight.open_flights_tab()
-        search_flight.set_trip_type(data.trip_type)
+        search_flight.set_round_trip()
         search_flight.set_cabin_class(data.cabin_class)
         search_flight.set_loc_from(data.location_from)
         search_flight.set_loc_to(data.location_to)

tests/test_search_hotel.py

@@ -11,7 +11,7 @@ class TestHotelSearch:
 
     @allure.title("Search hotel test")
     @allure.description("This is test of searching hotel in Warsaw")
-    def test_search_hote_1(self):
+    def test_search_hotel_1(self):
         search_hotel = SearchHotelsForm(self.driver)
         search_hotel.open_page()
         search_hotel.set_destination("Warsaw")

utils/read_xlsx.py

@@ -7,7 +7,7 @@
 class XlsxReader:
     @staticmethod
     def get_xlsx_hotels_data():
-        wb = xlrd.open_workbook(f"../utils/search_hotels_input_data.xlsx")
+        wb = xlrd.open_workbook(f"./utils/search_hotels_input_data.xlsx")
         sheet = wb.sheet_by_index(0)
         data = []
 
@@ -22,23 +22,22 @@ def get_xlsx_hotels_data():
 
     @staticmethod
     def get_xlsx_flights_data():
-        wb = xlrd.open_workbook(f"../utils/search_flights_input_data.xlsx")
+        wb = xlrd.open_workbook(f"./utils/search_flights_input_data.xlsx")
         sheet = wb.sheet_by_index(0)
         data = []
 
         for i in range(1, sheet.nrows):
             search_flights_data = SearchFlightsData(sheet.cell(i, 0).value,  # cabin class
-                                                    sheet.cell(i, 1).value,  # trip type
-                                                    sheet.cell(i, 2).value,  # location from
-                                                    sheet.cell(i, 3).value,  # location to
-                                                    int(sheet.cell(i, 4).value),  # start year
-                                                    sheet.cell(i, 5).value,  # start month
-                                                    int(sheet.cell(i, 6).value),  # start day
-                                                    int(sheet.cell(i, 7).value),  # end year
-                                                    sheet.cell(i, 8).value,  # end month
-                                                    int(sheet.cell(i, 9).value),  # end day
-                                                    int(sheet.cell(i, 10).value),  # adults number
-                                                    int(sheet.cell(i, 11).value),  # kids number
-                                                    int(sheet.cell(i, 12).value))  # infants number
+                                                    sheet.cell(i, 1).value,  # location from
+                                                    sheet.cell(i, 2).value,  # location to
+                                                    int(sheet.cell(i, 3).value),  # start year
+                                                    sheet.cell(i, 4).value,  # start month
+                                                    int(sheet.cell(i, 5).value),  # start day
+                                                    int(sheet.cell(i, 6).value),  # end year
+                                                    sheet.cell(i, 7).value,  # end month
+                                                    int(sheet.cell(i, 8).value),  # end day
+                                                    int(sheet.cell(i, 9).value),  # adults number
+                                                    int(sheet.cell(i, 10).value),  # kids number
+                                                    int(sheet.cell(i, 11).value))  # infants number
             data.append(search_flights_data)
         return data

utils/search_flights_data.py

@@ -1,9 +1,8 @@
 class SearchFlightsData:
 
-    def __init__(self, cabin_class, trip_type, location_from, location_to, start_year, start_month, start_day,
+    def __init__(self, cabin_class, location_from, location_to, start_year, start_month, start_day,
                  end_year, end_month, end_day, adults_num, kids_num, infants_num):
         self.cabin_class = cabin_class
-        self.trip_type = trip_type
         self.location_from = location_from
         self.location_to = location_to
         self.start_year = start_year