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

JNG-6008 Test ordered aggregated calculated expressions #328

Merged
merged 2 commits into from
Nov 11, 2024
Merged

JNG-6008 Test ordered aggregated calculated expressions #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d3294e
add format to the equals (without some locales not work like Hungarian)
gaborflorian Nov 11, 2024
d18adfe
add aggregated order tests
gaborflorian Nov 11, 2024
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
12 changes: 6 additions & 6 deletions ...imitivesModel/src/test/java/hu/blackbelt/judo/runtime/core/jsl/entity/PrimitivesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ public void testStringSubstitution() {
.withStringAttr("%s %.2f %d", "name", 2.34, 1)
.build());

assertEquals("name 2.34 1", entity1.getStringAttr().orElseThrow());
assertEquals(String.format("%s %.2f %d", "name", 2.34, 1), entity1.getStringAttr().orElseThrow());

entity1.setStringAttr("%s", "name");

Expand Down Expand Up @@ -718,7 +718,7 @@ public void testStringSubstitution() {

entity1 = myEntityWithOptionalFieldsDao.create(myEntityWithOptionalFields.adaptTo(MyEntityWithOptionalFieldsForCreate.class));

assertEquals("name 2.34 1", entity1.getStringAttr().orElseThrow());
assertEquals(String.format("%s %.2f %d", "name", 2.34, 1), entity1.getStringAttr().orElseThrow());
}


Expand Down Expand Up @@ -757,11 +757,11 @@ public void testStringSubstitutionOnTransfer() {
.withStringAttr("%s %.2f %d", "name", 2.34, 1)
.build());

assertEquals("name 2.34 1", transfer.getStringAttr().orElseThrow());
assertEquals(String.format("%s %.2f %d", "name", 2.34, 1), transfer.getStringAttr().orElseThrow());

entity = myEntityWithOptionalFieldsDao.getById(transfer.identifier().adaptTo(MyEntityWithOptionalFieldsIdentifier.class)).orElseThrow();

assertEquals("name 2.34 1", entity.getStringAttr().orElseThrow());
assertEquals(String.format("%s %.2f %d", "name", 2.34, 1), entity.getStringAttr().orElseThrow());

transfer.setStringAttr("%s", "name");

Expand Down Expand Up @@ -797,11 +797,11 @@ public void testStringSubstitutionOnTransfer() {

transfer = myTransferWithOptionalFieldsDao.create(transfer.adaptTo(MyTransferWithOptionalFieldsForCreate.class));

assertEquals("name 2.34 1", transfer.getStringAttr().orElseThrow());
assertEquals(String.format("%s %.2f %d", "name", 2.34, 1), transfer.getStringAttr().orElseThrow());

entity = myEntityWithOptionalFieldsDao.getById(transfer.identifier().adaptTo(MyEntityWithOptionalFieldsIdentifier.class)).orElseThrow();

assertEquals("name 2.34 1", entity.getStringAttr().orElseThrow());
assertEquals(String.format("%s %.2f %d", "name", 2.34, 1), entity.getStringAttr().orElseThrow());
}

