TRUNK-3190: add unit test for HibernateConceptDAO.getConceptsByAnswer

david · dkayiwa · commit ae0957ee9075 · 2013-03-01T13:57:52.000+03:00
(cherry picked from commit 34d76e2)
diff --git a/api/src/main/java/org/openmrs/api/db/ConceptDAO.java b/api/src/main/java/org/openmrs/api/db/ConceptDAO.java
@@ -243,6 +243,7 @@ public List<ConceptSearchResult> getConcepts(String phrase, List<Locale> locales
 	
 	/**
 	 * @see org.openmrs.api.ConceptService#getConceptsByAnswer(org.openmrs.Concept)
+	 * @should return concepts for the given answer concept
 	 */
 	public List<Concept> getConceptsByAnswer(Concept concept) throws DAOException;
 	
diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
@@ -635,7 +635,6 @@ public List<ConceptWord> getConceptWords(String phrase, List<Locale> locales, bo
 	 */
 	@SuppressWarnings("unchecked")
 	public List<Concept> getConceptsByAnswer(Concept concept) {
-		// TODO broken until Hibernate fixes component and HQL code
 		String q = "select c from Concept c join c.answers ca where ca.answerConcept = :answer";
 		Query query = sessionFactory.getCurrentSession().createQuery(q);
 		query.setParameter("answer", concept);
diff --git a/api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java b/api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
@@ -439,4 +439,19 @@ public void getConcepts_shouldNotReturnConceptsWithMatchingNamesThatAreVoided()
 		Assert.assertEquals(0, dao.getConcepts("VOIDED", null, false, new ArrayList<ConceptClass>(),
 		    new ArrayList<ConceptDatatype>()).size());
 	}
+	
+	/**
+	 * @see ConceptDAO#getConceptsByAnswer(Concept)
+	 * @verifies return concepts for the given answer concept
+	 */
+	@Test
+	public void getConceptsByAnswer_shouldReturnConceptsForTheGivenAnswerConcept() throws Exception {
+		Concept concept = dao.getConcept(22);
+		List<Concept> conceptsByAnswer = dao.getConceptsByAnswer(concept);
+		Assert.assertNotNull(conceptsByAnswer);
+		Assert.assertEquals(1, conceptsByAnswer.size());
+		Concept conceptByAnswer = conceptsByAnswer.get(0);
+		Assert.assertEquals(21, conceptByAnswer.getConceptId().intValue());
+	}
+	
 }
