Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions api/src/test/java/org/openmrs/validator/ConditionValidatorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.Locale;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.Test;
import org.junit.Before;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

import org.openmrs.CodedOrFreeText;
import org.openmrs.Cohort;
import org.openmrs.Concept;
Expand Down Expand Up @@ -71,11 +74,19 @@ public void shouldFailIfGivenConditionWithNullConditionProperties(){

@Test
public void shouldPassIfConditionClassIsPassedWithRequiredConditionProperties(){
Condition condition = new Condition();
condition.setCondition(new CodedOrFreeText(new Concept(), new ConceptName("name", new Locale("en")), "nonCoded"));
condition.setClinicalStatus(ConditionClinicalStatus.ACTIVE);
validator.validate(condition, errors);
assertFalse(errors.hasFieldErrors("condition"));
assertFalse(errors.hasFieldErrors("clinicalStatus"));
Condition condition = new Condition();
Errors errors = new BindException(condition, "condition");

condition.setCondition(new CodedOrFreeText(
new Concept(),
new ConceptName("name", new Locale("en")),
"nonCoded"
));
condition.setClinicalStatus(ConditionClinicalStatus.ACTIVE);

validator.validate(condition, errors);

assertFalse(errors.hasFieldErrors("condition"));
assertFalse(errors.hasFieldErrors("clinicalStatus"));
}
}