Merge pull request #4 from BlockScore/fix/failing_test

Fix searchWatchlists and a failing test

Author: dgollahon

src/main/java/com/blockscore/models/Candidate.java

@@ -161,8 +161,14 @@ public PaginatedResult<WatchlistHit> searchWatchlists(EntityType entityType) {
   public PaginatedResult<WatchlistHit> searchWatchlists(EntityType entityType, Double similarityThreshold) {
     Map<String, String> queryOptions = new HashMap<String, String>();
     queryOptions.put("candidate_id", getId());
-    queryOptions.put("match_type", String.valueOf(entityType));
-    queryOptions.put("similarity_threshold", String.valueOf(similarityThreshold));
+
+    if (entityType != null) {
+      queryOptions.put("match_type", String.valueOf(entityType));
+    }
+
+    if (similarityThreshold != null) {
+      queryOptions.put("similarity_threshold", String.valueOf(similarityThreshold));
+    }
 
     WatchlistSearchResults results = restAdapter.searchWatchlists(queryOptions);
 

src/test/java/com/blockscore/models/CompanyTest.java

@@ -75,8 +75,16 @@ public void testCompanyRetrieval_InvalidId() {
 
   @Test
   public void testCompanyListing() {
-    PaginatedResult<Company> companies = client.listCompanies();
-    assertCompaniesAreValid(companies.getData());
+    for (Company company : client.listCompanies().getData()) {
+      assertBasicResponseIsValid(company);
+      assertNotNull(company.getId());
+      assertNotNull(company.getEntityName());
+      assertNotNull(company.getTaxId());
+      assertNotNull(company.getIncorporationCountryCode());
+      assertNotNull(company.getIncorporationType());
+      assertDetailsAreValid(company.getDetails());
+      assertAddressIsValid(company.getAddress());
+    }
   }
 
   /*------------------*/
@@ -176,12 +184,4 @@ private void assertDetailsAreValid(final CompanyDetails details) {
     assertNotNull(details.getStateMatch());
     assertNotNull(details.getTaxIdMatch());
   }
-
-  private void assertCompaniesAreValid(final List<Company> companies) {
-    assertNotNull(companies);
-
-    for (Company company : companies) {
-      assertCompanyIsValid(company);
-    }
-  }
 }