Skip to content
New issue

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

#

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

Already on GitHub? # to your account

SO-4944: Update ECL to version 1.6 #915

Merged
merged 3 commits into from
Oct 13, 2021
Merged

SO-4944: Update ECL to version 1.6 #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e637a31
feat(ecl): Update ECL property filter evaluation
apeteri Oct 8, 2021
1fcedaa
test(ecl): Update property filter test cases
apeteri Oct 8, 2021
3db66da
chore(releng): Update ECL dependency to 1.6.0 release
apeteri Oct 8, 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
6 changes: 3 additions & 3 deletions releng/target-platform/target-platform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.3/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="mvn:com.b2international:com.b2international.snomed.ecl.update:1.5.2:zip"/>
<unit id="com.b2international.snomed.ecl.feature.feature.group" version="1.5.2"/>
<unit id="com.b2international.snomed.ecl.ui.feature.feature.group" version="1.5.2"/>
<repository location="mvn:com.b2international:com.b2international.snomed.ecl.update:1.6.0:zip"/>
<unit id="com.b2international.snomed.ecl.feature.feature.group" version="1.6.0"/>
<unit id="com.b2international.snomed.ecl.ui.feature.feature.group" version="1.6.0"/>
</location>
</locations>
</target>
2 changes: 1 addition & 1 deletion snomed/com.b2international.snowowl.snomed.core.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Visit us at http://b2i.sg

<requires>
<import feature="com.b2international.snowowl.core.feature" version="8.0.0" match="compatible"/>
<import feature="com.b2international.snomed.ecl.feature" version="1.5.2"/>
<import feature="com.b2international.snomed.ecl.feature" version="1.6.0"/>
</requires>

