updating tests

Author: nlsschim

diff_viz/tests/test_data_loading.py

@@ -5,9 +5,9 @@
 import numpy as np
 from diff_viz.data_loading import check_mpt_data, clean_mpt_data, combine_csvs
 from hypothesis import HealthCheck, given, settings, strategies as st
-from diff_viz.tests.hypothesis_util_functions import features_dataframe
+from diff_viz.tests.hypothesis_util_functions import hypothesis_features_dataframe
 
-df = features_dataframe()
+df = hypothesis_features_dataframe()
 
 @given(df)
 @settings(suppress_health_check=[HealthCheck.large_base_example, HealthCheck.too_slow])
@@ -50,15 +50,15 @@ def test_clean_mpt_data(df):
 
 def test_combine_csvs():
     file_list = [
-        'diff_viz/tests/testing_data/features_P14_40nm_s1_v1.csv',
-        'diff_viz/tests/testing_data/features_P14_40nm_s1_v2.csv',
-        'diff_viz/tests/testing_data/features_P14_40nm_s1_v3.csv',
-        'diff_viz/tests/testing_data/features_P35_brain_2_slice_1_vid_1.csv',
-        'diff_viz/tests/testing_data/features_P35_brain_2_slice_1_vid_2.csv',
-        'diff_viz/tests/testing_data/features_P35_brain_2_slice_1_vid_3.csv',
-        'diff_viz/tests/testing_data/features_P70_40nm_s1_v1.csv',
-        'diff_viz/tests/testing_data/features_P70_40nm_s1_v2.csv',
-        'diff_viz/tests/testing_data/features_P70_40nm_s1_v3.csv',
+        'diff_viz/tests/testing_data/feature_data/features_P14_40nm_s1_v1.csv',
+        'diff_viz/tests/testing_data/feature_data/features_P14_40nm_s1_v2.csv',
+        'diff_viz/tests/testing_data/feature_data/features_P14_40nm_s1_v3.csv',
+        'diff_viz/tests/testing_data/feature_data/features_P35_brain_2_slice_1_vid_1.csv',
+        'diff_viz/tests/testing_data/feature_data/features_P35_brain_2_slice_1_vid_2.csv',
+        'diff_viz/tests/testing_data/feature_data/features_P35_brain_2_slice_1_vid_3.csv',
+        'diff_viz/tests/testing_data/feature_data/features_P70_40nm_s1_v1.csv',
+        'diff_viz/tests/testing_data/feature_data/features_P70_40nm_s1_v2.csv',
+        'diff_viz/tests/testing_data/feature_data/features_P70_40nm_s1_v3.csv',
     ]
 
     def helper_func():

diff_viz/tests/test_diff_utils.py

@@ -1,6 +1,6 @@
 from diff_viz.diff_utils import *
 
-file_path = 'diff_viz/tests/testing_data/'
+file_path = 'diff_viz/tests/testing_data/msd_data/'
 
 def test_get_experiment():
     date = '2019_01_01'
@@ -32,15 +32,15 @@ def test_get_geo_dict(file_path=file_path):
 def test_get_geo_df_geomean(file_path=file_path):
 
     #test geomean
-    geo_df = get_geo_df(file_path, filetype='geomean', doses=['1h', 'NT'], timepoints=['1d'], experiment=None)
+    geo_df = get_geo_df(file_path, filetype='geomean', doses=['1h', 'NT'], timepoints=['1d'])
     assert geo_df.shape == (650, 2)
     assert geo_df.columns[0] == '1h_1d'
     assert geo_df.columns[1] == 'NT_1d'
 
 
 def test_get_geo_df_geoSEM(file_path=file_path):
     #test geosem
-    geo_df = get_geo_df(file_path, filetype='geoSEM', doses=['1h', 'NT'], timepoints=['1d'], experiment=None)
+    geo_df = get_geo_df(file_path, filetype='geoSEM', doses=['1h', 'NT'], timepoints=['1d'])
     assert geo_df.shape == (650, 2)
     assert geo_df.columns[0] == '1h_1d'
     assert geo_df.columns[1] == 'NT_1d'

diff_viz/tests/test_diffusion_modes.py

@@ -7,7 +7,7 @@
 import matplotlib.pyplot as plt
 
 # Set up the testing data
-testing_data_path = '../diff_viz/diff_viz/tests/testing_data/'
+testing_data_path = '../diff_viz/diff_viz/tests/testing_data/feature_data/'
 striatum_file = 'features_60X_Striatum_Slice2_Video1.csv'
 cortex_file = 'features_100X_OGD_Cortex_Slice2_Video1.csv'
 df_striat = pd.read_csv(testing_data_path+striatum_file)

diff_viz/tests/test_feature_distribution_plots.py

@@ -7,7 +7,7 @@
 import matplotlib.pyplot as plt
 
 # Set up the testing data
-testing_data_path = '../diff_viz/diff_viz/tests/testing_data/'
+testing_data_path = '../diff_viz/diff_viz/tests/testing_data/feature_data/'
 striatum_file = 'features_60X_Striatum_Slice2_Video1.csv'
 cortex_file = 'features_100X_OGD_Cortex_Slice2_Video1.csv'
 df_striat = pd.read_csv(testing_data_path+striatum_file)

diff_viz/tests/test_pca_plots.py

@@ -7,7 +7,7 @@
 import matplotlib.pyplot as plt
 
 # Set up the testing data
-testing_data_path = '../diff_viz/diff_viz/tests/testing_data/'
+testing_data_path = '../diff_viz/diff_viz/tests/testing_data/feature_data/'
 striatum_file = 'features_60X_Striatum_Slice2_Video1.csv'
 cortex_file = 'features_100X_OGD_Cortex_Slice2_Video1.csv'
 df_striat = pd.read_csv(testing_data_path+striatum_file)