Update review scope checks for the consolidated rules

tools/test_review_scope.py

@@ -13,18 +13,20 @@ class ReviewScopeTests(unittest.TestCase):
         self.rationale = json.loads((REVISIONS / 'primary-content-20261103-rationale.json').read_text())
         self.provenance = json.loads((REVISIONS / 'primary-content-20261103-provenance.json').read_text())
         self.keys = {(c['suite'], c['case_id']) for c in self.rationale['changes']}
+        self.consolidated = self.provenance['consolidated_same_site_checks']
+        self.consolidated_keys = {(c['suite'], c['case_id']) for c in self.consolidated['cases']}
 
     def test_scope_and_population(self):
-        self.assertEqual(len(self.keys), 66)
+        self.assertEqual(len(self.keys), 69)
         self.assertEqual(Counter(s for s, _ in self.keys),
-                         {'articles': 34, 'access-restrictions': 14, 'dynamic-content': 6, 'popular-sites': 12})
+                         {'articles': 37, 'access-restrictions': 14, 'dynamic-content': 6, 'popular-sites': 12})
         population = json.loads((ROOT / 'definitions/populations/primary-content-20261103.json').read_text())
         self.assertLessEqual(self.keys, {(c['suite'], c['id']) for c in population['cases']})
 
     def test_observations_cover_only_authorized_changes(self):
         rows = self.provenance['current_source_observations']
         self.assertEqual(len(rows), 64)
-        self.assertEqual({(c['suite'], c['case_id']) for c in rows}, self.keys - {('articles', 'article-009'), ('articles', 'article-064')})
+        self.assertEqual({(c['suite'], c['case_id']) for c in rows}, self.keys - self.consolidated_keys - {('articles', 'article-009'), ('articles', 'article-064')})
         for row in rows:
             self.assertFalse(row['browser_visibility_verified'])
             self.assertFalse(row['historical_capture'])
@@ -33,7 +35,7 @@ class ReviewScopeTests(unittest.TestCase):
                              len(row['removed_anchor_ids_not_found_in_response']))
         reviews = self.provenance['current_source_reviews']
         self.assertEqual(len(reviews), 64)
-        self.assertEqual({(r['suite'], r['case_id']) for r in reviews}, self.keys - {('articles', 'article-009'), ('articles', 'article-064')})
+        self.assertEqual({(r['suite'], r['case_id']) for r in reviews}, self.keys - self.consolidated_keys - {('articles', 'article-009'), ('articles', 'article-064')})
         for review in reviews:
             self.assertIn((review['suite'], review['case_id']), self.keys)
             self.assertFalse(review['raw_capture_published'])
@@ -58,11 +60,11 @@ class ReviewScopeTests(unittest.TestCase):
     def test_counterfactual_records_bind_current_rules_and_exact_scope(self):
         import hashlib
         controls = self.provenance['scope_counterfactual_controls']
-        self.assertEqual(controls['proposed_revision_sha256'], hashlib.sha256(
+        self.assertEqual(self.consolidated['revision_sha256'], hashlib.sha256(
             (REVISIONS / 'primary-content-20261103.json').read_bytes()).hexdigest())
         rows = controls['cases']
         self.assertEqual(len(rows), 66)
-        self.assertEqual({(r['suite'], r['case_id']) for r in rows}, self.keys)
+        self.assertEqual({(r['suite'], r['case_id']) for r in rows}, self.keys - self.consolidated_keys)
         for row in rows:
             self.assertEqual(row['results'], {
                 'clean_before': False, 'clean_after': True,
@@ -73,6 +75,14 @@ class ReviewScopeTests(unittest.TestCase):
             for field in ('source_answer_sha256', 'clean_answer_sha256', 'shell_answer_sha256'):
                 self.assertRegex(row[field], r'^[0-9a-f]{64}$')
 
+    def test_consolidated_cases_keep_complete_answers_and_reject_shell_only(self):
+        self.assertEqual(self.consolidated_keys,
+                         {('articles', f'article-{i}') for i in ('044', '102', '104')})
+        for row in self.consolidated['cases']:
+            self.assertEqual(row['results'], {
+                'saved_before': True, 'saved_after': True, 'clean_before': False,
+                'clean_after': True, 'shell_after': False})
+
     def test_added_cases_retain_body_occurrences_and_full_controls(self):
         extra = self.provenance['additional_same_site_reviews']
         self.assertEqual({r['case_id'] for r in extra}, {'article-009', 'article-064'})