--- dao/DaoAdresseService/src/test/java/dk/daoas/daoadresseservice/test/AddressSearchTest.java 2015/07/15 13:48:40 2618 +++ dao/DaoAdresseService/src/test/java/dk/daoas/daoadresseservice/test/AddressSearchTest.java 2015/07/16 06:00:15 2619 @@ -37,7 +37,6 @@ SearchResult res = search.search("8700", "Vestergade 1"); - assertNotNull(res); assertEquals(SearchResult.Status.STATUS_OK, res.status); assertEquals(DaekningsType.DAEKNING_DIREKTE, res.address.daekningsType); } @@ -50,7 +49,6 @@ public void testFailureIllegalPostal() { SearchResult res = search.search("asdf", "Vestergade 10"); - assertNotNull(res); assertEquals(SearchResult.Status.ERROR_UNKNOWN_POSTAL, res.status); } @@ -61,7 +59,6 @@ public void testFailurePostal() { SearchResult res = search.search("1234", "Vestergade 10"); - assertNotNull(res); assertEquals(SearchResult.Status.ERROR_UNKNOWN_POSTAL, res.status); } @@ -72,7 +69,6 @@ public void testFailureMissingHousenumber() { SearchResult res = search.search("8700", "Vestergade"); - assertNotNull(res); assertEquals(SearchResult.Status.ERROR_MISSING_HOUSENUMBER, res.status); } @@ -83,7 +79,6 @@ public void testFailureUnkownStreetname() { SearchResult res = search.search("8700", "Nonsensgade 1"); - assertNotNull(res); assertEquals(SearchResult.Status.ERROR_UNKNOWN_STREETNAME, res.status); } @@ -95,18 +90,15 @@ SearchResult res; res = search.search("8700", "Vstergade 1"); - assertNotNull(res); assertEquals(SearchResult.Status.STATUS_OK, res.status); assertEquals(DaekningsType.DAEKNING_DIREKTE, res.address.daekningsType); res = search.search("8700", "Vtergade 1"); - assertNotNull(res); assertEquals(SearchResult.Status.STATUS_OK, res.status); assertEquals(DaekningsType.DAEKNING_DIREKTE, res.address.daekningsType); res = search.search("8700", "Vergade 1"); - assertNotNull(res); assertEquals(SearchResult.Status.ERROR_UNKNOWN_STREETNAME, res.status); } @@ -121,9 +113,28 @@ public void testFailureUnkownHousenumber() { SearchResult res = search.search("8700", "Vestergade 10"); - assertNotNull(res); assertEquals(SearchResult.Status.ERROR_UNKNOWN_ADDRESSPOINT, res.status); } + /** + * Adressen kendt men uden for dækning + */ + + @Test + public void testNotCovered() { + SearchResult res = search.search("8800", "Enebærvej 2"); + + assertEquals(SearchResult.Status.STATUS_NOT_COVERED, res.status); + } + + /** + * Adressen kendt men markeret lukket + */ + @Test + public void testClosed() { + SearchResult res = search.search("8300", "Sønderbrogade 4"); + + assertEquals(SearchResult.Status.STATUS_NOT_COVERED, res.status); + } }