Index: trunk/tests/test_extract_waves.py
===================================================================
diff -u -r37 -r38
--- trunk/tests/test_extract_waves.py	(.../test_extract_waves.py)	(revision 37)
+++ trunk/tests/test_extract_waves.py	(.../test_extract_waves.py)	(revision 38)
@@ -5,7 +5,7 @@
 from tests.TestUtils import TestUtils
 from netCDF4 import Dataset
 from SDToolBox import main as main
-from SDToolBox import extract_waves
+from SDToolBox import extract_data_era5
 from SDToolBox import data_acquisition
 import numpy as np
 
@@ -20,7 +20,7 @@
         expected_error = 'No valid input data.'
         # 2. When
         with pytest.raises(IOError) as e_info:
-            output_result = extract_waves.ExtractWaves(input_data)
+            output_result = extract_data_era5.ExtractDataEra5(input_data)
 
         # 3. Then
         error_message = str(e_info.value)
@@ -43,8 +43,8 @@
         input_data.coord_list = [(4.2, 2.4),]
 
         # 2. When
-        extract_wave = extract_waves.ExtractWaves(input_data)
-        output_data = extract_wave.subset_era_5(dir_test_data, 1981, 1982)
+        extract_wave = extract_data_era5.ExtractDataEra5(input_data)
+        output_data = extract_wave.subset_waves(dir_test_data, 1981, 1982)
 
         # 3. Then
         assert output_data is not None
@@ -67,8 +67,8 @@
         input_data.coord_list = [(4.2, 2.4), (42, 2.4), (42, 24), (4.2, 24)]
 
         # 2. When
-        extract_wave = extract_waves.ExtractWaves(input_data)
-        dataset_list = extract_wave.subset_era_5(dir_test_data, 1981, 1982)
+        extract_wave = extract_data_era5.ExtractDataEra5(input_data)
+        dataset_list = extract_wave.subset_waves(dir_test_data, 1981, 1982)
 
         # 3. Then
         assert dataset_list is not None
@@ -87,7 +87,7 @@
         with Dataset(path, 'r', format='netCDF4') as case_dataset:
             input_data = data_acquisition.InputData()
             input_data.coord_list = [(4.2, 2.4)]
-            extractwaves = extract_waves.ExtractWaves(input_data)
+            extractwaves = extract_data_era5.ExtractDataEra5(input_data)
             
         #call
         result = extractwaves.check_for_longitude(longitude)
@@ -106,7 +106,7 @@
         with Dataset(path, 'r', format='netCDF4') as case_dataset:
             input_data = data_acquisition.InputData()
             input_data.coord_list = [(4.2, 2.4)]
-            extractwaves = extract_waves.ExtractWaves(input_data)
+            extractwaves = extract_data_era5.ExtractDataEra5(input_data)
             
         #call
         result = extractwaves.check_for_longitude(longitude)
@@ -129,7 +129,7 @@
         with Dataset(path, 'r', format='netCDF4') as case_dataset:
             input_data = data_acquisition.InputData()
             input_data.coord_list = [(4.2, 2.4)]
-            extractwaves = extract_waves.ExtractWaves(input_data)
+            extractwaves = extract_data_era5.ExtractDataEra5(input_data)
         #call
         result = extractwaves.generate_years_array(year1, yearN)
         #assert