<plugin
Expand Down
87 changes: 53 additions & 34 deletions ...b2international/snowowl/snomed/core/ecl/SnomedEclEvaluationRequestPropertyFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ public SnomedEclEvaluationRequestPropertyFilterTest(String expressionForm, boole

@Test
public void activeOnly() throws Exception {
final Expression actual = eval("* {{ active=true }}");
final Expression actual = eval("* {{ c active=true }}");
final Expression expected = SnomedDocument.Expressions.active();
assertEquals(expected, actual);
}

@Test
public void inactiveOnly() throws Exception {
final Expression actual = eval("* {{ active=false }}");
final Expression actual = eval("* {{ c active=false }}");
final Expression expected = SnomedDocument.Expressions.inactive();
assertEquals(expected, actual);
}

@Test
public void moduleId() throws Exception {
final Expression actual = eval("* {{ moduleId= " + Concepts.MODULE_SCT_CORE + " }}");
final Expression actual = eval("* {{ c moduleId= " + Concepts.MODULE_SCT_CORE + " }}");
final Expression expected = SnomedDocument.Expressions.modules(List.of(Concepts.MODULE_SCT_CORE));
assertEquals(expected, actual);
}
Expand Down Expand Up @@ -90,7 +90,7 @@ public void termLessThanTwoChars() throws Exception {

@Test
public void conjunctionActiveAndModuleId() throws Exception {
final Expression actual = eval("* {{ active = true, moduleId = " + Concepts.MODULE_SCT_CORE + " }}");
final Expression actual = eval("* {{ c active = true, moduleId = " + Concepts.MODULE_SCT_CORE + " }}");
final Expression expected = Expressions.builder()
.filter(SnomedDocument.Expressions.active())
.filter(SnomedDocument.Expressions.modules(List.of(Concepts.MODULE_SCT_CORE)))
Expand Down Expand Up @@ -125,7 +125,7 @@ public void termDisjunction() throws Exception {

@Test
public void disjunctionActiveAndModuleId() throws Exception {
final Expression actual = eval("* {{ active = true OR moduleId = " + Concepts.MODULE_SCT_CORE + " }}");
final Expression actual = eval("* {{ c active = true OR moduleId = " + Concepts.MODULE_SCT_CORE + " }}");
final Expression expected = Expressions.builder()
.should(SnomedDocument.Expressions.active())
.should(SnomedDocument.Expressions.modules(List.of(Concepts.MODULE_SCT_CORE)))
Expand All @@ -135,12 +135,12 @@ public void disjunctionActiveAndModuleId() throws Exception {

@Test(expected = BadRequestException.class)
public void conjunctionDomainInconsistency() throws Exception {
eval("* {{ active=true AND Description.moduleId = "+ Concepts.MODULE_SCT_CORE +" }}");
eval("* {{ active=true AND definitionStatusId = "+ Concepts.MODULE_SCT_CORE +" }}");
}

@Test(expected = BadRequestException.class)
public void disjunctionDomainInconsistency() throws Exception {
eval("* {{ Description.active=true OR moduleId = "+ Concepts.MODULE_SCT_CORE +" }}");
eval("* {{ active=true OR definitionStatusId = "+ Concepts.MODULE_SCT_CORE +" }}");
}

@Test
Expand All @@ -161,22 +161,22 @@ public void descriptionType() throws Exception {

@Test(expected = BadRequestException.class)
public void conjunctionAmbiguity() throws Exception {
eval("* {{ Description.active=true AND Description.moduleId = " + Concepts.MODULE_SCT_CORE + " OR term=\"clinical finding\" }}");
eval("* {{ active=true AND moduleId = " + Concepts.MODULE_SCT_CORE + " OR term=\"clinical finding\" }}");
}

@Test(expected = BadRequestException.class)
public void disjunctionAmbiguity() throws Exception {
eval("* {{ Description.active=true OR Description.moduleId = " + Concepts.MODULE_SCT_CORE + " AND term=\"clinical finding\" }}");
eval("* {{ active=true OR moduleId = " + Concepts.MODULE_SCT_CORE + " AND term=\"clinical finding\" }}");
}

@Test(expected = BadRequestException.class)
public void exclusionAmbiguity() throws Exception {
eval("* {{ Description.active=true OR Description.moduleId = " + Concepts.MODULE_SCT_CORE +" MINUS term=\"clinical finding\" }}");
eval("* {{ active=true OR moduleId = " + Concepts.MODULE_SCT_CORE +" MINUS term=\"clinical finding\" }}");
}

@Test
public void multiDomainQueryAnd() throws Exception {
Expression actual = eval("* {{ active=false }} AND * {{ term=\"clin find\" }}");
Expression actual = eval("* {{ c active=false }} AND * {{ d term=\"clin find\" }}");
Expression expected = Expressions.builder()
.filter(SnomedDocument.Expressions.inactive())
.filter(SnomedDocument.Expressions.ids(Collections.emptySet()))
Expand All @@ -186,7 +186,7 @@ public void multiDomainQueryAnd() throws Exception {

@Test
public void multiDomainQueryOr() throws Exception {
Expression actual = eval("* {{ active=false }} OR * {{ term=\"clin find\" }}");
Expression actual = eval("* {{ c active=false }} OR * {{ d term=\"clin find\" }}");
Expression expected = Expressions.builder()
.should(SnomedDocument.Expressions.inactive())
.should(SnomedDocument.Expressions.ids(Collections.emptySet()))
Expand All @@ -196,7 +196,7 @@ public void multiDomainQueryOr() throws Exception {

@Test
public void multiDomainQueryExclusion() throws Exception {
Expression actual = eval("* {{ active=false }} MINUS * {{ term=\"clin find\" }}");
Expression actual = eval("* {{ c active=false }} MINUS * {{ d term=\"clin find\" }}");
Expression expected = Expressions.builder()
.filter(SnomedDocument.Expressions.inactive())
.mustNot(SnomedDocument.Expressions.ids(Collections.emptySet()))
Expand Down Expand Up @@ -365,35 +365,35 @@ public void descriptionEffectiveTime() throws Exception {
.build());

Expression expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT));
Expression actual = eval("* {{ Description.effectiveTime = \"20210731\" }}");
Expression actual = eval("* {{ effectiveTime = \"20210731\" }}");
assertEquals(expected, actual);

expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT));
actual = eval("* {{ Description.effectiveTime > \"20210605\" }}");
actual = eval("* {{ effectiveTime > \"20210605\" }}");
assertEquals(expected, actual);

expected = SnomedDocument.Expressions.ids(Set.of(Concepts.SUBSTANCE));
actual = eval("* {{ Description.effectiveTime < \"20020201\" }}");
actual = eval("* {{ effectiveTime < \"20020201\" }}");
assertEquals(expected, actual);

expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT, Concepts.SUBSTANCE));
actual = eval("* {{ Description.effectiveTime >= \"20020131\" }}");
actual = eval("* {{ effectiveTime >= \"20020131\" }}");
assertEquals(expected, actual);

expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT, Concepts.SUBSTANCE));
actual = eval("* {{ Description.effectiveTime >= \"20010731\" }}");
actual = eval("* {{ effectiveTime >= \"20010731\" }}");
assertEquals(expected, actual);

expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT, Concepts.SUBSTANCE));
actual = eval("* {{ Description.effectiveTime <= \"20210731\" }}");
actual = eval("* {{ effectiveTime <= \"20210731\" }}");
assertEquals(expected, actual);

expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT, Concepts.SUBSTANCE));
actual = eval("* {{ Description.effectiveTime <= \"20211030\" }}");
actual = eval("* {{ effectiveTime <= \"20211030\" }}");
assertEquals(expected, actual);

expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT, Concepts.SUBSTANCE));
actual = eval("* {{ Description.effectiveTime != \"20211030\" }}");
actual = eval("* {{ effectiveTime != \"20211030\" }}");
assertEquals(expected, actual);
}

Expand All @@ -416,7 +416,7 @@ public void conceptEffectiveTime() throws Exception {
.build());

Expression expected = SnomedDocument.Expressions.effectiveTime(EffectiveTimes.getEffectiveTime("20210731", DateFormats.SHORT));
Expression actual = eval("* {{ effectiveTime = \"20210731\" }}");
Expression actual = eval("* {{ c effectiveTime = \"20210731\" }}");
assertEquals(expected, actual);
}

Expand Down Expand Up @@ -477,7 +477,7 @@ public void dialectPreferred() throws Exception {
// extra acceptable description on another concept to demonstrate that it won't match
generateAcceptableDescription(Concepts.MODULE_ROOT);

Expression actual = eval("* {{ dialect = en-gb (preferred) }}");
Expression actual = eval("* {{ dialect = en-gb (prefer) }}");
Expression expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT));
assertEquals(expected, actual);
}
Expand All @@ -488,7 +488,7 @@ public void dialectPreferredNotEquals() throws Exception {
// extra acceptable description on another concept to demonstrate that it won't match
generateAcceptableDescription(Concepts.MODULE_ROOT);

Expression actual = eval("* {{ dialect != en-gb (preferred) }}");
Expression actual = eval("* {{ dialect != en-gb (prefer) }}");
Expression expected = SnomedDocument.Expressions.ids(Set.of(Concepts.MODULE_ROOT));
assertEquals(expected, actual);
}
Expand All @@ -499,7 +499,7 @@ public void dialectAcceptable() throws Exception {
// extra preferred description on another concept to demonstrate that it won't match
generatePreferredDescription(Concepts.MODULE_ROOT);

Expression actual = eval("* {{ dialect = en-gb (acceptable) }}");
Expression actual = eval("* {{ dialect = en-gb (accept) }}");
Expression expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT));
assertEquals(expected, actual);
}
Expand All @@ -510,7 +510,7 @@ public void dialectAcceptableNotEquals() throws Exception {
// extra preferred description on another concept to demonstrate that it won't match
generatePreferredDescription(Concepts.MODULE_ROOT);

Expression actual = eval("* {{ dialect != en-gb (acceptable) }}");
Expression actual = eval("* {{ dialect != en-gb (accept) }}");
Expression expected = SnomedDocument.Expressions.ids(Set.of(Concepts.MODULE_ROOT));
assertEquals(expected, actual);
}
Expand Down Expand Up @@ -541,7 +541,7 @@ public void dialectIdPreferred() throws Exception {
// extra acceptable description on another concept to demonstrate that it won't match
generateAcceptableDescription(Concepts.MODULE_ROOT);

Expression actual = eval("* {{ dialectId = " + Concepts.REFSET_LANGUAGE_TYPE_UK + " (preferred) }}");
Expression actual = eval("* {{ dialectId = " + Concepts.REFSET_LANGUAGE_TYPE_UK + " (prefer) }}");
Expression expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT));
assertEquals(expected, actual);
}
Expand All @@ -552,7 +552,7 @@ public void dialectIdPreferredNotEquals() throws Exception {
// extra acceptable description on another concept to demonstrate that it won't match
generateAcceptableDescription(Concepts.MODULE_ROOT);

Expression actual = eval("* {{ dialectId != " + Concepts.REFSET_LANGUAGE_TYPE_UK + " (preferred) }}");
Expression actual = eval("* {{ dialectId != " + Concepts.REFSET_LANGUAGE_TYPE_UK + " (prefer) }}");
Expression expected = SnomedDocument.Expressions.ids(Set.of(Concepts.MODULE_ROOT));
assertEquals(expected, actual);
}
Expand All @@ -563,7 +563,7 @@ public void dialectIdAcceptable() throws Exception {
// extra preferred description on another concept to demonstrate that it won't match
generatePreferredDescription(Concepts.MODULE_ROOT);

Expression actual = eval("* {{ dialectId = " + Concepts.REFSET_LANGUAGE_TYPE_UK + " (acceptable) }}");
Expression actual = eval("* {{ dialectId = " + Concepts.REFSET_LANGUAGE_TYPE_UK + " (accept) }}");
Expression expected = SnomedDocument.Expressions.ids(Set.of(Concepts.ROOT_CONCEPT));
assertEquals(expected, actual);
}
Expand All @@ -574,7 +574,7 @@ public void dialectIdAcceptableNotEquals() throws Exception {
// extra preferred description on another concept to demonstrate that it won't match
generatePreferredDescription(Concepts.MODULE_ROOT);

Expression actual = eval("* {{ dialectId != " + Concepts.REFSET_LANGUAGE_TYPE_UK + " (acceptable) }}");
Expression actual = eval("* {{ dialectId != " + Concepts.REFSET_LANGUAGE_TYPE_UK + " (accept) }}");
Expression expected = SnomedDocument.Expressions.ids(Set.of(Concepts.MODULE_ROOT));
assertEquals(expected, actual);
}
Expand All @@ -595,11 +595,9 @@ public void dialectUnsupportedOperator() throws Exception {
eval("* {{ dialect > en-gb (preferred) }}");
}

