Update tests and coverage

jvivian · Dec 19, 2023 · 0591e68 · 0591e68
1 parent c735d1b
commit 0591e68
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 52 deletions.
diff --git a/.coverage b/.coverage
diff --git a/coverage.xml b/coverage.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
-<coverage version="7.3.1" timestamp="1702950534946" lines-valid="162" lines-covered="144" line-rate="0.8889" branches-valid="54" branches-covered="49" branch-rate="0.9074" complexity="0">
+<coverage version="7.3.1" timestamp="1703026094115" lines-valid="165" lines-covered="147" line-rate="0.8909" branches-valid="54" branches-covered="49" branch-rate="0.9074" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.3.1 -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>
 		<source>/home/jvivian/covid19-drDFM/covid19_drdfm</source>
 	</sources>
 	<packages>
-		<package name="." line-rate="0.8889" branch-rate="0.9074" complexity="0">
+		<package name="." line-rate="0.8909" branch-rate="0.9074" complexity="0">
 			<classes>
 				<class name="cli.py" filename="cli.py" complexity="0" line-rate="1" branch-rate="1">
 					<methods/>
@@ -42,7 +42,7 @@
 						<line number="147" hits="1"/>
 					</lines>
 				</class>
-				<class name="dfm.py" filename="dfm.py" complexity="0" line-rate="0.9118" branch-rate="0.7917">
+				<class name="dfm.py" filename="dfm.py" complexity="0" line-rate="0.9143" branch-rate="0.7917">
 					<methods/>
 					<lines>
 						<line number="7" hits="1"/>
@@ -52,67 +52,69 @@
 						<line number="12" hits="1"/>
 						<line number="13" hits="1"/>
 						<line number="15" hits="1"/>
-						<line number="18" hits="1" branch="true" condition-coverage="100% (2/2)"/>
-						<line number="19" hits="1"/>
+						<line number="16" hits="1"/>
+						<line number="19" hits="1" branch="true" condition-coverage="100% (2/2)"/>
 						<line number="20" hits="1"/>
 						<line number="21" hits="1"/>
-						<line number="25" hits="1"/>
-						<line number="27" hits="1"/>
-						<line number="30" hits="1"/>
-						<line number="40" hits="1"/>
-						<line number="42" hits="1"/>
-						<line number="43" hits="1" branch="true" condition-coverage="100% (2/2)"/>
-						<line number="44" hits="1"/>
+						<line number="22" hits="1"/>
+						<line number="26" hits="1"/>
+						<line number="28" hits="1"/>
+						<line number="31" hits="1"/>
+						<line number="41" hits="1"/>
+						<line number="43" hits="1"/>
 						<line number="45" hits="1"/>
-						<line number="46" hits="1"/>
+						<line number="47" hits="1" branch="true" condition-coverage="100% (2/2)"/>
+						<line number="48" hits="1"/>
 						<line number="49" hits="1"/>
-						<line number="58" hits="1"/>
-						<line number="59" hits="1" branch="true" condition-coverage="100% (2/2)"/>
-						<line number="60" hits="1"/>
-						<line number="61" hits="1"/>
-						<line number="62" hits="1" branch="true" condition-coverage="100% (2/2)"/>
-						<line number="63" hits="1"/>
+						<line number="50" hits="1"/>
+						<line number="53" hits="1"/>
+						<line number="62" hits="1"/>
+						<line number="63" hits="1" branch="true" condition-coverage="100% (2/2)"/>
+						<line number="64" hits="1"/>
 						<line number="65" hits="1"/>
-						<line number="66" hits="1"/>
+						<line number="66" hits="1" branch="true" condition-coverage="100% (2/2)"/>
+						<line number="67" hits="1"/>
 						<line number="69" hits="1"/>
-						<line number="81" hits="1"/>
-						<line number="82" hits="1"/>
-						<line number="84" hits="1"/>
+						<line number="70" hits="1"/>
+						<line number="73" hits="1"/>
 						<line number="85" hits="1"/>
