Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement inequality operators (<, >, <=, >=) in the enable when statement #848

Merged
merged 20 commits into from
Nov 25, 2021
Merged

Implement inequality operators (<, >, <=, >=) in the enable when statement #848

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
eb0d5df
Create common module
santosh-pingle Oct 21, 2021
bd9477d
Support inequality operators > < >= <=
santosh-pingle Oct 20, 2021
9ad0c4e
unit converter
santosh-pingle Oct 20, 2021
e75efcf
Revert unwanted change from file.
santosh-pingle Oct 20, 2021
06eab1d
Refactoring
santosh-pingle Oct 20, 2021
06d4aeb
api doc
santosh-pingle Oct 20, 2021
df1d3d6
Tests quantity with different units
santosh-pingle Oct 21, 2021
64cb0ad
Remove UnitConverter file datacapture
santosh-pingle Oct 21, 2021
91879d6
Merge branch 'master' into sp/inequality
santosh-pingle Nov 9, 2021
8f781c2
Undo changes.
santosh-pingle Nov 16, 2021
91a68fa
Merge branch 'master' into sp/inequality
santosh-pingle Nov 18, 2021
90f4327
Review changes.
santosh-pingle Nov 18, 2021
554c82b
update test
santosh-pingle Nov 18, 2021
000fa9e
Update operators.
santosh-pingle Nov 19, 2021
b13da2d
Merge branch 'master' into sp/inequality
santosh-pingle Nov 19, 2021
196978f
Review comment changes.
santosh-pingle Nov 23, 2021
236a73c
Merge branch 'master' into sp/inequality
santosh-pingle Nov 23, 2021
40b1907
Review comment code changes.
santosh-pingle Nov 25, 2021
51b93d7
Merge branch 'master' into sp/inequality
santosh-pingle Nov 25, 2021
edeff1d
remove test for null type.
santosh-pingle Nov 25, 2021
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
Prev Previous commit
Next Next commit
Review comment code changes.
  • Loading branch information
@santosh-pingle
santosh-pingle committed Nov 25, 2021
commit 40b19077c8b73809765ff0f6924d0952ae038df9
65 changes: 31 additions & 34 deletions common/src/main/java/com/google/android/fhir/MoreTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,42 +42,39 @@ fun equals(a: Type, b: Type): Boolean {
throw NotImplementedError("Comparison for type ${a::class.java} not supported.")
}

operator fun Type.compareTo(value: Type?): Int {
if (value != null) {
if (!this.fhirType().equals(value.fhirType())) {
throw IllegalArgumentException(
"Cannot compare different data types: ${this.fhirType()} and ${value.fhirType()}"
)
operator fun Type.compareTo(value: Type): Int {
if (!this.fhirType().equals(value.fhirType())) {
throw IllegalArgumentException(
"Cannot compare different data types: ${this.fhirType()} and ${value.fhirType()}"
)
}
when {
this.fhirType().equals("integer") -> {
return this.primitiveValue().toInt().compareTo(value.primitiveValue().toInt())
}
when {
this.fhirType().equals("integer") -> {
return this.primitiveValue().toInt().compareTo(value.primitiveValue().toInt())
}
this.fhirType().equals("decimal") -> {
return this.primitiveValue().toBigDecimal().compareTo(value.primitiveValue().toBigDecimal())
}
this.fhirType().equals("date") -> {
return clearTimeFromDateValue(this.dateTimeValue().value)
.compareTo(clearTimeFromDateValue(value.dateTimeValue().value))
}
this.fhirType().equals("dateTime") -> {
return this.dateTimeValue().value.compareTo(value.dateTimeValue().value)
}
this.fhirType().equals("Quantity") -> {
val quantity =
UnitConverter.getCanonicalForm(UcumValue((this as Quantity).code, this.value))
val anotherQuantity =
UnitConverter.getCanonicalForm(UcumValue((value as Quantity).code, value.value))
if (quantity.code != anotherQuantity.code) {
throw IllegalArgumentException(
"Cannot compare different quantity codes: ${quantity.code} and ${anotherQuantity.code}"
)
}
return quantity.value.compareTo(anotherQuantity.value)
}
else -> {
throw NotImplementedError()
this.fhirType().equals("decimal") -> {
return this.primitiveValue().toBigDecimal().compareTo(value.primitiveValue().toBigDecimal())
}
this.fhirType().equals("date") -> {
return clearTimeFromDateValue(this.dateTimeValue().value)
.compareTo(clearTimeFromDateValue(value.dateTimeValue().value))
}
this.fhirType().equals("dateTime") -> {
return this.dateTimeValue().value.compareTo(value.dateTimeValue().value)
}
this.fhirType().equals("Quantity") -> {
val quantity = UnitConverter.getCanonicalForm(UcumValue((this as Quantity).code, this.value))
val anotherQuantity =
UnitConverter.getCanonicalForm(UcumValue((value as Quantity).code, value.value))
if (quantity.code != anotherQuantity.code) {
throw IllegalArgumentException(
"Cannot compare different quantity codes: ${quantity.code} and ${anotherQuantity.code}"
)
}
return quantity.value.compareTo(anotherQuantity.value)
}
else -> {
throw NotImplementedError()
}
}
return 0
Expand Down
208 changes: 104 additions & 104 deletions ...e/src/test/java/com/google/android/fhir/datacapture/enablement/EnablementEvaluatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,110 @@ class EnablementEvaluatorTest {
.isFalse()
}

@Test
fun evaluate_expectAnswerGreaterThanValue_someAnswerGreaterThanValue_shouldReturnTrue() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.GREATER_THAN,
expected = IntegerType(10),
actual = listOf(IntegerType(20))
)
)
.isTrue()
}

@Test
fun evaluate_expectAnswerGreaterThanValue_noAnswerGreaterThanValue_shouldReturnFalse() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.GREATER_THAN,
expected = IntegerType(10),
actual = listOf(IntegerType(5))
)
)
.isFalse()
}

