Index: trunk/tests/test_output_data.py
===================================================================
diff -u -r44 -r47
--- trunk/tests/test_output_data.py	(.../test_output_data.py)	(revision 44)
+++ trunk/tests/test_output_data.py	(.../test_output_data.py)	(revision 47)
@@ -72,12 +72,13 @@
         output_test_data = TestUtils.get_local_test_data_dir('output_data')
         input_data = 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]
         netcdf_filepath = None
 
         # 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)
 
         try:
             netcdf_filepath = output_data.generate_netcdf(
@@ -102,7 +103,8 @@
         # 1. Given
         input_data = 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]
         output_data = None
         generated_output = None
         expected_message = output_messages.error_not_initialized_data_dict
@@ -126,12 +128,13 @@
 
         input_data = 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]
         return_value = None
 
         # 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)
 
         try:
             return_value = output_data.generate_output()
@@ -161,11 +164,12 @@
 
         input_data = 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)
 
         try:
             output_data.generate_output(