@Inject
Expand Down
137 changes: 136 additions & 1 deletion ...src/test/java/hu/blackbelt/judo/runtime/core/jsl/entity/QueryCustomizerFunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,17 @@
import hu.blackbelt.judo.dao.api.DAO;
import hu.blackbelt.judo.dispatcher.api.FileType;
import hu.blackbelt.judo.meta.asm.runtime.AsmUtils;
import hu.blackbelt.judo.psm.generator.sdk.core.test.api.primitives.primitives.item.ItemBuilder;
import hu.blackbelt.judo.psm.generator.sdk.core.test.api.primitives.primitives.item.ItemDao;
import hu.blackbelt.judo.psm.generator.sdk.core.test.api.primitives.primitives.item.ItemForCreate;
import hu.blackbelt.judo.psm.generator.sdk.core.test.api.primitives.primitives.myentitywithoptionalfields.*;
import hu.blackbelt.judo.psm.generator.sdk.core.test.api.primitives.primitives.myenum.MyEnum;
import hu.blackbelt.judo.psm.generator.sdk.core.test.guice.PrimitivesDaoModules;
import hu.blackbelt.judo.requirement.report.annotation.Requirement;
import hu.blackbelt.judo.runtime.core.jsl.fixture.JudoRuntimeExtension;
import hu.blackbelt.judo.runtime.core.jsl.fixture.JudoRuntimeFixture;
import hu.blackbelt.judo.sdk.query.StringFilter;
import liquibase.pro.packaged.L;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand All @@ -42,6 +46,8 @@
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
Expand All @@ -57,10 +63,14 @@ public class QueryCustomizerFunctionsTest {
@Inject
MyEntityWithOptionalFieldsDao myEntityWithOptionalFieldsDao;

@Inject
ItemDao itemDao;

MyEntityWithOptionalFields entity1;

MyEntityWithOptionalFields entity2;


@BeforeEach
protected void init() {

Expand All @@ -75,6 +85,7 @@ protected void init() {
.withTimeAttr(LocalTime.parse("23:59:59"))
.withBinaryAttr(FileType.builder().fileName("test.txt").build())
.withEnumAttr(MyEnum.Bombastic)
.withItems(createItemListUpTo(2, 50))
.build());

entity2 = myEntityWithOptionalFieldsDao.create(MyEntityWithOptionalFieldsForCreate.builder()
Expand All @@ -88,6 +99,7 @@ protected void init() {
.withTimeAttr(LocalTime.parse("12:34:56"))
.withBinaryAttr(FileType.builder().fileName("test.txt").build())
.withEnumAttr(MyEnum.Atomic)
.withItems(createItemListUpTo(1, 45))
.build());
}

Expand Down Expand Up @@ -209,6 +221,59 @@ public void testDerivedOrderByDescending() {
assertOrderByDescending(MyEntityWithOptionalFieldsAttribute.DERIVED_ENUM_ATTR, entity1);
}


@Test
@Requirement(reqs = {
"REQ-MDL-001",
"REQ-MDL-002",
"REQ-MDL-003",
"REQ-TYPE-001",
"REQ-TYPE-002",
"REQ-TYPE-004",
"REQ-TYPE-005",
"REQ-TYPE-006",
"REQ-TYPE-007",
"REQ-TYPE-008",
"REQ-TYPE-009",
"REQ-ENT-001",
"REQ-ENT-002",
"REQ-ENT-008",
"REQ-ENT-012",
})
public void testAggregatedDerivedOrderBy() {
assertOrderBy(MyEntityWithOptionalFieldsAttribute.SUM_OF_ITEMS_NUMBER, entity2);
assertOrderBy(MyEntityWithOptionalFieldsAttribute.AVG_OF_ITEMS_NUMBER, entity2);
assertOrderBy(MyEntityWithOptionalFieldsAttribute.MIN_OF_ITEMS_NUMBER, entity2);
assertOrderBy(MyEntityWithOptionalFieldsAttribute.MAX_OF_ITEMS_NUMBER, entity2);
assertOrderBy(MyEntityWithOptionalFieldsAttribute.SIZE_OF_ITEMS, entity2);
}

@Test
@Requirement(reqs = {
"REQ-MDL-001",
"REQ-MDL-002",
"REQ-MDL-003",
"REQ-TYPE-001",
"REQ-TYPE-002",
"REQ-TYPE-004",
"REQ-TYPE-005",
"REQ-TYPE-006",
"REQ-TYPE-007",
"REQ-TYPE-008",
"REQ-TYPE-009",
"REQ-ENT-001",
"REQ-ENT-002",
"REQ-ENT-008",
"REQ-ENT-012",
})
public void testAggregatedDerivedOrderByDescending() {
assertOrderByDescending(MyEntityWithOptionalFieldsAttribute.SUM_OF_ITEMS_NUMBER, entity1);
assertOrderByDescending(MyEntityWithOptionalFieldsAttribute.AVG_OF_ITEMS_NUMBER, entity1);
assertOrderByDescending(MyEntityWithOptionalFieldsAttribute.MIN_OF_ITEMS_NUMBER, entity1);
assertOrderByDescending(MyEntityWithOptionalFieldsAttribute.MAX_OF_ITEMS_NUMBER, entity1);
assertOrderByDescending(MyEntityWithOptionalFieldsAttribute.SIZE_OF_ITEMS, entity1);
}

@Test
@Requirement(reqs = {
"REQ-MDL-001",
Expand Down Expand Up @@ -347,6 +412,70 @@ public void testMultiDerivedOrderByDescending() {
assertEquals(entity1.identifier().getIdentifier(), orderBy.identifier().getIdentifier());
}

@Test
@Requirement(reqs = {
"REQ-MDL-001",
"REQ-MDL-002",
"REQ-MDL-003",
"REQ-TYPE-001",
"REQ-TYPE-002",
"REQ-TYPE-004",
"REQ-TYPE-005",
"REQ-TYPE-006",
"REQ-TYPE-007",
"REQ-TYPE-008",
"REQ-TYPE-009",
"REQ-ENT-001",
"REQ-ENT-002",
"REQ-ENT-008",
"REQ-ENT-012",
})
public void testMultiAggregatedDerivedOrderBy() {
MyEntityWithOptionalFields orderBy = myEntityWithOptionalFieldsDao
.query()
.orderBy(MyEntityWithOptionalFieldsAttribute.SUM_OF_ITEMS_NUMBER)
.orderBy(MyEntityWithOptionalFieldsAttribute.AVG_OF_ITEMS_NUMBER)
.orderBy(MyEntityWithOptionalFieldsAttribute.MIN_OF_ITEMS_NUMBER)
.orderBy(MyEntityWithOptionalFieldsAttribute.MAX_OF_ITEMS_NUMBER)
.orderBy(MyEntityWithOptionalFieldsAttribute.SUM_OF_ITEMS_NUMBER)
.selectOne()
.get();

assertEquals(entity2.identifier().getIdentifier(), orderBy.identifier().getIdentifier());
}

@Test
@Requirement(reqs = {
"REQ-MDL-001",
"REQ-MDL-002",
"REQ-MDL-003",
"REQ-TYPE-001",
"REQ-TYPE-002",
"REQ-TYPE-004",
"REQ-TYPE-005",
"REQ-TYPE-006",
"REQ-TYPE-007",
"REQ-TYPE-008",
"REQ-TYPE-009",
"REQ-ENT-001",
"REQ-ENT-002",
"REQ-ENT-008",
"REQ-ENT-012",
})
public void testMultiAggregatedDerivedOrderByDescending() {
MyEntityWithOptionalFields orderBy = myEntityWithOptionalFieldsDao
.query()
.orderByDescending(MyEntityWithOptionalFieldsAttribute.SUM_OF_ITEMS_NUMBER)
.orderByDescending(MyEntityWithOptionalFieldsAttribute.AVG_OF_ITEMS_NUMBER)
.orderByDescending(MyEntityWithOptionalFieldsAttribute.MIN_OF_ITEMS_NUMBER)
.orderByDescending(MyEntityWithOptionalFieldsAttribute.MAX_OF_ITEMS_NUMBER)
.orderByDescending(MyEntityWithOptionalFieldsAttribute.SUM_OF_ITEMS_NUMBER)
.selectOne()
.get();

assertEquals(entity1.identifier().getIdentifier(), orderBy.identifier().getIdentifier());
}

@Test
@Requirement(reqs = {
"REQ-MDL-001",
Expand Down Expand Up @@ -642,7 +771,7 @@ public void testQueryCustomizerAppendWithOrFilter(JudoRuntimeFixture runtimeFixt


}

private void assertOrderBy(MyEntityWithOptionalFieldsAttribute attribute, MyEntityWithOptionalFields firstEntity) {
MyEntityWithOptionalFields orderBy = myEntityWithOptionalFieldsDao
.query()
Expand All @@ -662,4 +791,10 @@ private void assertOrderByDescending(MyEntityWithOptionalFieldsAttribute attribu

assertEquals(firstEntity.identifier().getIdentifier(), orderByDescending.identifier().getIdentifier());
}

public static List<ItemForCreate> createItemListUpTo(int startNumber, int endNumber) {
return IntStream.rangeClosed(startNumber, endNumber)
.mapToObj(number -> ItemForCreate.builder().withNumber(number).build())
.collect(Collectors.toList());
}
}
11 changes: 11 additions & 0 deletions judo-runtime-core-jsl-itest/models/PrimitivesModel/src/test/resources/Primitives.jsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ enum MyEnum {
Crazy = 2;
}

entity Item {
field Integer number;
}

entity AbstractEntityOptionalFields abstract {
field Boolean boolAttr;
field Binary binaryAttr;
Expand All @@ -35,6 +39,13 @@ entity AbstractEntityOptionalFields abstract {
field Time derivedTimeAttr <= self.timeAttr;
field Timestamp derivedTimestampAttr <= self.timestampAttr;
field MyEnum derivedEnumAttr <= self.enumAttr;

field Item[] items;
field Integer sumOfItemsNumber <= self.items.sum(i | i.number);
field Scaled avgOfItemsNumber <= self.items.avg(i | i.number);
field Integer minOfItemsNumber <= self.items.min(i | i.number);
field Integer maxOfItemsNumber <= self.items.max(i | i.number);
field Integer sizeOfItems <= self.items.size();
}

entity MyEntityWithOptionalFields extends AbstractEntityOptionalFields {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
javax.resource;version="[1.6,2)"
</osgi-transaction-import>

<judo-tatami-jsl-version>1.1.4.20241109_040630_a0e2136f_develop</judo-tatami-jsl-version>
<judo-runtime-core-version>1.0.6.20241107_041904_bf9e52c2_develop</judo-runtime-core-version>
<judo-tatami-jsl-version>1.1.4.20241024_042505_78fa678b_develop</judo-tatami-jsl-version>
<judo-runtime-core-version>1.0.6.20241024_042012_127fbf92_develop</judo-runtime-core-version>
<judo-psm-generator-sdk-core-version>1.0.0.20241024_041535_778614b3_develop</judo-psm-generator-sdk-core-version>

<judo-meta-psm-version>1.3.0.20240924_131124_116febb4_develop</judo-meta-psm-version>
Expand Down
Loading