Index: trunk/tests/test_extract_data_era5.py
===================================================================
diff -u -r44 -r47
--- trunk/tests/test_extract_data_era5.py	(.../test_extract_data_era5.py)	(revision 44)
+++ trunk/tests/test_extract_data_era5.py	(.../test_extract_data_era5.py)	(revision 47)
@@ -22,11 +22,12 @@
 
         input_data = data_acquisition.InputData()
         input_data.input_variables = ['swh']
-        input_data.coord_list = [(4.2, 2.4), ]
+        input_data.input_coordinates = [(4.2, 2.4), ]
+        input_data.input_years = [1981, 1982]
 
         # 2. When
         extract_data = ExtractDataEra5(input_data)
-        output_data = extract_data.subset_waves(dir_test_data, 1981, 1982)
+        output_data = extract_data.subset_waves(dir_test_data)
 
         # 3. Then
         assert output_data is not None
@@ -39,19 +40,21 @@
         assert data_dict[output_data.var_val_key]['swh'] is not None
 
     @pytest.mark.systemtest
-    def test_given_waves_folder_then_subset_collection_is_extracted_with_coord_list(self):
+    def test_given_waves_folder_then_subset_collection_is_extracted_with_input_coordinates(self):
         # 1. Given
         # When using local data you can just replace the comment in these lines
-        # dir_test_data = TestUtils.get_local_test_data_dir('netCDF_Waves_data')
-        dir_test_data = 'P:\\metocean-data\\open\\ERA5\\data\\Global'
+        dir_test_data = TestUtils.get_local_test_data_dir('netCDF_Waves_data')
+        # dir_test_data = 'P:\\metocean-data\\open\\ERA5\\data\\Global'
 
         input_data = data_acquisition.InputData()
         input_data.input_variables = ['swh']
-        input_data.coord_list = [(4.2, 2.4), (42, 2.4), (42, 24), (4.2, 24)]
+        input_data.input_years = [1981, 1982]
+        input_data.input_coordinates = \
+            [(4.2, 2.4), (42, 2.4), (42, 24), (4.2, 24)]
 
         # 2. When
         extract_data = ExtractDataEra5(input_data)
-        output_data = extract_data.subset_waves(dir_test_data, 1981, 1982)
+        output_data = extract_data.subset_waves(dir_test_data)
 
         # 3. Then
         assert output_data is not None