-						<line number="86" hits="1" branch="true" condition-coverage="100% (2/2)"/>
-						<line number="88" hits="1" branch="true" condition-coverage="50% (1/2)" missing-branches="89"/>
-						<line number="89" hits="0"/>
-						<line number="90" hits="0"/>
-						<line number="92" hits="1"/>
-						<line number="93" hits="1"/>
-						<line number="94" hits="1"/>
-						<line number="95" hits="1"/>
-						<line number="96" hits="0"/>
-						<line number="97" hits="0" branch="true" condition-coverage="0% (0/2)" missing-branches="98,99"/>
-						<line number="98" hits="0"/>
-						<line number="99" hits="0"/>
-						<line number="101" hits="1"/>
-						<line number="102" hits="1"/>
+						<line number="86" hits="1"/>
+						<line number="88" hits="1"/>
+						<line number="89" hits="1"/>
+						<line number="90" hits="1" branch="true" condition-coverage="100% (2/2)"/>
+						<line number="92" hits="1" branch="true" condition-coverage="50% (1/2)" missing-branches="93"/>
+						<line number="93" hits="0"/>
+						<line number="94" hits="0"/>
+						<line number="96" hits="1"/>
+						<line number="97" hits="1"/>
+						<line number="98" hits="1"/>
+						<line number="99" hits="1"/>
+						<line number="100" hits="0"/>
+						<line number="101" hits="0" branch="true" condition-coverage="0% (0/2)" missing-branches="102,103"/>
+						<line number="102" hits="0"/>
+						<line number="103" hits="0"/>
 						<line number="105" hits="1"/>
-						<line number="113" hits="1"/>
-						<line number="114" hits="1"/>
-						<line number="115" hits="1"/>
-						<line number="116" hits="1"/>
+						<line number="106" hits="1"/>
+						<line number="109" hits="1"/>
 						<line number="117" hits="1"/>
 						<line number="118" hits="1"/>
+						<line number="119" hits="1"/>
+						<line number="120" hits="1"/>
 						<line number="121" hits="1"/>
-						<line number="131" hits="1" branch="true" condition-coverage="50% (1/2)" missing-branches="136"/>
-						<line number="132" hits="1"/>
-						<line number="133" hits="1"/>
-						<line number="135" hits="1"/>
-						<line number="136" hits="1" branch="true" condition-coverage="100% (2/2)"/>
+						<line number="122" hits="1"/>
+						<line number="125" hits="1"/>
+						<line number="135" hits="1" branch="true" condition-coverage="50% (1/2)" missing-branches="140"/>
+						<line number="136" hits="1"/>
 						<line number="137" hits="1"/>
-						<line number="138" hits="1" branch="true" condition-coverage="100% (2/2)"/>
 						<line number="139" hits="1"/>
-						<line number="140" hits="1"/>
-						<line number="141" hits="1" branch="true" condition-coverage="50% (1/2)" missing-branches="exit"/>
+						<line number="140" hits="1" branch="true" condition-coverage="100% (2/2)"/>
+						<line number="141" hits="1"/>
 						<line number="142" hits="1" branch="true" condition-coverage="100% (2/2)"/>
 						<line number="143" hits="1"/>
+						<line number="144" hits="1"/>
+						<line number="145" hits="1" branch="true" condition-coverage="50% (1/2)" missing-branches="exit"/>
+						<line number="146" hits="1" branch="true" condition-coverage="100% (2/2)"/>
+						<line number="147" hits="1"/>
 					</lines>
 				</class>
 				<class name="processing.py" filename="processing.py" complexity="0" line-rate="1" branch-rate="1">
@@ -176,6 +178,7 @@
 						<line number="177" hits="1"/>
 						<line number="178" hits="1"/>
 						<line number="179" hits="1"/>
+						<line number="180" hits="1"/>
 					</lines>
 				</class>
 				<class name="scm.py" filename="scm.py" complexity="0" line-rate="0" branch-rate="1">

diff --git a/tests/test_dfm.py b/tests/test_dfm.py
@@ -9,7 +9,8 @@
 # TODO: output should go in a directory instead of dumping shit everywhere
 def test_run_model():
     df = get_df()
-    run_model(df, "NY", Path("./testdir"))
-    assert Path("./testdir/NY/model.csv").exists()
-    assert Path("./testdir/NY/results.csv").exists()
+    state = "SD"
+    run_model(df, state, Path("./testdir"))
+    assert Path("./testdir/SD/model.csv").exists()
+    assert Path("./testdir/SD/results.csv").exists()
     shutil.rmtree("./testdir")