From d704a18fcb15dc46491f5ecb497412f087b8fbac Mon Sep 17 00:00:00 2001
From: Enrico <enrico@dhis2.org>
Date: Tue, 19 Nov 2024 09:13:36 +0100
Subject: [PATCH] fix: Remove custom COC defaults

---
 .../preheat/TrackerPreheatIdentifiersTest.java |  3 ++-
 .../preheat/TrackerPreheatServiceTest.java     |  2 +-
 .../test/resources/tracker/event_events.json   |  2 +-
 .../test/resources/tracker/event_metadata.json | 18 ------------------
 .../resources/tracker/identifier_metadata.json | 17 -----------------
 5 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/imports/preheat/TrackerPreheatIdentifiersTest.java b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/imports/preheat/TrackerPreheatIdentifiersTest.java
index a70af93fafa7..69891c46c990 100644
--- a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/imports/preheat/TrackerPreheatIdentifiersTest.java
+++ b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/imports/preheat/TrackerPreheatIdentifiersTest.java
@@ -164,7 +164,8 @@ void testCategoryOptionIdentifiers() {
 
   @Test
   void testCategoryOptionComboIdentifiers() {
-    List<Pair<String, TrackerIdSchemeParam>> data = buildDataSet("XXXvX50cXC0", "COCA", "COCAname");
+    List<Pair<String, TrackerIdSchemeParam>> data =
+        buildDataSet("HllvX50cXC0", "default", "default");
     for (Pair<String, TrackerIdSchemeParam> pair : data) {
       String id = pair.getLeft();
       TrackerIdSchemeParam param = pair.getRight();
diff --git a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/imports/preheat/TrackerPreheatServiceTest.java b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/imports/preheat/TrackerPreheatServiceTest.java
index 1d083bb5f2e8..49defcb12f24 100644
--- a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/imports/preheat/TrackerPreheatServiceTest.java
+++ b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/imports/preheat/TrackerPreheatServiceTest.java
@@ -149,7 +149,7 @@ void testPreheatEvents() throws IOException {
     assertFalse(preheat.getAll(OrganisationUnit.class).isEmpty());
     assertFalse(preheat.getAll(ProgramStage.class).isEmpty());
     assertFalse(preheat.getAll(CategoryOptionCombo.class).isEmpty());
-    assertNotNull(preheat.get(CategoryOptionCombo.class, "XXXvX50cXC0"));
+    assertNotNull(preheat.get(CategoryOptionCombo.class, "HllvX50cXC0"));
     assertNotNull(preheat.get(CategoryOption.class, "XXXrKDKCefk"));
   }
 }
diff --git a/dhis-2/dhis-test-integration/src/test/resources/tracker/event_events.json b/dhis-2/dhis-test-integration/src/test/resources/tracker/event_events.json
index 15b5ac2646e9..12fabd955311 100644
--- a/dhis-2/dhis-test-integration/src/test/resources/tracker/event_events.json
+++ b/dhis-2/dhis-test-integration/src/test/resources/tracker/event_events.json
@@ -104,7 +104,7 @@
       "deleted": false,
       "attributeOptionCombo": {
         "idScheme": "UID",
-        "identifier": "XXXvX50cXC0"
+        "identifier": "HllvX50cXC0"
       },
       "attributeCategoryOptions": [
         {
diff --git a/dhis-2/dhis-test-integration/src/test/resources/tracker/event_metadata.json b/dhis-2/dhis-test-integration/src/test/resources/tracker/event_metadata.json
index 08e0c19e4bf9..8e41a3676f9c 100644
--- a/dhis-2/dhis-test-integration/src/test/resources/tracker/event_metadata.json
+++ b/dhis-2/dhis-test-integration/src/test/resources/tracker/event_metadata.json
@@ -1820,24 +1820,6 @@
           "id": "xYerKDKCefk"
         }
       ]
-    },
-    {
-      "lastUpdated": "2019-01-28T11:01:30.775",
-      "code": "COCA",
-      "created": "2019-01-28T11:01:30.771",
-      "name": "COCAname",
-      "id": "XXXvX50cXC0",
-      "ignoreApproval": false,
-      "categoryCombo": {
-        "id": "bjDvmb4bfuf"
-      },
-      "translations": [],
-      "attributeValues": [],
-      "categoryOptions": [
-        {
-          "id": "xYerKDKCefk"
-        }
-      ]
     }
   ],
   "categories": [
diff --git a/dhis-2/dhis-test-integration/src/test/resources/tracker/identifier_metadata.json b/dhis-2/dhis-test-integration/src/test/resources/tracker/identifier_metadata.json
index f4925a896ee3..eed1a1b69336 100644
--- a/dhis-2/dhis-test-integration/src/test/resources/tracker/identifier_metadata.json
+++ b/dhis-2/dhis-test-integration/src/test/resources/tracker/identifier_metadata.json
@@ -204,23 +204,6 @@
           "id": "xYerKDKCefk"
         }
       ]
-    },
-    {
-      "lastUpdated": "2019-01-28T11:01:30.775",
-      "code": "COCA",
-      "created": "2019-01-28T11:01:30.771",
-      "name": "COCAname",
-      "id": "XXXvX50cXC0",
-      "ignoreApproval": false,
-      "categoryCombo": {
-        "id": "bjDvmb4bfuf"
-      },
-      "attributeValues": [],
-      "categoryOptions": [
-        {
-          "id": "xYerKDKCefk"
-        }
-      ]
     }
   ],
   "categories": [