Index: trunk/tests/test_extract_waves.py
===================================================================
diff -u -r16 -r17
--- trunk/tests/test_extract_waves.py	(.../test_extract_waves.py)	(revision 16)
+++ trunk/tests/test_extract_waves.py	(.../test_extract_waves.py)	(revision 17)
@@ -29,74 +29,38 @@
             'Expected exception message {},'.format(expected_error) + \
             'retrieved {}'.format(error_message)
 
-
 class Test_subset_era_5:
 
     @pytest.mark.systemtest
     def test_given_waves_folder_then_subset_collection_is_extracted(self):
         # 1. Given
         # When using local data you can just replace the comment in these lines
         #dir_test_data = TestUtils.get_test_data_dir('netCDF_Waves_data')
-        dir_test_data = 'P:\\metocean-data\\open\\ERA5\\data\\Global'
+        #dir_test_data = 'P:\\metocean-data\\open\\ERA5\\data\\Global'
+        dir_test_data = 'D:\\workspace\\SD_Toolbox\\trunk\\tests\\test_data\\' # TODO to be removed
         input_data = data_acquisition.InputData()
         input_data.coord_list = [(4.2, 2.4)]
 
         # 2. When
         extract_wave = extract_waves.ExtractWaves(input_data)
-        dataset_list = extract_wave.subset_era_5(dir_test_data, 1980, 1982)
+        dataset_list = extract_wave.subset_era_5(dir_test_data, 1981, 1982)
 
         # 3. Then
         assert dataset_list is not None
 
-
-# class Test_ExtractWavesEra5:
+    # """
+    #     Instantiates a wave extraction class and checks that
+    #     it is correctly created
+    #     """
+    # @pytest.mark.unittest
+    # def test_instantiating_extract_wave_era5_returns_allocated_object(self):
+    #     waves_era5 = extract_waves.ExtractWaves(0.0,0.0,"path", 1980,2000)
+    #     assert waves_era5.lat == 0.0
+    #     assert waves_era5.lon == 0.0
+    #     assert waves_era5.dpath == "path"
+    #     assert waves_era5.year1 == 1980
+    #     assert waves_era5.yearN == 2000
 #     """
-#         Creates a netCFD4 file stores it in the local test data dir
-#         It then checks it can correctly read it
-#         """
-#     @pytest.mark.unittest
-#     def test_create_and_read_dummy_netCDF_data(self):
-#         # dummy test to create and read netCDF test file
-#         keys_list = []
-#         # expected_keys_list = dict(lon = 3, lat = 3, time = None)
-#         x = np.array([[1, 2, 3], [4, 5, 6]], np.int32)
-
-#         data_dir= TestUtils.get_local_test_data_dir("netCDF_dummy_data")
-#         data_file = data_dir + "era5_Global_Hs_1980.nc"
-        
-#         if not path.exists(data_file):
-#             f = netCDF4.Dataset(data_file,'w', format='NETCDF4') 
-#         else:
-#             f = netCDF4.Dataset(data_file,'r', format='NETCDF4')
-
-#         tempgrp = f.createGroup('Temp_data')
-#         tempgrp = f.createGroup('Temp_data')
-#         tempgrp.createDimension('lon', len(x[0]))
-#         tempgrp.createDimension('lat', len(x[1]))
-#         tempgrp.createDimension('time', None)
-#         f.close()
-#         f = Dataset(data_file, 'r')
-#         tempgrp = f.groups['Temp_data']
-#         keys_list=tempgrp.dimensions.keys()
-#         f.close()
-
-#         # assert expected_keys_list[0] == keys_list[0]
-#         # assert expected_keys_list[1] == keys_list[1]
-#         # assert expected_keys_list[2] == keys_list[2]
-
-#     """
-#         Instantiates a wave extraction class and checks that
-#         it is correctly created
-#         """
-#     @pytest.mark.unittest
-#     def test_instantiating_extract_wave_era5_returns_allocated_object(self):
-#         waves_era5 = extract_waves.ExtractWaves(0.0,0.0,"path", 1980,2000)
-#         assert waves_era5.lat == 0.0
-#         assert waves_era5.lon == 0.0
-#         assert waves_era5.dpath == "path"
-#         assert waves_era5.year1 == 1980
-#         assert waves_era5.yearN == 2000
-#     """
 #         Checks that the longitude is normalized if a value higher than 180 is passed
 #         """
 #     @pytest.mark.unittest