Skip to content

Commit e0ee63d

Browse files
luciano-fiandesioluciano-fiandesio
committed
Attempt at fixing e2e tests
1 parent 6cb63d3 commit e0ee63d

6 files changed

Lines changed: 714 additions & 923 deletions

File tree

‎dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/analytics/generator/impl/TrackedEntityAggregatedGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,6 @@ public boolean assertMetaData() {
9191

9292
@Override
9393
public boolean assertRowIndex() {
94-
return true;
94+
return false;
9595
}
9696
}

‎dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/analytics/generator/scenarios/tracked-entity-aggregated.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,91 +2,91 @@
22
"scenarios": [
33
{
44
"name": "aggregateCountByOrgUnit",
5-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4;a1E6QWBTEwX;a5glgtnXJRG;aBfyTU5Wgds&asc=ou&pageSize=5&totalPages=false",
5+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4;a1E6QWBTEwX;a5glgtnXJRG;aBfyTU5Wgds&pageSize=5&totalPages=false",
66
"version": {
77
"min": 44
88
}
99
},
1010
{
1111
"name": "aggregateAverageValueByOrgUnit",
12-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4;a1E6QWBTEwX;a5glgtnXJRG;aBfyTU5Wgds&value=lw1SqmMlnfh&aggregationType=AVERAGE&asc=ou&pageSize=5&totalPages=false",
12+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4;a1E6QWBTEwX;a5glgtnXJRG;aBfyTU5Wgds&value=lw1SqmMlnfh&aggregationType=AVERAGE&pageSize=5&totalPages=false",
1313
"version": {
1414
"min": 44
1515
}
1616
},
1717
{
1818
"name": "aggregateSumValueByOrgUnit",
19-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4;a1E6QWBTEwX;a5glgtnXJRG;aBfyTU5Wgds&value=lw1SqmMlnfh&aggregationType=SUM&asc=ou&pageSize=5&totalPages=false",
19+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4;a1E6QWBTEwX;a5glgtnXJRG;aBfyTU5Wgds&value=lw1SqmMlnfh&aggregationType=SUM&pageSize=5&totalPages=false",
2020
"version": {
2121
"min": 44
2222
}
2323
},
2424
{
2525
"name": "aggregateCountOfNonNullValueByOrgUnit",
26-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4;a1E6QWBTEwX;a5glgtnXJRG;aBfyTU5Wgds&value=lw1SqmMlnfh&aggregationType=COUNT&asc=ou&pageSize=5&totalPages=false",
26+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4;a1E6QWBTEwX;a5glgtnXJRG;aBfyTU5Wgds&value=lw1SqmMlnfh&aggregationType=COUNT&pageSize=5&totalPages=false",
2727
"version": {
2828
"min": 44
2929
}
3030
},
3131
{
3232
"name": "aggregateAverageValueByOrgUnitAndGender",
33-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4,cejWyOfXge6&value=lw1SqmMlnfh&aggregationType=AVERAGE&asc=ou,cejWyOfXge6&pageSize=5&totalPages=false",
33+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:a04CZxe0PSe;a1dP5m3Clw4,cejWyOfXge6&value=lw1SqmMlnfh&aggregationType=AVERAGE&pageSize=10&totalPages=false",
3434
"version": {
3535
"min": 44
3636
}
3737
},
3838
{
3939
"name": "aggregateAverageOverDataElementValueByOrgUnit",
40-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:UAtEKSd5QTf;mVvEwzoFutG;uROAmk9ymNE;mMvt6zhCclb;IlMQTFvcq9r&value=WSGAb5XwJ3Y.edqlbukwRfQ.vANAXwtLwcT&aggregationType=AVERAGE&asc=ou&pageSize=10&totalPages=false",
40+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:UAtEKSd5QTf;mVvEwzoFutG;uROAmk9ymNE;mMvt6zhCclb;IlMQTFvcq9r&value=WSGAb5XwJ3Y.edqlbukwRfQ.vANAXwtLwcT&aggregationType=AVERAGE&pageSize=10&totalPages=false",
4141
"version": {
4242
"min": 44
4343
}
4444
},
4545
{
4646
"name": "aggregateCountOverDataElementValueByOrgUnit",
47-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:UAtEKSd5QTf;mVvEwzoFutG;uROAmk9ymNE;mMvt6zhCclb;IlMQTFvcq9r&value=WSGAb5XwJ3Y.edqlbukwRfQ.vANAXwtLwcT&aggregationType=COUNT&asc=ou&pageSize=10&totalPages=false",
47+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:UAtEKSd5QTf;mVvEwzoFutG;uROAmk9ymNE;mMvt6zhCclb;IlMQTFvcq9r&value=WSGAb5XwJ3Y.edqlbukwRfQ.vANAXwtLwcT&aggregationType=COUNT&pageSize=10&totalPages=false",
4848
"version": {
4949
"min": 44
5050
}
5151
},
5252
{
5353
"name": "aggregateSumBirthWeightByOrgUnit",
54-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=SUM&asc=ou&pageSize=10&totalPages=false",
54+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=SUM&pageSize=10&totalPages=false",
5555
"version": {
5656
"min": 44
5757
}
5858
},
5959
{
6060
"name": "aggregateMinBirthWeightByOrgUnit",
61-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=MIN&asc=ou&pageSize=10&totalPages=false",
61+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=MIN&pageSize=10&totalPages=false",
6262
"version": {
6363
"min": 44
6464
}
6565
},
6666
{
6767
"name": "aggregateMaxBirthWeightByOrgUnit",
68-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=MAX&asc=ou&pageSize=10&totalPages=false",
68+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=MAX&pageSize=10&totalPages=false",
6969
"version": {
7070
"min": 44
7171
}
7272
},
7373
{
7474
"name": "aggregateAverageBirthWeightByOrgUnitAndGender",
75-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m,cejWyOfXge6&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=AVERAGE&asc=ou,cejWyOfXge6&pageSize=20&totalPages=false",
75+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m,cejWyOfXge6&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=AVERAGE&pageSize=20&totalPages=false",
7676
"version": {
7777
"min": 44
7878
}
7979
},
8080
{
8181
"name": "aggregateAverageBirthWeightByOrgUnitFilteredByFemale",
82-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=AVERAGE&filter=cejWyOfXge6:IN:Female&asc=ou&pageSize=10&totalPages=false",
82+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:QII5GqfDfO3;DiszpKrYNg8;QZzRkqdGjlm;Qr41Mw2MSjo;VpYAl8dXs6m&value=IpHINAT79UW.A03MvHHogjR.UXz7xuGCEhU&aggregationType=AVERAGE&filter=cejWyOfXge6:IN:Female&pageSize=10&totalPages=false",
8383
"version": {
8484
"min": 44
8585
}
8686
},
8787
{
8888
"name": "aggregateAverageFirstEventValueByOrgUnit",
89-
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:UAtEKSd5QTf;mVvEwzoFutG;uROAmk9ymNE;mMvt6zhCclb;IlMQTFvcq9r&value=WSGAb5XwJ3Y.edqlbukwRfQ[1].vANAXwtLwcT&aggregationType=AVERAGE&asc=ou&pageSize=10&totalPages=false",
89+
"query": "/api/analytics/trackedEntities/aggregate/nEenWmSyUEp.json?dimension=ou:UAtEKSd5QTf;mVvEwzoFutG;uROAmk9ymNE;mMvt6zhCclb;IlMQTFvcq9r&value=WSGAb5XwJ3Y.edqlbukwRfQ[1].vANAXwtLwcT&aggregationType=AVERAGE&pageSize=10&totalPages=false",
9090
"version": {
9191
"min": 44
9292
}

0 commit comments

Comments
 (0)