trying to fix tests and minor renamings

Author: nuest

tests/test_feeds_global.py

@@ -14,9 +14,15 @@
 from django.test import TestCase
 from django.urls import reverse
 
+import json
+from xml.etree import ElementTree as ET
+
 from works.models import Work, GlobalRegion
 
 
+NSPS = {"atom": "http://www.w3.org/2005/Atom"}
+
+
 # Expected work counts per region based on test_data_global_feeds fixture
 # These values are hardcoded from the actual fixture data to ensure tests
 # verify the exact expected behavior
@@ -41,25 +47,91 @@
 }
 
 
-class FeedLandingPageTests(TestCase):
+class GlobalFeedsAndLandingPageTests(TestCase):
     fixtures = ["test_data_global_feeds"]
 
     @classmethod
     def setUpTestData(cls):
+        call_command("flush", "--no-input")
         call_command("load_global_regions")
         call_command("loaddata", "test_data_global_feeds")
 
-    def _slugify(self, name):
+    def slugify(self, name):
         """Convert region name to slug."""
         return name.lower().replace(" ", "-")
 
+    def test_global_region_load(self):
+        regions = GlobalRegion.objects.all()
+        self.assertEqual(len(regions), 15)
+
+    def test_georss_feed_per_region(self):
+        for region in GlobalRegion.objects.all():
+            slug = self.slugify(region.name)
+            # Use new API v1 endpoint based on region type
+            if region.region_type == 'continent':
+                url = reverse("optimap:api-continent-georss", kwargs={"continent_slug": slug})
+            else:  # ocean
+                url = reverse("optimap:api-ocean-georss", kwargs={"ocean_slug": slug})
+
+            resp = self.client.get(url)
+            self.assertEqual(resp.status_code, 200,
+                             f"{region.name} GeoRSS feed failed")
+
+            root = ET.fromstring(resp.content)
+            titles = [item.find("title").text
+                      for item in root.findall(".//item")]
+
+            expected_titles = list(
+                Work.objects
+                .filter(
+                    status="p",
+                    geometry__isnull=False,
+                    geometry__intersects=region.geom
+                )
+                .order_by("-creationDate")
+                .values_list("title", flat=True)
+            )
+
+            self.assertCountEqual(
+                titles, expected_titles,
+                f"GeoRSS feed for {region.name} returned {titles!r}, expected {expected_titles!r}"
+            )
+
+    def test_geoatom_feed_australia(self):
+        # Use new API v1 Atom endpoint
+        url = reverse("optimap:api-continent-atom", kwargs={"continent_slug": "australia"})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+        root = ET.fromstring(response.content)
+        titles = [entry.find("atom:title", namespaces=NSPS).text
+                    for entry in root.findall(".//atom:entry", namespaces=NSPS)]
+
+        self.assertEqual(len(titles), 6, "Atom feed for Australia should return 6 entries")
+        self.assertEqual(titles[0], "Migration Route: Asia to Australia", "Atom feed for Australia returned unexpected title")
+
+    def test_georss_feed_south_atlantic(self):
+        # Use new API v1 GeoRSS endpoint
+        url = reverse("optimap:api-ocean-georss", kwargs={"ocean_slug": "south-atlantic-ocean"})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+
+        root = ET.fromstring(response.content)
+        titles = [item.find("title").text
+                    for item in root.findall(".//item", namespaces=NSPS)]
+
+        self.assertEqual(len(titles), 10, "GeoRSS feed for South Atlantic Ocean should return 10 entries")
+        self.assertEqual(titles[0], "Marine Biology and Oceanography of the Southern Ocean", "GeoRSS feed for South Atlantic Ocean returned unexpected first title")
+        self.assertEqual(titles[9], "Global Climate Network", "GeoRSS feed for South Atlantic Ocean returned unexpected last title")
+
+
     def test_all_continent_pages_display_correct_work_counts(self):
         """Test that all continent feed pages display the correct number of works."""
         continents = GlobalRegion.objects.filter(region_type=GlobalRegion.CONTINENT)
 
         for region in continents:
             with self.subTest(continent=region.name):
