Update tests

Author: rumackaaron

changehc/tests/test_load_data.py

@@ -18,23 +18,21 @@
 
 
 class TestLoadData:
-    denom_data = load_denom_data(DENOM_FILEPATH, DROP_DATE, "fips")
-    covid_data = load_covid_data(COVID_FILEPATH, DROP_DATE, "fips")
+    denom_data = load_chng_data(DENOM_FILEPATH, DROP_DATE, "fips",
+                    Config.DENOM_COLS, Config.DENOM_DTYPES, Config.DENOM_COL)
+    covid_data = load_chng_data(COVID_FILEPATH, DROP_DATE, "fips",
+                    Config.COVID_COLS, Config.COVID_DTYPES, Config.COVID_COL)
     combined_data = load_combined_data(DENOM_FILEPATH, COVID_FILEPATH, DROP_DATE,
                                             "fips")
 
     def test_base_unit(self):
         with pytest.raises(AssertionError):
-            load_denom_data(DENOM_FILEPATH, DROP_DATE, "foo")
+            load_chng_data(DENOM_FILEPATH, DROP_DATE, "foo",
+                    Config.DENOM_COLS, Config.DENOM_DTYPES, Config.DENOM_COL)
 
         with pytest.raises(AssertionError):
-            load_denom_data("test_data/20200101_foo.dat", DROP_DATE, "fips")
-
-        with pytest.raises(AssertionError):
-            load_covid_data(COVID_FILEPATH, DROP_DATE, "foo")
-
-        with pytest.raises(AssertionError):
-            load_covid_data("test_data/20200101_foo.dat", DROP_DATE, "fips")
+            load_chng_data(DENOM_FILEPATH, DROP_DATE, "fips",
+                    Config.DENOM_COLS, Config.DENOM_DTYPES, Config.COVID_COL)
 
         with pytest.raises(AssertionError):
             load_combined_data(DENOM_FILEPATH, COVID_FILEPATH, DROP_DATE, "foo")

changehc/tests/test_update_sensor.py

@@ -31,6 +31,7 @@ class TestCHCSensorUpdator:
     geo = "county"
     parallel = False
     weekday = False
+    numtype = "covid"
     se = False
     prefix = "foo"
     small_test_data = pd.DataFrame({
@@ -48,6 +49,7 @@ def test_shift_dates(self):
             self.geo,
             self.parallel,
             self.weekday,
+            self.numtype,
             self.se
         )
         ## Test init
@@ -69,6 +71,7 @@ def test_geo_reindex(self):
             'county',
             self.parallel,
             self.weekday,
+            self.numtype,
             self.se
         )
         su_inst.shift_dates()
@@ -87,6 +90,7 @@ def test_update_sensor(self):
                 geo,
                 self.parallel,
                 self.weekday,
+                self.numtype,
                 self.se
             )
 
@@ -97,8 +101,7 @@ def test_update_sensor(self):
                 s3_client = Session(**aws_credentials).client("s3")
                 s3_client.create_bucket(Bucket=params["bucket_name"])
                 su_inst.update_sensor(
-                    DENOM_FILEPATH,
-                    COVID_FILEPATH,
+                    self.small_test_data,
                     td.name)
 
             assert len(os.listdir(td.name)) == len(su_inst.sensor_dates),\