Merge pull request #303 from TreeBASE/copilot/refactor-test-query-validations

Refactor database query tests to handle empty result sets

Author: rvosa

treebase-core/src/test/java/org/cipres/treebase/dao/admin/PersonDAOTest.java

@@ -105,22 +105,27 @@ public void testFindByID() {
 		// 1. find a valid id first:
 		List<String> ids = jdbcTemplate.queryForList("select person_id from person", String.class);
 
+		// 2. verify correct handling of empty database
+		assertNotNull("Query should return non-null list", ids);
+		
 		if (ids.size() > 0) {
-			assertTrue("Empty Person table.", ids.size() > 0);
-
-			// 2. find by user name:
+			// 3. find by user name:
 			PersonHome fixture = getPersonHome();
 			Long anId = Long.parseLong(ids.get(0));
 
 			Person result = fixture.findPersistedObjectByID(Person.class, anId);
 
-			// 3. verify
+			// 4. verify
 			assertTrue("Result is null", result != null);
 			assertTrue("Result id does not match.", result.getId().equals(anId));
 
 			if (logger.isInfoEnabled()) {
 				logger.info(testName + " verified id =" + anId);
 			}
+		} else {
+			if (logger.isInfoEnabled()) {
+				logger.info(testName + " - empty database, test skipped");
+			}
 		}
 
 	}
@@ -137,26 +142,30 @@ public void testFindByExactMatch() throws Exception {
 		// 1. find a valid person first:
 		Person p = (Person) loadObject(Person.class);
 
-		assertTrue("Empty Person table.", p != null);
-
-		// 2. create a new person object and test:
-		Person newP = new Person();
-		newP.setEmailAddressString(p.getEmailAddressString());
-		newP.setFirstName(p.getFirstName());
-		newP.setLastName(p.getLastName());
+		if (p != null) {
+			// 2. create a new person object and test:
+			Person newP = new Person();
+			newP.setEmailAddressString(p.getEmailAddressString());
+			newP.setFirstName(p.getFirstName());
+			newP.setLastName(p.getLastName());
 
-		PersonHome fixture = getPersonHome();
-		Person result = fixture.findByExactMatch(newP);
+			PersonHome fixture = getPersonHome();
+			Person result = fixture.findByExactMatch(newP);
 
-		// 3. verify
-		assertTrue(result != null);
-		assertTrue(result.getLastName().equals(result.getLastName()));
+			// 3. verify
+			assertTrue(result != null);
+			assertTrue(result.getLastName().equals(result.getLastName()));
 
-		// Notes: this is a dangerous verification. Let's see if it works:
-		assertTrue(result.getId().equals(p.getId()));
+			// Notes: this is a dangerous verification. Let's see if it works:
+			assertTrue(result.getId().equals(p.getId()));
 
-		if (logger.isInfoEnabled()) {
-			logger.info(testName + " verified id =" + p.getId() + " lastname =" + p.getLastName());
+			if (logger.isInfoEnabled()) {
+				logger.info(testName + " verified id =" + p.getId() + " lastname =" + p.getLastName());
+			}
+		} else {
+			if (logger.isInfoEnabled()) {
+				logger.info(testName + " - empty database, test skipped");
+			}
 		}
 
 	}
@@ -175,15 +184,16 @@ public void testFindByLastName() {
 			"select lastname from person",
 			String.class);
 
+		// 2. verify correct handling of empty database
+		assertNotNull("Query should return non-null list", lastNames);
+		
 		if (lastNames.size() > 0) {
-			assertTrue("Empty Person table.", lastNames.size() > 0);
-
-			// 2. find by last name:
+			// 3. find by last name:
 			PersonHome fixture = getPersonHome();
 			String lastName = lastNames.get(0);
 			Collection<Person> results = fixture.findByLastName(lastName);
 
-			// 3. verify
+			// 4. verify
 			assertTrue(results != null && !results.isEmpty());
 
 			for (Person person : results) {
@@ -193,6 +203,10 @@ public void testFindByLastName() {
 			if (logger.isInfoEnabled()) {
 				logger.info(testName + " verified lastname =" + lastName);
 			}
+		} else {
+			if (logger.isInfoEnabled()) {
+				logger.info(testName + " - empty database, test skipped");
+			}
 		}
 
 	}
@@ -211,15 +225,16 @@ public void testFindCompleteEmailAddress() {
 			"select email from person where email is not null",
 			String.class);
 
+		// 2. verify correct handling of empty database
+		assertNotNull("Query should return non-null list", emails);
+		
 		if (emails.size() > 0) {
-			assertTrue("Empty Person table.", emails.size() > 0);
-
-			// 2. find:
+			// 3. find:
 			PersonHome fixture = getPersonHome();
 			String partialMatch = "Te";
 			Collection<String> results = fixture.findCompleteEmailAddress(partialMatch);
 
-			// 3. verify
+			// 4. verify
 			assertTrue(results != null && !results.isEmpty());
 
 			for (String anEmail : results) {
@@ -229,6 +244,10 @@ public void testFindCompleteEmailAddress() {
 			if (logger.isInfoEnabled()) {
 				logger.info(testName + " verified partialmatch size =" + results.size());
 			}
+		} else {
+			if (logger.isInfoEnabled()) {
+				logger.info(testName + " - empty database, test skipped");
+			}
 		}
 
 	}