Updated test functions accoding to modified codes

Author: debpal

tests/test_calibration.py

@@ -28,7 +28,7 @@ def test_calibration():
         'channel_sd_mon.txt': {
             'has_units': True,
             'ref_day': 1,
-            'apply_filter': {'name': ['cha300']}
+            'apply_filter': {'name': ['cha771']}
         }
     }
 
@@ -141,7 +141,7 @@ def test_error_calibration():
         'channel_sd_mon.txt': {
             'has_units': True,
             'ref_day': 1,
-            'apply_filter': {'name': ['cha561']}
+            'apply_filter': {'name': ['cha771']}
         }
     }
 
@@ -371,12 +371,12 @@ def test_error_calibration():
                     extract_data={
                         'channel_sd_day.txt': {
                             'has_units': True,
-                            'apply_filter': {'name': ['cha561']}
+                            'apply_filter': {'name': ['cha771']}
                         },
                         'channel_sd_mon.txt': {
                             'has_units': True,
                             'ref_day': 1,
-                            'apply_filter': {'name': ['cha561']}
+                            'apply_filter': {'name': ['cha771']}
                         }
                     },
                     observe_data={

tests/test_data_manager.py

@@ -133,7 +133,7 @@ def test_error_hru_stats_from_daily_simulation(
         data_manager.hru_stats_from_daily_simulation(
             sim_file='channel_sd_mon.txt',
             has_units=True,
-            gis_id=561,
+            gis_id=771,
             sim_col='flo_out'
         )
     assert exc_info.value.args[0] == 'Statistical summary applies only to daily time series files ending with "_day"; received file name "channel_sd_mon"'

tests/test_sensitivity_analyzer.py

@@ -50,7 +50,7 @@ def test_simulation_by_sample_parameters(
         'channel_sd_mon.txt': {
             'has_units': True,
             'ref_day': 1,
-            'apply_filter': {'name': ['cha300']},
+            'apply_filter': {'name': ['cha771']},
             'usecols': ['gis_id', 'flo_out']
         }
     }
@@ -209,22 +209,16 @@ def test_simulation_by_sample_parameters(
             assert 'Invalid sub-key "begin_datee" for "channel_sd_yr.txt" in extract_data' in exc_info.value.args[0]
 
 
-def test_error_scenario_indicators(
+def test_error_indicator_abbr(
     performance_metrics
 ):
 
     # Error: invalid indicator name
     with pytest.raises(Exception) as exc_info:
-        performance_metrics.scenario_indicators(
-            sensim_file='sensitivity_simulation.json',
-            df_name='channel_sd_mon_df',
-            sim_col='flo_out',
-            obs_file='a_observe_discharge_monthly.csv',
-            date_format='%Y-%m-%d',
-            obs_col='mean',
+        performance_metrics._validate_indicator_abbr(
             indicators=['NSEE']
         )
-    assert 'Invalid name "NSEE" in "indicatiors" list' in exc_info.value.args[0]
+    assert 'Invalid indicator "NSEE"' in exc_info.value.args[0]
 
 
 def test_create_sobol_problem(

tests/test_txtinout_reader.py

@@ -101,11 +101,27 @@ def test_run_swat(
             assert list(df.columns) == list(csv_df.columns)
             assert all(df.dtypes == csv_df.dtypes)
 
+            # Pass: computing indicator from file
+            output = pySWATPlus.PerformanceMetrics().indicator_from_file(
+                sim_file=sim2_dir / 'channel_sd_day.txt',
+                sim_col='flo_out',
+                extract_sim={
+                    'has_units': True,
+                    'apply_filter': {'name': ['cha771']}
+                },
+                obs_file=txtinout_reader.root_dir / 'a_observe_discharge_daily.csv',
+                date_format='%Y-%m-%d',
+                obs_col='discharge',
+                indicators=['NSE', 'KGE', 'RMSE']
+            )
+            assert isinstance(output, dict)
+            assert len(output) == 3
+
             # Pass: monthly and yearly summary statistics from daily time series
             stats_dict = pySWATPlus.DataManager().hru_stats_from_daily_simulation(
                 sim_file=sim2_dir / 'channel_sd_day.txt',
                 has_units=True,
-                gis_id=300,
+                gis_id=771,
                 sim_col='flo_out',
                 output_dir=sim2_dir
             )