test: assert both ehcache.xml heap-bound paths, not just the template

HibernateEhcacheConfigFileTest arrived on master with #24762 and pinned the
User region to the ehcache.xml default template bound of 1,000,000. This
branch declares User explicitly so it can be sized and stored by reference,
so that region now carries 100,000 and the assertion failed.

The test's stated intent is that regions carry ehcache.xml's settings, bounded
rather than the unbounded provider defaults. That still holds; only the
specific number changed, and only for regions we now declare explicitly.

Assert both paths instead of one: Attribute has no explicit <cache> element
and must still inherit the default template, while User is declared and must
carry its own bound. That covers strictly more than before.

AI Assisted

Author: netroms

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/cache/HibernateEhcacheConfigFileTest.java

@@ -46,6 +46,7 @@
 import org.hibernate.cache.jcache.internal.JCacheRegionFactory;
 import org.hibernate.cache.spi.RegionFactory;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hisp.dhis.attribute.Attribute;
 import org.hisp.dhis.cache.HibernateEhcacheConfigFileTest.DhisConfig;
 import org.hisp.dhis.external.conf.ConfigurationKey;
 import org.hisp.dhis.test.config.PostgresTestConfigOverride;
@@ -86,6 +87,13 @@ public PostgresTestConfigOverride postgresTestConfigOverride() {
   /** Heap bound from the ehcache.xml default cache template (jsr107:defaults). */
   private static final long EHCACHE_XML_TEMPLATE_HEAP_ENTRIES = 1_000_000;
 
+  /**
+   * Heap bound declared explicitly for the predefined {@code org.hisp.dhis.user.User} region in
+   * ehcache.xml. Hot regions are declared individually so they can be sized and stored by
+   * reference; the rest still inherit the default template above.
+   */
+  private static final long EHCACHE_XML_USER_HEAP_ENTRIES = 100_000;
+
   @Autowired private EntityManagerFactory entityManagerFactory;
 
   @Test
@@ -105,10 +113,17 @@ void cacheManagerIsConfiguredFromEhcacheXml() {
   void regionsCarryTheEhcacheXmlHeapBounds() {
     CacheManager cacheManager = cacheManager();
 
+    // Attribute has no explicit <cache> element, so it must inherit the default template.
     assertEquals(
         EHCACHE_XML_TEMPLATE_HEAP_ENTRIES,
+        heapEntries(cacheManager, Attribute.class.getName()),
+        "entity regions without an explicit declaration must carry the heap bound of the"
+            + " ehcache.xml default template");
+    // User is declared explicitly in ehcache.xml and must carry its own bound, not the template's.
+    assertEquals(
+        EHCACHE_XML_USER_HEAP_ENTRIES,
         heapEntries(cacheManager, User.class.getName()),
-        "entity regions must carry the heap bound of the ehcache.xml default template");
+        "explicitly declared entity regions must carry their own ehcache.xml heap bound");
     assertEquals(
         EHCACHE_XML_TIMESTAMPS_HEAP_ENTRIES,
         heapEntries(cacheManager, "default-update-timestamps-region"),