Update operators.

datacapture/src/main/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluator.kt

@@ -18,7 +18,6 @@ package com.google.android.fhir.datacapture.enablement
 
 import com.google.android.fhir.compareTo
 import com.google.android.fhir.equals
-import java.lang.IllegalStateException
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
 
@@ -129,24 +128,16 @@ private val Questionnaire.QuestionnaireItemEnableWhenComponent.predicate:
  !equals(it.value, answer)
  }
  Questionnaire.QuestionnaireItemOperator.GREATER_THAN -> {
- // True if whether at least no answer has a value that is greater than the enableWhen
- // answer.
- answer >= it.value
+ it.value > answer
  }
  Questionnaire.QuestionnaireItemOperator.GREATER_OR_EQUAL -> {
- // True if whether at least no answer has a value that is greater or equal to the
- // enableWhen answer.
- answer > it.value
+ it.value >= answer
  }
  Questionnaire.QuestionnaireItemOperator.LESS_THAN -> {
- // True if whether at least no answer has a value that is less than the enableWhen
- // answer.
- answer <= it.value
+ it.value < answer
  }
  Questionnaire.QuestionnaireItemOperator.LESS_OR_EQUAL -> {
- // True if whether at least no answer has a value that is less or equal to the
- // enableWhen answer.
- answer < it.value
+ it.value <= answer
  }
  else -> throw NotImplementedError("Enable when operator $operator is not implemented.")
  }

datacapture/src/test/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluatorTest.kt

@@ -386,117 +386,117 @@ class EnablementEvaluatorTest {
  }
 
  @Test
- fun evaluate_greaterThan_noAnswersGreaterThanEnableWhenAnswer_shouldReturnTrue() {
+ fun evaluate_greaterThan_answersGreaterThanEnableWhenAnswer_shouldReturnTrue() {
  evaluateEnableWhen(
  behavior = null,
  EnableWhen(
  operator = Questionnaire.QuestionnaireItemOperator.GREATER_THAN,
  expected = IntegerType(10),
- actual = listOf(IntegerType(5))
+ actual = listOf(IntegerType(20))
  )
  )
  .isTrue()
  }
 
  @Test
- fun evaluate_greaterThan_answersGreaterThanEnableWhenAnswer_shouldReturnFalse() {
+ fun evaluate_greaterThan_noAnswersGreaterThanEnableWhenAnswer_shouldReturnFalse() {
  evaluateEnableWhen(
  behavior = null,
  EnableWhen(
  operator = Questionnaire.QuestionnaireItemOperator.GREATER_THAN,
  expected = IntegerType(10),
- actual = listOf(IntegerType(20))
+ actual = listOf(IntegerType(5))
  )
  )
  .isFalse()
  }
 
  @Test
- fun evaluate_greaterOrEqual_noAnswersGreaterOrEqualEnableWhenAnswer_shouldReturnTrue() {
+ fun evaluate_greaterOrEqual_answersGreaterOrEqualEnableWhenAnswer_shouldReturnTrue() {
  evaluateEnableWhen(
  behavior = null,
  EnableWhen(
  operator = Questionnaire.QuestionnaireItemOperator.GREATER_OR_EQUAL,
  expected = IntegerType(10),
- actual = listOf(IntegerType(5))
+ actual = listOf(IntegerType(10))
  )
  )
  .isTrue()
  }
 
  @Test
- fun evaluate_greaterOrEqual_answersGreaterOrEqualEnableWhenAnswer_shouldReturnFalse() {
+ fun evaluate_greaterOrEqual_noAnswersGreaterOrEqualEnableWhenAnswer_shouldReturnFalse() {
  evaluateEnableWhen(
  behavior = null,
  EnableWhen(
  operator = Questionnaire.QuestionnaireItemOperator.GREATER_OR_EQUAL,
  expected = IntegerType(10),
- actual = listOf(IntegerType(10))
+ actual = listOf(IntegerType(5))
  )
  )
  .isFalse()
  }
 
  @Test
- fun evaluate_lessThan_noAnswersLessThanEnableWhenAnswer_shouldReturnTrue() {
+ fun evaluate_lessThan_answersLessThanEnableWhenAnswer_shouldReturnTrue() {
  evaluateEnableWhen(
  behavior = null,
  EnableWhen(
  operator = Questionnaire.QuestionnaireItemOperator.LESS_THAN,
  expected = IntegerType(10),
- actual = listOf(IntegerType(20))
+ actual = listOf(IntegerType(5))
  )
  )
  .isTrue()
  }
 
  @Test
- fun evaluate_lessThan_answersLessThanEnableWhenAnswer_shouldReturnFalse() {
+ fun evaluate_lessThan_noAnswersLessThanEnableWhenAnswer_shouldReturnFalse() {
  evaluateEnableWhen(
  behavior = null,
  EnableWhen(
  operator = Questionnaire.QuestionnaireItemOperator.LESS_THAN,
  expected = IntegerType(10),
- actual = listOf(IntegerType(5))
+ actual = listOf(IntegerType(20))
  )
  )
  .isFalse()
  }
 
  @Test
- fun evaluate_lessOrEqual_noAnswerLessOrEqualEnableWhenAnswer_shouldReturnTrue() {
+ fun evaluate_lessOrEqual_answerLessOrEqualEnableWhenAnswer_shouldReturnTrue() {
  evaluateEnableWhen(
  behavior = null,
  EnableWhen(
  operator = Questionnaire.QuestionnaireItemOperator.LESS_OR_EQUAL,
  expected = IntegerType(10),
- actual = listOf(IntegerType(20))
+ actual = listOf(IntegerType(10))
  )
  )
  .isTrue()
  }
 
  @Test
- fun evaluate_lessOrEqual_answerLessOrEqualEnableWhenAnswer_shouldReturnFalse() {
+ fun evaluate_lessOrEqual_noAnswerLessOrEqualEnableWhenAnswer_shouldReturnFalse() {
  evaluateEnableWhen(
  behavior = null,
  EnableWhen(
  operator = Questionnaire.QuestionnaireItemOperator.LESS_OR_EQUAL,
  expected = IntegerType(10),
- actual = listOf(IntegerType(10))
+ actual = listOf(IntegerType(20))
  )
  )
  .isFalse()
  }
 
  @Test
- fun evaluate_quantityType_lessOrEqual_noAnswerLessOrEqualEnableWhenAnswer_shouldReturnTrue() {
+ fun evaluate_quantityType_lessOrEqual_answerLessOrEqualEnableWhenAnswer_shouldReturnTrue() {
  evaluateEnableWhen(
  behavior = null,
  EnableWhen(
  operator = Questionnaire.QuestionnaireItemOperator.LESS_OR_EQUAL,
  expected = Quantity().setCode("h").setValue(10),
- actual = listOf(Quantity().setCode("h").setValue(20))
+ actual = listOf(Quantity().setCode("h").setValue(5))
  )
  )
  .isTrue()