Merge pull request #8 from FirstStreet/adding-tests

Adding and updating city tests
FirstStreet · Nov 18, 2019 · 40e474f · 40e474f
2 parents 56222c1 + 8a7a7c9
commit 40e474f
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 26 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "go.inferGopath": false
+}
diff --git a/citysummary/client_test.go b/citysummary/client_test.go
@@ -64,7 +64,7 @@ func TestCitySummary(t *testing.T) {
 	assert.NotNil(t, property.Results.Location)
 
 	addressLookup := &firststreet.Lookup{
-		Address: "1327 Autumn Drive Fernandina Beach FL",
+		Address: "Fernandina Beach FL",
 	}
 
 	property, err = c.Lookup(addressLookup)

diff --git a/hurricane/client_test.go b/hurricane/client_test.go
@@ -43,9 +43,8 @@ func hurricaneCityHandler() http.HandlerFunc {
 }
 
 func TestHurricaneLookupProperty(t *testing.T) {
-	testutil.Once.Do(func() {
-		testutil.StartServer(hurricanePropertyHandler())
-	})
+	testutil.StartServer(hurricanePropertyHandler())
+
 	testBackend.URL = testutil.ServerAddr
 	c := &Client{
 		B: testBackend,
@@ -89,22 +88,21 @@ func TestHurricaneLookupProperty(t *testing.T) {
 }
 
 func TestHurricaneLookupCity(t *testing.T) {
-	testutil.Once.Do(func() {
-		testutil.StartServer(hurricaneCityHandler())
-	})
+	testutil.StartServer(hurricaneCityHandler())
+
 	testBackend.URL = testutil.ServerAddr
 	c := &Client{
 		B: testBackend,
 	}
 
 	fsidLookup := &firststreet.Lookup{
-		FSID: 450350219571,
+		FSID: 4550875,
 	}
 
 	frd, err := c.Lookup(firststreet.CityLocationType, fsidLookup)
 	assert.Nil(t, err)
 	assert.NotNil(t, frd)
-	assert.Equal(t, frd.FSID, int64(450350219571))
+	assert.Equal(t, frd.FSID, int64(4550875))
 	assert.NotNil(t, frd.Results)
 
 	fsidLookupBad := &firststreet.Lookup{}
@@ -119,16 +117,16 @@ func TestHurricaneLookupCity(t *testing.T) {
 	frd, err = c.Lookup(firststreet.CityLocationType, latLngLookup)
 	assert.Nil(t, err)
 	assert.NotNil(t, frd)
-	assert.Equal(t, frd.FSID, int64(450350219571))
+	assert.Equal(t, frd.FSID, int64(4550875))
 	assert.NotNil(t, frd.Results)
 
 	addressLookup := &firststreet.Lookup{
-		Address: "1327 Autumn Drive Fernandina Beach FL",
+		Address: "Fernandina Beach FL",
 	}
 
 	frd, err = c.Lookup(firststreet.CityLocationType, addressLookup)
 	assert.Nil(t, err)
 	assert.NotNil(t, frd)
-	assert.Equal(t, frd.FSID, int64(450350219571))
+	assert.Equal(t, frd.FSID, int64(4550875))
 	assert.NotNil(t, frd.Results)
 }
diff --git a/marketvalueimpact/client_test.go b/marketvalueimpact/client_test.go
@@ -29,10 +29,21 @@ func marketValueImpactPropertyHandler() http.HandlerFunc {
 	})
 }
 
-func TestMVILookup(t *testing.T) {
-	testutil.Once.Do(func() {
-		testutil.StartServer(marketValueImpactPropertyHandler())
+func marketValueImpactCityHandler() http.HandlerFunc {
+	mviSample, err := ioutil.ReadFile(testutil.GetDirectoryPath() + "/fixtures/mvi-city.json")
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// nolint
+		w.Write(mviSample)
 	})
+}
+
+func TestMVIPropertyLookup(t *testing.T) {
+	testutil.StartServer(marketValueImpactPropertyHandler())
+
 	testBackend.URL = testutil.ServerAddr
 	c := &Client{
 		B: testBackend,
@@ -74,3 +85,48 @@ func TestMVILookup(t *testing.T) {
 	assert.NotNil(t, mvi.Results)
 
 }
+
+func TestMVICityLookup(t *testing.T) {
+	testutil.StartServer(marketValueImpactCityHandler())
+
+	testBackend.URL = testutil.ServerAddr
+	c := &Client{
+		B: testBackend,
+	}
+
+	fsidLookup := &firststreet.Lookup{
+		FSID: 1222175,
+	}
+
+	mvi, err := c.Lookup(firststreet.CityLocationType, fsidLookup)
+	assert.Nil(t, err)
+	assert.NotNil(t, mvi)
+	assert.Equal(t, mvi.FSID, int64(1222175))
+	assert.NotNil(t, mvi.Results)
+
+	fsidLookupBad := &firststreet.Lookup{}
+	_, err = c.Lookup(firststreet.CityLocationType, fsidLookupBad)
+	assert.NotNil(t, err)
+
+	latLngLookup := &firststreet.Lookup{
+		Lat: -43.23,
+		Lng: -23.12,
+	}
+
+	mvi, err = c.Lookup(firststreet.CityLocationType, latLngLookup)
+	assert.Nil(t, err)
+	assert.NotNil(t, mvi)
+	assert.Equal(t, mvi.FSID, int64(1222175))
+	assert.NotNil(t, mvi.Results)
+
+	addressLookup := &firststreet.Lookup{
+		Address: "Fernandina Beach FL",
+	}
+
+	mvi, err = c.Lookup(firststreet.CityLocationType, addressLookup)
+	assert.Nil(t, err)
+	assert.NotNil(t, mvi)
+	assert.Equal(t, mvi.FSID, int64(1222175))
+	assert.NotNil(t, mvi.Results)
+
+}
diff --git a/marketvalueimpact/fixtures/mvi-city.json b/marketvalueimpact/fixtures/mvi-city.json
@@ -0,0 +1,23 @@
+{
+  "FSID": 1222175,
+  "results": [{
+    "floodID": "kt",
+    "floodData": [{
+        "year": 2018,
+        "data": [{
+          "type": "loss_historic",
+          "unit": "dollars",
+          "value": -5993339.8641536
+        }]
+      },
+      {
+        "year": 2033,
+        "data": [{
+          "type": "loss_future",
+          "unit": "dollars",
+          "value": -6915392.15094647
+        }]
+      }
+    ]
+  }]
+}
diff --git a/tidal/client_test.go b/tidal/client_test.go
@@ -41,9 +41,8 @@ func tidalCityHandler() http.HandlerFunc {
 	})
 }
 func TestTidalLookupProperty(t *testing.T) {
-	testutil.Once.Do(func() {
-		testutil.StartServer(tidalPropertyHandler())
-	})
+	testutil.StartServer(tidalPropertyHandler())
+
 	testBackend.URL = testutil.ServerAddr
 	c := &Client{
 		B: testBackend,
@@ -87,22 +86,21 @@ func TestTidalLookupProperty(t *testing.T) {
 }
 
 func TestTidalLookupCity(t *testing.T) {
-	testutil.Once.Do(func() {
-		testutil.StartServer(tidalCityHandler())
-	})
+	testutil.StartServer(tidalCityHandler())
+
 	testBackend.URL = testutil.ServerAddr
 	c := &Client{
 		B: testBackend,
 	}
 
 	fsidLookup := &firststreet.Lookup{
-		FSID: 450350219571,
+		FSID: 4550875,
 	}
 
 	frd, err := c.Lookup(firststreet.CityLocationType, fsidLookup)
 	assert.Nil(t, err)
 	assert.NotNil(t, frd)
-	assert.Equal(t, frd.FSID, int64(450350219571))
+	assert.Equal(t, frd.FSID, int64(4550875))
 	assert.NotNil(t, frd.Results)
 
 	fsidLookupBad := &firststreet.Lookup{}
@@ -117,16 +115,16 @@ func TestTidalLookupCity(t *testing.T) {
 	frd, err = c.Lookup(firststreet.CityLocationType, latLngLookup)
 	assert.Nil(t, err)
 	assert.NotNil(t, frd)
-	assert.Equal(t, frd.FSID, int64(450350219571))
+	assert.Equal(t, frd.FSID, int64(4550875))
 	assert.NotNil(t, frd.Results)
 
 	addressLookup := &firststreet.Lookup{
-		Address: "1327 Autumn Drive Fernandina Beach FL",
+		Address: "Fernandina Beach FL",
 	}
 
 	frd, err = c.Lookup(firststreet.CityLocationType, addressLookup)
 	assert.Nil(t, err)
 	assert.NotNil(t, frd)
-	assert.Equal(t, frd.FSID, int64(450350219571))
+	assert.Equal(t, frd.FSID, int64(4550875))
 	assert.NotNil(t, frd.Results)
 }