Skip to content

Commit

Permalink
chore: Re-enable cat opt merge e2e test
Browse files Browse the repository at this point in the history
  • Loading branch information
@david-mackessy
david-mackessy committed Jan 16, 2025
1 parent 4e7da2e commit dfd990d
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 84 deletions.
8 changes: 2 additions & 6 deletions dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/merge/CategoryOptionComboMergeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,9 @@ public void resetSuperUserOrgUnit() {
void validCategoryOptionComboMergeTest() {
// given
// generate category option combos
String emptyParams = new QueryParamsBuilder().build();
maintenanceApiActions
.post("categoryOptionComboUpdate/categoryCombo/CatComUid01", emptyParams)
.validateStatus(200);
maintenanceApiActions
.post("categoryOptionComboUpdate/categoryCombo/CatComUid02", emptyParams)
.validateStatus(200);
.post("categoryOptionComboUpdate", new QueryParamsBuilder().build())
.validateStatus(204);

// get cat opt combo uids for sources and target, after generating
sourceUid1 = getCocWithOptions("1A", "2A");
Expand Down
154 changes: 76 additions & 78 deletions dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/merge/CategoryOptionMergeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import org.hisp.dhis.test.e2e.helpers.QueryParamsBuilder;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

Expand All @@ -57,9 +56,9 @@ class CategoryOptionMergeTest extends ApiTest {
private RestApiActions maintenanceApiActions;
private UserActions userActions;
private LoginActions loginActions;
private final String sourceUid1 = "CatOptUid1A";
private final String sourceUid2 = "CatOptUid2B";
private final String targetUid = "CatOptUid3A";
private final String sourceUid1 = "UIDCatOpt1A";
private final String sourceUid2 = "UIDCatOpt2B";
private final String targetUid = "UIDCatOpt3A";

@BeforeAll
public void before() {
Expand Down Expand Up @@ -88,7 +87,6 @@ public void setup() {
}

@Test
@Disabled("Started failing on Jenkins only, will investigate.")
@DisplayName(
"Valid CategoryOption merge completes successfully with all source CategoryOption refs replaced with target CategoryOption")
void validCategoryOptionMergeTest() {
Expand All @@ -106,7 +104,7 @@ void validCategoryOptionMergeTest() {
.body("organisationUnits", hasSize(equalTo(1)))
.body("organisationUnits", hasItem(hasEntry("id", "OrgUnitUid3")))
.body("categories", hasSize(equalTo(1)))
.body("categories", hasItem(hasEntry("id", "CategoUid03")))
.body("categories", hasItem(hasEntry("id", "UIDCatego03")))
.body("categoryOptionCombos", hasSize(equalTo(2)))
.body("categoryOptionGroups", hasSize(equalTo(1)))
.body("categoryOptionGroups", hasItem(hasEntry("id", "CatOptGrp03")));
Expand Down Expand Up @@ -143,9 +141,9 @@ void validCategoryOptionMergeTest() {
.body(
"categories",
hasItems(
hasEntry("id", "CategoUid01"),
hasEntry("id", "CategoUid02"),
hasEntry("id", "CategoUid03")))
hasEntry("id", "UIDCatego01"),
hasEntry("id", "UIDCatego02"),
hasEntry("id", "UIDCatego03")))
.body("categoryOptionCombos", hasSize(equalTo(5)))
.body(
"categoryOptionGroups",
Expand All @@ -156,7 +154,7 @@ void validCategoryOptionMergeTest() {
}

private void setupMetadata() {
metadataActions.post(metadata()).validateStatus(200);
metadataActions.importMetadata(metadata()).validateStatus(200);
}

@Test
Expand Down Expand Up @@ -196,79 +194,79 @@ private String metadata() {
{
"categoryOptions": [
{
"id": "CatOptUid1A",
"name": "cat opt 1A",
"shortName": "cat opt 1A",
"id": "UIDCatOpt1A",
"name": "cat option 1A",
"shortName": "cat option 1A",
"organisationUnits": [
{
"id": "OrgUnitUid1"
}
]
},
{
"id": "CatOptUid1B",
"name": "cat opt 1B",
"shortName": "cat opt 1B",
"id": "UIDCatOpt1B",
"name": "cat option 1B",
"shortName": "cat option 1B",
"organisationUnits": [
{
"id": "OrgUnitUid1"
}
]
},
{
"id": "CatOptUid2A",
"name": "cat opt 2A",
"shortName": "cat opt 2A",
"id": "UIDCatOpt2A",
"name": "cat option 2A",
"shortName": "cat option 2A",
"organisationUnits": [
{
"id": "OrgUnitUid2"
}
]
},
{
"id": "CatOptUid2B",
"name": "cat opt 2B",
"shortName": "cat opt 2B",
"id": "UIDCatOpt2B",
"name": "cat option 2B",
"shortName": "cat option 2B",
"organisationUnits": [
{
"id": "OrgUnitUid2"
}
]
},
{
"id": "CatOptUid3A",
"name": "cat opt 3A",
"shortName": "cat opt 3A",
"id": "UIDCatOpt3A",
"name": "cat option 3A",
"shortName": "cat option 3A",
"organisationUnits": [
{
"id": "OrgUnitUid3"
}
]
},
{
"id": "CatOptUid3B",
"name": "cat opt 3B",
"shortName": "cat opt 3B",
"id": "UIDCatOpt3B",
"name": "cat option 3B",
"shortName": "cat option 3B",
"organisationUnits": [
{
"id": "OrgUnitUid3"
}
]
},
{
"id": "CatOptUid4A",
"name": "cat opt 4A",
"shortName": "cat opt 4A",
"id": "UIDCatOpt4A",
"name": "cat option 4A",
"shortName": "cat option 4A",
"organisationUnits": [
{
"id": "OrgUnitUid4"
}
]
},
{
"id": "CatOptUid4B",
"name": "cat opt 4B",
"shortName": "cat opt 4B",
"id": "UIDCatOpt4B",
"name": "cat option 4B",
"shortName": "cat option 4B",
"organisationUnits": [
{
"id": "OrgUnitUid4"
Expand All @@ -278,58 +276,58 @@ private String metadata() {
],
"categories": [
{
"id": "CategoUid01",
"name": "cat 1",
"shortName": "cat 1",
"id": "UIDCatego01",
"name": "category 1",
"shortName": "category 1",
"dataDimensionType": "DISAGGREGATION",
"categoryOptions": [
{
"id": "CatOptUid1A"
"id": "UIDCatOpt1A"
},
{
"id": "CatOptUid1B"
"id": "UIDCatOpt1B"
}
]
},
{
"id": "CategoUid02",
"name": "cat 2",
"shortName": "cat 2",
"id": "UIDCatego02",
"name": "category 2",
"shortName": "category 2",
"dataDimensionType": "DISAGGREGATION",
"categoryOptions": [
{
"id": "CatOptUid2A"
"id": "UIDCatOpt2A"
},
{
"id": "CatOptUid2B"
"id": "UIDCatOpt2B"
}
]
},
{
"id": "CategoUid03",
"name": "cat 3",
"shortName": "cat 3",
"id": "UIDCatego03",
"name": "category 3",
"shortName": "category 3",
"dataDimensionType": "DISAGGREGATION",
"categoryOptions": [
{
"id": "CatOptUid3A"
"id": "UIDCatOpt3A"
},
{
"id": "CatOptUid3B"
"id": "UIDCatOpt3B"
}
]
},
{
"id": "CategoUid04",
"name": "cat 4",
"shortName": "cat 4",
"id": "UIDCatego04",
"name": "category 4",
"shortName": "category 4",
"dataDimensionType": "DISAGGREGATION",
"categoryOptions": [
{
"id": "CatOptUid4A"
"id": "UIDCatOpt4A"
},
{
"id": "CatOptUid4B"
"id": "UIDCatOpt4B"
}
]
}
Expand Down Expand Up @@ -363,85 +361,85 @@ private String metadata() {
"categoryOptionGroups": [
{
"id": "CatOptGrp01",
"name": "cog 1",
"shortName": "cog 1",
"name": "co group 1",
"shortName": "co group 1",
"dataDimensionType": "DISAGGREGATION",
"categoryOptions": [
{
"id": "CatOptUid1A"
"id": "UIDCatOpt1A"
},
{
"id": "CatOptUid1B"
"id": "UIDCatOpt1B"
}
]
},
{
"id": "CatOptGrp02",
"name": "cog 2",
"shortName": "cog 2",
"name": "co group 2",
"shortName": "co group 2",
"dataDimensionType": "DISAGGREGATION",
"categoryOptions": [
{
"id": "CatOptUid2A"
"id": "UIDCatOpt2A"
},
{
"id": "CatOptUid2B"
"id": "UIDCatOpt2B"
}
]
},
{
"id": "CatOptGrp03",
"name": "cog 3",
"shortName": "cog 3",
"name": "co group 3",
"shortName": "co group 3",
"dataDimensionType": "DISAGGREGATION",
"categoryOptions": [
{
"id": "CatOptUid3A"
"id": "UIDCatOpt3A"
},
{
"id": "CatOptUid3B"
"id": "UIDCatOpt3B"
}
]
},
{
"id": "CatOptGrp04",
"name": "cog 4",
"shortName": "cog 4",
"name": "co group 4",
"shortName": "co group 4",
"dataDimensionType": "DISAGGREGATION",
"categoryOptions": [
{
"id": "CatOptUid4A"
"id": "UIDCatOpt4A"
},
{
"id": "CatOptUid4B"
"id": "UIDCatOpt4B"
}
]
}
],
"categoryCombos": [
{
"id": "CatComUid01",
"name": "cat combo 1",
"id": "UIDCatCom01",
"name": "category combo 1",
"dataDimensionType": "DISAGGREGATION",
"categories": [
{
"id": "CategoUid01"
"id": "UIDCatego01"
},
{
"id": "CategoUid02"
"id": "UIDCatego02"
}
]
},
{
"id": "CatComUid02",
"name": "cat combo 2",
"id": "UIDCatCom02",
"name": "category combo 2",
"dataDimensionType": "DISAGGREGATION",
"categories": [
{
"id": "CategoUid03"
"id": "UIDCatego03"
},
{
"id": "CategoUid04"
"id": "UIDCatego04"
}
]
}
Expand Down

0 comments on commit dfd990d

Please sign in to comment.