-                slug = self._slugify(region.name)
+                slug = self.slugify(region.name)
                 expected_count = EXPECTED_COUNTS.get(slug, 0)
 
                 url = reverse('optimap:feed-continent-page', kwargs={'continent_slug': slug})
@@ -81,19 +153,19 @@ def test_all_continent_pages_display_correct_work_counts(self):
 
                 # Verify the count is shown in the HTML
                 if expected_count > 0:
-                    self.assertContains(response, f'Showing {expected_count} publication',
+                    self.assertContains(response, f'{expected_count} research works',
                                        msg_prefix=f"Work count not displayed for {region.name}")
 
                     # Verify at least the first work title appears
                     self.assertContains(response, actual_works[0].title,
                                        msg_prefix=f"First work title not found for {region.name}")
 
                     # Should NOT show empty message
-                    self.assertNotContains(response, 'No publications found',
+                    self.assertNotContains(response, 'No works found',
                                          msg_prefix=f"{region.name} should not show empty message")
                 else:
                     # Should show empty message
-                    self.assertContains(response, 'No publications found',
+                    self.assertContains(response, 'No works found',
                                        msg_prefix=f"{region.name} should show empty message")
 
     def test_all_ocean_pages_display_correct_work_counts(self):
@@ -102,7 +174,7 @@ def test_all_ocean_pages_display_correct_work_counts(self):
 
         for region in oceans:
             with self.subTest(ocean=region.name):
-                slug = self._slugify(region.name)
+                slug = self.slugify(region.name)
                 expected_count = EXPECTED_COUNTS.get(slug, 0)
 
                 url = reverse('optimap:feed-ocean-page', kwargs={'ocean_slug': slug})
@@ -124,25 +196,25 @@ def test_all_ocean_pages_display_correct_work_counts(self):
 
                 # Verify the count is shown in the HTML
                 if expected_count > 0:
-                    self.assertContains(response, f'Showing {expected_count} publication',
+                    self.assertContains(response, f'{expected_count} research works',
                                        msg_prefix=f"Work count not displayed for {region.name}")
 
                     # Verify at least the first work title appears
                     self.assertContains(response, actual_works[0].title,
                                        msg_prefix=f"First work title not found for {region.name}")
 
                     # Should NOT show empty message
-                    self.assertNotContains(response, 'No publications found',
+                    self.assertNotContains(response, 'No works found',
                                          msg_prefix=f"{region.name} should not show empty message")
                 else:
                     # Should show empty message
-                    self.assertContains(response, 'No publications found',
+                    self.assertContains(response, 'No works found',
                                        msg_prefix=f"{region.name} should show empty message")
 
     def test_continent_page_shows_region_metadata(self):
         """Test that continent pages show correct region metadata."""
         region = GlobalRegion.objects.filter(region_type=GlobalRegion.CONTINENT).first()
-        slug = self._slugify(region.name)
+        slug = self.slugify(region.name)
         url = reverse('optimap:feed-continent-page', kwargs={'continent_slug': slug})
         response = self.client.get(url)
 
@@ -162,7 +234,7 @@ def test_continent_page_shows_region_metadata(self):
     def test_ocean_page_shows_region_metadata(self):
         """Test that ocean pages show correct region metadata."""
         region = GlobalRegion.objects.filter(region_type=GlobalRegion.OCEAN).first()
-        slug = self._slugify(region.name)
+        slug = self.slugify(region.name)
         url = reverse('optimap:feed-ocean-page', kwargs={'ocean_slug': slug})
         response = self.client.get(url)
 
@@ -182,7 +254,7 @@ def test_ocean_page_shows_region_metadata(self):
     def test_feed_page_cache_refresh(self):
         """Test that ?now parameter forces cache refresh."""
         region = GlobalRegion.objects.filter(region_type=GlobalRegion.CONTINENT).first()
-        slug = self._slugify(region.name)
+        slug = self.slugify(region.name)
         url = reverse('optimap:feed-continent-page', kwargs={'continent_slug': slug})
 
         # First request (no cache)

tests/test_feed_landing_pages.py renamed to tests/test_feeds_global_landing_pages.py

@@ -41,7 +41,7 @@ def test_harvest_regular_metadata_sends_email(self, mock_parser, mock_get):
         fake_response.content = b"<OAI-PMH><ListRecords></ListRecords></OAI-PMH>"
         mock_get.return_value = fake_response
 
-        def fake_parser_func(content, event, max_records=None):
+        def fake_parser_func(content, event, max_records=None, warning_collector=None):
             Work.objects.create(
                 title="Test Publication 1",
                 doi="10.1000/1",

tests/test_regular_harvesting.py

@@ -28,6 +28,8 @@ class Command(BaseCommand):
     help = "Load 7 continents (Esri Hub) and 5 oceans (MarineRegions IHO) into GlobalRegion"
 
     def handle(self, *args, **options):
+        self.stdout.write(f"Looading global regions…")
+
         continents_path = os.path.join(COMMAND_DIR, CONTINENTS_FILE)
 
         if os.path.exists(continents_path):

works/management/commands/load_global_regions.py

@@ -202,7 +202,7 @@ class MapSearchManager {
       if (this.isSearchActive) {
         console.log('Clearing active search...');
         this.showAllPublications();
-        this.announce('Search cleared. Showing all publications.');
+        this.announce('Search cleared. Showing all works.');
       }
       console.groupEnd();
       return;
@@ -439,7 +439,7 @@ class MapSearchManager {
   showAllPublications() {
     if (!this.map) return;
 
-    console.log('🗺️ Showing all publications...');
+    console.log('🗺️ Showing all works...');
 
     // Remove filtered layer if it exists
     if (this.filteredLayer) {
@@ -466,7 +466,7 @@ class MapSearchManager {
       const bounds = this.publicationsGroup.getBounds();
       if (bounds.isValid()) {
         this.map.fitBounds(bounds);
-        console.log('🗺️ Map fitted to all publications');
+        console.log('🗺️ Map fitted to all works');
       }
     }
 
@@ -487,7 +487,7 @@ class MapSearchManager {
     }
 
     this.showAllPublications();
-    this.announce('Search cleared. Showing all publications.');
+    this.announce('Search cleared. Showing all works.');
   }
 
   /**
@@ -517,7 +517,7 @@ class MapSearchManager {
    */
   updatePublications(publications) {
     this.allPublications = publications || [];
-    console.log(`Map search updated with ${this.allPublications.length} publications`);
+    console.log(`Map search updated with ${this.allPublications.length} works`);
 
     // If search is active, re-run search
     if (this.isSearchActive && this.searchInput && this.searchInput.value.trim().length >= this.minSearchLength) {

works/static/js/map-search.js

@@ -8,7 +8,7 @@ <h1>All Works</h1>
 
     {% if is_admin %}
       <p class="alert alert-info">
-        <strong>Admin view:</strong> You can see all publications regardless of status. Status labels are shown next to each entry.
+        <strong>Admin view:</strong> You can see all works regardless of status. Status labels are shown next to each entry.
       </p>
     {% endif %}
 
@@ -137,7 +137,7 @@ <h5 class="work-title mb-2">
           </div>
         </div>
       {% empty %}
-        <p class="alert alert-warning">No publications found.</p>
+        <p class="alert alert-warning">No works found.</p>
       {% endfor %}
     </div>
 

works/templates/works.html

@@ -132,8 +132,8 @@ def main(request):
 
 def contribute(request):
     """
-    Page showing harvested publications that need spatial or temporal extent contributions.
-    Displays publications with Harvested status that are missing geometry or temporal extent.
+    Page showing harvested works that need spatial or temporal extent contributions.
+    Displays works with harvested status that are missing geometry or temporal extent.
     """
     from django.contrib.gis.geos import GeometryCollection
     from django.db.models import Q

works/views.py

@@ -26,9 +26,7 @@
 
 def contribute(request):
     """
-    Page showing harvested publications that need spatial or temporal extent contributions.
-    Displays publications with Harvested status that are missing geometry or temporal extent.
-
+    Page showing harvested works that need spatial or temporal extent contributions.
     Supports pagination with user-selectable page size.
     """
     from django.contrib.gis.geos import GeometryCollection