@Test
fun evaluate_expectAnswerGreaterThanOrEqualToValue_someAnswerGreaterThanOrEqualToValue_shouldReturnTrue() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.GREATER_OR_EQUAL,
expected = IntegerType(10),
actual = listOf(IntegerType(10))
)
)
.isTrue()
}

@Test
fun evaluate_expectAnswerGreaterThanOrEqualToValue_noAnswerGreaterThanOrEqualToValue_shouldReturnFalse() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.GREATER_OR_EQUAL,
expected = IntegerType(10),
actual = listOf(IntegerType(5))
)
)
.isFalse()
}

@Test
fun evaluate_expectAnswerLessThanValue_someAnswerLessThanValue_shouldReturnTrue() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.LESS_THAN,
expected = IntegerType(10),
actual = listOf(IntegerType(5))
)
)
.isTrue()
}

@Test
fun evaluate_expectAnswerLessThanValue_noAnswerLessThanValue_shouldReturnFalse() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.LESS_THAN,
expected = IntegerType(10),
actual = listOf(IntegerType(20))
)
)
.isFalse()
}

@Test
fun evaluate_expectAnswerLessThanOrEqualToValue_someAnswerLessThanOrEqualToValue_shouldReturnTrue() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.LESS_OR_EQUAL,
expected = IntegerType(10),
actual = listOf(IntegerType(10))
)
)
.isTrue()
}

@Test
fun evaluate_expectAnswerLessThanOrEqualToValue_noAnswerLessThanOrEqualToValue_shouldReturnFalse() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.LESS_OR_EQUAL,
expected = IntegerType(10),
actual = listOf(IntegerType(20))
)
)
.isFalse()
}

@Test
fun evaluate_multipleEnableWhens_behaviorAny_noneSatisfied_shouldReturnFalse() {
evaluateEnableWhen(
Expand Down Expand Up @@ -383,110 +487,6 @@ class EnablementEvaluatorTest {
.isFalse()
}

@Test
fun evaluate_greaterThan_answersGreaterThanEnableWhenAnswer_shouldReturnTrue() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.GREATER_THAN,
expected = IntegerType(10),
actual = listOf(IntegerType(20))
)
)
.isTrue()
}

@Test
fun evaluate_greaterThan_noAnswersGreaterThanEnableWhenAnswer_shouldReturnFalse() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.GREATER_THAN,
expected = IntegerType(10),
actual = listOf(IntegerType(5))
)
)
.isFalse()
}

@Test
fun evaluate_greaterOrEqual_answersGreaterOrEqualEnableWhenAnswer_shouldReturnTrue() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.GREATER_OR_EQUAL,
expected = IntegerType(10),
actual = listOf(IntegerType(10))
)
)
.isTrue()
}

@Test
fun evaluate_greaterOrEqual_noAnswersGreaterOrEqualEnableWhenAnswer_shouldReturnFalse() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.GREATER_OR_EQUAL,
expected = IntegerType(10),
actual = listOf(IntegerType(5))
)
)
.isFalse()
}

@Test
fun evaluate_lessThan_answersLessThanEnableWhenAnswer_shouldReturnTrue() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.LESS_THAN,
expected = IntegerType(10),
actual = listOf(IntegerType(5))
)
)
.isTrue()
}

@Test
fun evaluate_lessThan_noAnswersLessThanEnableWhenAnswer_shouldReturnFalse() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.LESS_THAN,
expected = IntegerType(10),
actual = listOf(IntegerType(20))
)
)
.isFalse()
}

@Test
fun evaluate_lessOrEqual_answerLessOrEqualEnableWhenAnswer_shouldReturnTrue() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.LESS_OR_EQUAL,
expected = IntegerType(10),
actual = listOf(IntegerType(10))
)
)
.isTrue()
}

@Test
fun evaluate_lessOrEqual_noAnswerLessOrEqualEnableWhenAnswer_shouldReturnFalse() {
evaluateEnableWhen(
behavior = null,
EnableWhen(
operator = Questionnaire.QuestionnaireItemOperator.LESS_OR_EQUAL,
expected = IntegerType(10),
actual = listOf(IntegerType(20))
)
)
.isFalse()
}

/**
* Evaluates multiple `enableWhen` constraints according to the `behavior` (any or all).
*
Expand Down