@Test
@Test(expected = SyntaxException.class)
public void dialectUnknownAcceptability() throws Exception {
Expression actual = eval("* {{ dialect = en-gb (unknown) }}");
Expression expected = SnomedDocument.Expressions.ids(Set.of());
assertEquals(expected, actual);
eval("* {{ dialect = en-gb (unknown) }}");
}

@Test
Expand All @@ -623,6 +621,27 @@ public void dialectUnknownAlias() throws Exception {
assertEquals(expected, actual);
}

@Test
public void definitionStatus() throws Exception {
Expression actual1 = eval("* {{ c definitionStatusId = 900000000000073002 }}");
Expression actual2 = eval("* {{ c definitionStatus = defined }}");
Expression expected = SnomedConceptDocument.Expressions.definitionStatusIds(Set.of(Concepts.FULLY_DEFINED));
assertEquals(expected, actual1);
assertEquals(expected, actual2);
}

@Test
public void definitionStatusNotEquals() throws Exception {
Expression actual1 = eval("* {{ c definitionStatusId != 900000000000074008 }}");
Expression actual2 = eval("* {{ c definitionStatus != primitive }}");
Expression expected = Expressions.builder()
.mustNot(SnomedConceptDocument.Expressions.definitionStatusIds(Set.of(Concepts.PRIMITIVE)))
.build();

assertEquals(expected, actual1);
assertEquals(expected, actual2);
}

private void generatePreferredDescription(String conceptId) {
indexRevision(MAIN, SnomedDescriptionIndexEntry.builder()
.id(generateDescriptionId())
Expand Down
Loading