Test msaReport method of ReportUtil

Author: schbetsy

publication/src/main/scala/hmda/publication/reports/util/ReportUtil.scala

@@ -18,10 +18,13 @@ import scala.concurrent.Future
 object ReportUtil extends SourceUtils {
 
   def msaReport(fipsCode: String): MSAReport = {
-    val cbsa = CbsaLookup.values.find(x => x.cbsa == fipsCode).getOrElse(Cbsa())
-    val stateFips = cbsa.key.substring(0, 2)
-    val state = StateAbrvLookup.values.find(s => s.state == stateFips).getOrElse(StateAbrv("", "", ""))
-    MSAReport(fipsCode, CbsaLookup.nameFor(fipsCode), state.stateAbrv, state.stateName)
+    CbsaLookup.values.find(x => x.cbsa == fipsCode) match {
+      case Some(cbsa) =>
+        val stateFips = cbsa.key.substring(0, 2)
+        val state = StateAbrvLookup.values.find(s => s.state == stateFips).getOrElse(StateAbrv("", "", ""))
+        MSAReport(fipsCode, CbsaLookup.nameFor(fipsCode), state.stateAbrv, state.stateName)
+      case None => MSAReport("", "", "", "")
+    }
   }
 
   def calculateMedianIncomeIntervals(fipsCode: Int): Array[Double] = {

publication/src/test/scala/hmda/publication/reports/util/ReportUtilSpec.scala

@@ -0,0 +1,21 @@
+package hmda.publication.reports.util
+
+import hmda.model.publication.reports.MSAReport
+import hmda.publication.reports.util.ReportUtil._
+import org.scalatest.{ AsyncWordSpec, MustMatchers }
+
+class ReportUtilSpec extends AsyncWordSpec with MustMatchers {
+
+  "msaReport" must {
+    "get MSA info for given fips code and return MSAReport object" in {
+      msaReport("10380") mustBe MSAReport("10380", "Aguadilla-Isabela, PR", "PR", "Puerto Rico")
+      msaReport("26980") mustBe MSAReport("26980", "Iowa City, IA", "IA", "Iowa")
+      msaReport("41100") mustBe MSAReport("41100", "St. George, UT", "UT", "Utah")
+    }
+
+    "Return empty MSAReport if fips code is invalid" in {
+      msaReport("bogus") mustBe MSAReport("", "", "", "")
+    }
+  }
+
+}