diff --git a/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports.rs b/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports.rs index af730ae2..033861c4 100644 --- a/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports.rs +++ b/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports.rs @@ -1,22 +1,20 @@ -mod external_adapter_detail_reports; -mod external_adapter_manifest_reports; -mod external_adapter_misc_reports; -mod external_adapter_summary_reports; +mod details; +mod manifest; +mod misc; +mod summary; pub(super) use self::{ - external_adapter_detail_reports::{ + details::{ AdapterScenarioJudgment, AdapterSource, AdapterSuiteCoverage, ExternalAdapterReport, }, - external_adapter_manifest_reports::{ - ExternalAdapterManifest, ExternalAdapterSection, ExternalDockerIsolation, - }, - external_adapter_misc_reports::{AdapterReport, CaptureIntegrationReport}, - external_adapter_summary_reports::{ + manifest::{ExternalAdapterManifest, ExternalAdapterSection, ExternalDockerIsolation}, + misc::{AdapterReport, CaptureIntegrationReport}, + summary::{ AdapterStatusCounts, ExternalAdapterSummary, ScenarioOutcomeCounts, ScenarioPositionCounts, }, }; #[allow(unused_imports)] -pub(super) use external_adapter_detail_reports::{ +pub(super) use details::{ AdapterCapabilityCoverage, AdapterEvidencePointer, AdapterExecutionEvidence, AdapterExecutionMetadata, }; diff --git a/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/external_adapter_detail_reports.rs b/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/details.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/external_adapter_detail_reports.rs rename to apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/details.rs diff --git a/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/external_adapter_manifest_reports.rs b/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/manifest.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/external_adapter_manifest_reports.rs rename to apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/manifest.rs diff --git a/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/external_adapter_misc_reports.rs b/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/misc.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/external_adapter_misc_reports.rs rename to apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/misc.rs diff --git a/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/external_adapter_summary_reports.rs b/apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/summary.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/external_adapter_summary_reports.rs rename to apps/elf-eval/src/bin/real_world_job_benchmark/external_adapter_reports/summary.rs diff --git a/apps/elf-eval/src/bin/real_world_job_benchmark/main.rs b/apps/elf-eval/src/bin/real_world_job_benchmark/main.rs index 565ba87a..7b70d0aa 100644 --- a/apps/elf-eval/src/bin/real_world_job_benchmark/main.rs +++ b/apps/elf-eval/src/bin/real_world_job_benchmark/main.rs @@ -24,11 +24,14 @@ mod scoreboard; mod scoreboard_reports; mod scoring; mod source_backed_quality; -mod source_backed_quality_reports; mod summary; mod summary_reports; mod validation; +pub(crate) use source_backed_quality::{ + SourceBackedQualityReport, source_backed_quality_report, validate_source_backed_quality_gate, +}; + use std::{ collections::{BTreeMap, BTreeSet}, fs, @@ -110,11 +113,6 @@ use scoreboard_reports::{ ScoreboardRow, }; use scoring::{job_report, score_job}; -use source_backed_quality::{source_backed_quality_report, validate_source_backed_quality_gate}; -use source_backed_quality_reports::{ - SourceBackedContextPackDecisionCounts, SourceBackedQualityMetrics, SourceBackedQualityReport, - SourceBackedScenarioCoverage, -}; use summary::{evolution_summary, follow_up_reports, report_summary, suite_reports}; use summary_reports::{ ConsolidationSummaryReport, KnowledgeSummary, MemorySummaryReport, ProactiveBriefSummaryReport, diff --git a/apps/elf-eval/src/bin/real_world_job_benchmark/source_backed_quality.rs b/apps/elf-eval/src/bin/real_world_job_benchmark/source_backed_quality.rs index 9af4cc20..4161f70d 100644 --- a/apps/elf-eval/src/bin/real_world_job_benchmark/source_backed_quality.rs +++ b/apps/elf-eval/src/bin/real_world_job_benchmark/source_backed_quality.rs @@ -1,7 +1,12 @@ -use crate::{ - BTreeSet, JobReport, RealWorldJob, ReportSummary, ScoreboardReport, +mod reports; + +pub(super) use reports::{ SourceBackedContextPackDecisionCounts, SourceBackedQualityMetrics, SourceBackedQualityReport, - SourceBackedScenarioCoverage, TypedStatus, formatting, + SourceBackedScenarioCoverage, +}; + +use crate::{ + BTreeSet, JobReport, RealWorldJob, ReportSummary, ScoreboardReport, TypedStatus, formatting, }; const SOURCE_BACKED_QUALITY_SCHEMA: &str = "elf.source_backed_memory_quality_benchmark/v1"; diff --git a/apps/elf-eval/src/bin/real_world_job_benchmark/source_backed_quality_reports.rs b/apps/elf-eval/src/bin/real_world_job_benchmark/source_backed_quality/reports.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_job_benchmark/source_backed_quality_reports.rs rename to apps/elf-eval/src/bin/real_world_job_benchmark/source_backed_quality/reports.rs diff --git a/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback.rs b/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback.rs index 723dfc10..aff9cac4 100644 --- a/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback.rs +++ b/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback.rs @@ -1,4 +1,4 @@ -mod dreaming_readback_artifacts; +mod artifacts; use crate::{ AGENT_ID, DreamingReadbackMaterializationEvidence, DreamingReadbackOutput, ElfService, @@ -85,10 +85,10 @@ pub(super) async fn materialize_elf_dreaming_readback( let generated_at = OffsetDateTime::now_utc().format(&Rfc3339)?; let service_evidence_ids = service_readback_evidence_ids(service, project_id).await?; - let mut artifacts = dreaming_readback_artifacts::dreaming_readback_template_artifacts(loaded)?; + let mut artifacts = artifacts::dreaming_readback_template_artifacts(loaded)?; for artifact in &mut artifacts { - dreaming_readback_artifacts::stamp_dreaming_readback_artifact( + artifacts::stamp_dreaming_readback_artifact( artifact, loaded, project_id, @@ -100,10 +100,7 @@ pub(super) async fn materialize_elf_dreaming_readback( let mut artifact_source_refs = Vec::new(); for artifact in &artifacts { - dreaming_readback_artifacts::collect_dreaming_artifact_source_refs( - artifact, - &mut artifact_source_refs, - ); + artifacts::collect_dreaming_artifact_source_refs(artifact, &mut artifact_source_refs); } artifact_source_refs.sort(); @@ -119,10 +116,8 @@ pub(super) async fn materialize_elf_dreaming_readback( .filter(|source_ref| service_evidence_ids.contains(*source_ref)) .cloned() .collect::>(); - let scoring_evidence_ids = dreaming_readback_artifacts::dreaming_readback_scoring_evidence_ids( - loaded, - &service_evidence_ids, - ); + let scoring_evidence_ids = + artifacts::dreaming_readback_scoring_evidence_ids(loaded, &service_evidence_ids); let artifact_kind = match loaded.job.suite.as_str() { "memory_summary" => "elf.memory_summary/v1", "proactive_brief" => "elf.proactive_project_brief/v1", @@ -141,12 +136,8 @@ pub(super) async fn materialize_elf_dreaming_readback( source_mutation_count: 0, no_source_mutation_checked: true, }; - let trace_stages = - dreaming_readback_artifacts::dreaming_readback_trace_stages(loaded, &materialization); - let content = dreaming_readback_artifacts::dreaming_readback_content( - loaded.job.suite.as_str(), - &artifacts, - ); + let trace_stages = artifacts::dreaming_readback_trace_stages(loaded, &materialization); + let content = artifacts::dreaming_readback_content(loaded.job.suite.as_str(), &artifacts); let (memory_summaries, proactive_briefs, scheduled_tasks) = match loaded.job.suite.as_str() { "memory_summary" => (artifacts, Vec::new(), Vec::new()), "proactive_brief" => (Vec::new(), artifacts, Vec::new()), diff --git a/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts.rs b/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts.rs rename to apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts.rs diff --git a/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/content.rs b/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/content.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/content.rs rename to apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/content.rs diff --git a/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/scoring.rs b/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/scoring.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/scoring.rs rename to apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/scoring.rs diff --git a/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/source_refs.rs b/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/source_refs.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/source_refs.rs rename to apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/source_refs.rs diff --git a/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/stamp.rs b/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/stamp.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/stamp.rs rename to apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/stamp.rs diff --git a/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/template.rs b/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/template.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/template.rs rename to apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/template.rs diff --git a/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/trace.rs b/apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/trace.rs similarity index 100% rename from apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/dreaming_readback_artifacts/trace.rs rename to apps/elf-eval/src/bin/real_world_live_adapter/dreaming_readback/artifacts/trace.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core.rs b/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core.rs index 31d5ce74..56239040 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core.rs @@ -1,6 +1,6 @@ -mod benchmark_core_adversarial_scoreboard; -mod benchmark_core_blocker_rows; -mod benchmark_core_capture_sources; -mod benchmark_core_smoke_report; +#[path = "benchmark_core/adversarial_scoreboard.rs"] mod adversarial_scoreboard; +#[path = "benchmark_core/blocker_rows.rs"] mod blocker_rows; +#[path = "benchmark_core/capture_sources.rs"] mod capture_sources; +#[path = "benchmark_core/smoke_report.rs"] mod smoke_report; -pub(super) use benchmark_core_blocker_rows::assert_tracked_external_blocker_row; +pub(super) use blocker_rows::assert_tracked_external_blocker_row; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core_adversarial_scoreboard.rs b/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core/adversarial_scoreboard.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/benchmark_core_adversarial_scoreboard.rs rename to apps/elf-eval/tests/real_world_job_benchmark/benchmark_core/adversarial_scoreboard.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core_blocker_rows.rs b/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core/blocker_rows.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/benchmark_core_blocker_rows.rs rename to apps/elf-eval/tests/real_world_job_benchmark/benchmark_core/blocker_rows.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core_capture_sources.rs b/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core/capture_sources.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/benchmark_core_capture_sources.rs rename to apps/elf-eval/tests/real_world_job_benchmark/benchmark_core/capture_sources.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core_smoke_report.rs b/apps/elf-eval/tests/real_world_job_benchmark/benchmark_core/smoke_report.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/benchmark_core_smoke_report.rs rename to apps/elf-eval/tests/real_world_job_benchmark/benchmark_core/smoke_report.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports.rs b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports.rs index cf3361ff..0474d3f6 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports.rs @@ -1,7 +1,7 @@ -mod closeout_reports_agent_knowledge; -mod closeout_reports_competitor_strength; -mod closeout_reports_final_source_backed; -mod closeout_reports_graph_rag; -mod closeout_reports_helpers; -mod closeout_reports_openmemory; -mod closeout_reports_workspace; +#[path = "closeout_reports/agent_knowledge.rs"] mod agent_knowledge; +#[path = "closeout_reports/competitor_strength.rs"] mod competitor_strength; +#[path = "closeout_reports/final_source_backed.rs"] mod final_source_backed; +#[path = "closeout_reports/graph_rag.rs"] mod graph_rag; +#[path = "closeout_reports/helpers.rs"] mod helpers; +#[path = "closeout_reports/openmemory.rs"] mod openmemory; +#[path = "closeout_reports/workspace.rs"] mod workspace; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_agent_knowledge.rs b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/agent_knowledge.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_agent_knowledge.rs rename to apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/agent_knowledge.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_competitor_strength.rs b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/competitor_strength.rs similarity index 96% rename from apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_competitor_strength.rs rename to apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/competitor_strength.rs index 76607820..d144d146 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_competitor_strength.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/competitor_strength.rs @@ -3,7 +3,7 @@ use std::fs; use color_eyre::Result; use serde_json::Value; -use crate::{closeout_reports::closeout_reports_helpers, support}; +use crate::{closeout_reports::helpers, support}; #[test] fn p3_competitor_strength_absorption_report_preserves_claim_boundaries() -> Result<()> { @@ -93,7 +93,7 @@ fn p3_competitor_strength_absorption_report_preserves_claim_boundaries() -> Resu assert_eq!(item.pointer("/queued_label_applied").and_then(Value::as_bool), Some(false)); } - closeout_reports_helpers::assert_product_queue_items_reference_queue(products, queue)?; + helpers::assert_product_queue_items_reference_queue(products, queue)?; assert!(support::array_contains_str( &report, diff --git a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_final_source_backed.rs b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/final_source_backed.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_final_source_backed.rs rename to apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/final_source_backed.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_graph_rag.rs b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/graph_rag.rs similarity index 92% rename from apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_graph_rag.rs rename to apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/graph_rag.rs index f1b73cc6..1c44f1df 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_graph_rag.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/graph_rag.rs @@ -3,7 +3,7 @@ use std::fs; use color_eyre::Result; use serde_json::Value; -use crate::{closeout_reports::closeout_reports_helpers, support}; +use crate::{closeout_reports::helpers, support}; #[test] fn graph_rag_citation_navigation_promotion_preserves_typed_non_passes() -> Result<()> { @@ -109,14 +109,10 @@ fn graph_rag_adapter_matrix_report_preserves_no_parity_claims() -> Result<()> { ); let rows = support::array_at(&report, "/adapter_matrix")?; - let ragflow_citation = - closeout_reports_helpers::find_matrix_row(rows, "RAGFlow", "citation_quality")?; - let lightrag_retrieval = - closeout_reports_helpers::find_matrix_row(rows, "LightRAG", "retrieval_quality")?; - let graphrag_navigation = - closeout_reports_helpers::find_matrix_row(rows, "GraphRAG", "navigation_quality")?; - let graphrag_retrieval = - closeout_reports_helpers::find_matrix_row(rows, "GraphRAG", "retrieval_quality")?; + let ragflow_citation = helpers::find_matrix_row(rows, "RAGFlow", "citation_quality")?; + let lightrag_retrieval = helpers::find_matrix_row(rows, "LightRAG", "retrieval_quality")?; + let graphrag_navigation = helpers::find_matrix_row(rows, "GraphRAG", "navigation_quality")?; + let graphrag_retrieval = helpers::find_matrix_row(rows, "GraphRAG", "retrieval_quality")?; assert_eq!(ragflow_citation.pointer("/status").and_then(Value::as_str), Some("blocked")); assert_eq!(lightrag_retrieval.pointer("/status").and_then(Value::as_str), Some("incomplete")); diff --git a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_helpers.rs b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/helpers.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_helpers.rs rename to apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/helpers.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_openmemory.rs b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/openmemory.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_openmemory.rs rename to apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/openmemory.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_workspace.rs b/apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/workspace.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/closeout_reports_workspace.rs rename to apps/elf-eval/tests/real_world_job_benchmark/closeout_reports/workspace.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength.rs b/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength.rs index 0b38fd11..2bba9c71 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength.rs @@ -1,2 +1,2 @@ mod competitor_strength_live; -mod competitor_strength_profile; +#[path = "competitor_strength/profile.rs"] mod profile; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile.rs b/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile.rs similarity index 85% rename from apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile.rs rename to apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile.rs index adc9eaa3..d8d8171c 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile.rs @@ -1,7 +1,7 @@ -mod boundaries; -mod openviking; -mod qmd; -mod summary_terms; +#[path = "profile/boundaries.rs"] mod boundaries; +#[path = "profile/openviking.rs"] mod openviking; +#[path = "profile/qmd.rs"] mod qmd; +#[path = "profile/summary_terms.rs"] mod summary_terms; use std::fs; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile/boundaries.rs b/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile/boundaries.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile/boundaries.rs rename to apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile/boundaries.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile/openviking.rs b/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile/openviking.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile/openviking.rs rename to apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile/openviking.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile/qmd.rs b/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile/qmd.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile/qmd.rs rename to apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile/qmd.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile/summary_terms.rs b/apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile/summary_terms.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/competitor_strength_profile/summary_terms.rs rename to apps/elf-eval/tests/real_world_job_benchmark/competitor_strength/profile/summary_terms.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge.rs index c4307a5d..a535cb92 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge.rs @@ -1,5 +1,5 @@ -pub(crate) mod consolidation_knowledge_tests_helpers; +#[path = "consolidation_knowledge/helpers.rs"] pub(crate) mod helpers; -mod consolidation_knowledge_tests_capture; -mod consolidation_knowledge_tests_fixtures; -mod consolidation_knowledge_tests_live; +#[path = "consolidation_knowledge/capture.rs"] mod capture; +#[path = "consolidation_knowledge/fixtures.rs"] mod fixtures; +#[path = "consolidation_knowledge/live.rs"] mod live; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_capture.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/capture.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_capture.rs rename to apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/capture.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures.rs new file mode 100644 index 00000000..67a0dc41 --- /dev/null +++ b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures.rs @@ -0,0 +1,5 @@ +#[path = "fixtures/consolidation.rs"] mod consolidation; +#[path = "fixtures/knowledge.rs"] mod knowledge; +#[path = "fixtures/operator_debug.rs"] mod operator_debug; +#[path = "fixtures/project_decisions.rs"] mod project_decisions; +#[path = "fixtures/runner.rs"] mod runner; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/consolidation.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/consolidation.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/consolidation.rs rename to apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/consolidation.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/knowledge.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/knowledge.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/knowledge.rs rename to apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/knowledge.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/operator_debug.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/operator_debug.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/operator_debug.rs rename to apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/operator_debug.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/project_decisions.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/project_decisions.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/project_decisions.rs rename to apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/project_decisions.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/runner.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/runner.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures/runner.rs rename to apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/fixtures/runner.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_helpers.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/helpers.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_helpers.rs rename to apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/helpers.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_live.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/live.rs similarity index 95% rename from apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_live.rs rename to apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/live.rs index f0e90a96..613fbe62 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_live.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge/live.rs @@ -3,7 +3,7 @@ use std::fs; use color_eyre::Result; use serde_json::Value; -use crate::{consolidation_knowledge::consolidation_knowledge_tests_helpers, support}; +use crate::{consolidation_knowledge::helpers, support}; #[test] fn live_consolidation_report_preserves_reviewable_output_boundaries() -> Result<()> { @@ -25,8 +25,7 @@ fn live_consolidation_report_preserves_reviewable_output_boundaries() -> Result< let makefile = support::make_task_catalog()?; let live_script = fs::read_to_string(workspace.join("scripts/real-world-consolidation-live-adapter.sh"))?; - let live_adapter = - consolidation_knowledge_tests_helpers::real_world_live_adapter_sources(&workspace)?; + let live_adapter = helpers::real_world_live_adapter_sources(&workspace)?; assert_eq!( report.pointer("/schema").and_then(Value::as_str), @@ -140,8 +139,7 @@ fn live_knowledge_page_rebuild_lint_has_dedicated_docker_task() -> Result<()> { let docker_script = fs::read_to_string(workspace.join("scripts/real-world-docker.sh"))?; let live_script = fs::read_to_string(workspace.join("scripts/real-world-knowledge-live-adapter.sh"))?; - let live_adapter = - consolidation_knowledge_tests_helpers::real_world_live_adapter_sources(&workspace)?; + let live_adapter = helpers::real_world_live_adapter_sources(&workspace)?; let knowledge_spec = fs::read_to_string( workspace.join("docs").join("spec").join("system_knowledge_pages_v1.md"), )?; @@ -191,8 +189,7 @@ fn live_knowledge_page_rebuild_lint_has_dedicated_docker_task() -> Result<()> { assert!(live_adapter.contains("KnowledgePageLintRequest")); assert!(live_adapter.contains("KnowledgePageSearchRequest")); assert!( - consolidation_knowledge_tests_helpers::real_world_job_benchmark_sources(&workspace)? - .contains("version_diff_coverage") + helpers::real_world_job_benchmark_sources(&workspace)?.contains("version_diff_coverage") ); assert!(knowledge_spec.contains("elf.knowledge_page.version_diff/v1")); assert!( diff --git a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures.rs b/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures.rs deleted file mode 100644 index 1bd9a2a6..00000000 --- a/apps/elf-eval/tests/real_world_job_benchmark/consolidation_knowledge_tests_fixtures.rs +++ /dev/null @@ -1,5 +0,0 @@ -mod consolidation; -mod knowledge; -mod operator_debug; -mod project_decisions; -mod runner; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/external_adapters.rs b/apps/elf-eval/tests/real_world_job_benchmark/external_adapters.rs index b6feede9..b7e970cf 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/external_adapters.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/external_adapters.rs @@ -1,12 +1,12 @@ -mod external_adapters_first_generation; -mod external_adapters_fixture; -mod external_adapters_graph_gates; -mod external_adapters_letta; -mod external_adapters_live_sweep; -mod external_adapters_operator_debug; +#[path = "external_adapters/first_generation.rs"] mod first_generation; +#[path = "external_adapters/fixture.rs"] mod fixture; +#[path = "external_adapters/graph_gates.rs"] mod graph_gates; mod graph_rag; +#[path = "external_adapters/letta.rs"] mod letta; +#[path = "external_adapters/live_sweep.rs"] mod live_sweep; mod loss_summary; mod manifest_summary; +#[path = "external_adapters/operator_debug.rs"] mod operator_debug; mod validation; use color_eyre::Result; @@ -51,7 +51,7 @@ fn assert_external_adapter_manifest_records(report: &Value) -> Result<()> { support::find_by_field(adapters, "/adapter_id", "openviking_deep_profile_gate")?; let letta = support::find_by_field(adapters, "/adapter_id", "letta_research_gate")?; - external_adapters_fixture::assert_elf_fixture_adapter_record(elf)?; + fixture::assert_elf_fixture_adapter_record(elf)?; assert_eq!( elf_live.pointer("/evidence_class").and_then(Value::as_str), @@ -59,8 +59,8 @@ fn assert_external_adapter_manifest_records(report: &Value) -> Result<()> { ); assert_eq!(elf_live.pointer("/overall_status").and_then(Value::as_str), Some("wrong_result")); - external_adapters_live_sweep::assert_live_sweep_record(elf_live, "blocked")?; - external_adapters_operator_debug::assert_operator_debug_live_adapter_records( + live_sweep::assert_live_sweep_record(elf_live, "blocked")?; + operator_debug::assert_operator_debug_live_adapter_records( elf_operator_debug, qmd_operator_debug, )?; @@ -68,7 +68,7 @@ fn assert_external_adapter_manifest_records(report: &Value) -> Result<()> { assert_eq!(qmd.pointer("/overall_status").and_then(Value::as_str), Some("pass")); assert_eq!(qmd.pointer("/suites/0/status").and_then(Value::as_str), Some("not_encoded")); - external_adapters_fixture::assert_qmd_live_baseline_record(qmd); + fixture::assert_qmd_live_baseline_record(qmd); assert_eq!( qmd_live.pointer("/evidence_class").and_then(Value::as_str), @@ -76,14 +76,14 @@ fn assert_external_adapter_manifest_records(report: &Value) -> Result<()> { ); assert_eq!(qmd_live.pointer("/overall_status").and_then(Value::as_str), Some("wrong_result")); - external_adapters_live_sweep::assert_live_sweep_record(qmd_live, "blocked")?; + live_sweep::assert_live_sweep_record(qmd_live, "blocked")?; assert_eq!( agentmemory.pointer("/capabilities/1/status").and_then(Value::as_str), Some("mocked") ); - external_adapters_first_generation::assert_first_generation_adapter_records( + first_generation::assert_first_generation_adapter_records( agentmemory, mem0, memsearch, @@ -92,10 +92,8 @@ fn assert_external_adapter_manifest_records(report: &Value) -> Result<()> { assert_eq!(openviking.pointer("/overall_status").and_then(Value::as_str), Some("wrong_result")); - external_adapters_graph_gates::assert_graph_rag_research_gate_records( - ragflow, lightrag, graphrag, - ); - external_adapters_graph_gates::assert_graphiti_zep_adapter(graphiti_zep); + graph_gates::assert_graph_rag_research_gate_records(ragflow, lightrag, graphrag); + graph_gates::assert_graphiti_zep_adapter(graphiti_zep); graph_rag::assert_graphify_adapter(graphify)?; graph_rag::assert_graph_rag_representative_scenarios( ragflow, @@ -104,8 +102,8 @@ fn assert_external_adapter_manifest_records(report: &Value) -> Result<()> { graphiti_zep, graphify, )?; - external_adapters_letta::assert_letta_core_archival_gate(letta)?; - external_adapters_fixture::assert_qmd_deep_profile_gate(qmd_deep); + letta::assert_letta_core_archival_gate(letta)?; + fixture::assert_qmd_deep_profile_gate(qmd_deep); assert_eq!( qmd_deep.pointer("/capabilities/2/status").and_then(Value::as_str), @@ -120,7 +118,7 @@ fn assert_external_adapter_manifest_records(report: &Value) -> Result<()> { Some("docker_local_embed_context_trajectory_gate") ); - external_adapters_fixture::assert_openviking_deep_profile_gate(openviking_deep); + fixture::assert_openviking_deep_profile_gate(openviking_deep); assert_eq!( openviking_deep.pointer("/result/artifact").and_then(Value::as_str), diff --git a/apps/elf-eval/tests/real_world_job_benchmark/external_adapters_first_generation.rs b/apps/elf-eval/tests/real_world_job_benchmark/external_adapters/first_generation.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/external_adapters_first_generation.rs rename to apps/elf-eval/tests/real_world_job_benchmark/external_adapters/first_generation.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/external_adapters_fixture.rs b/apps/elf-eval/tests/real_world_job_benchmark/external_adapters/fixture.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/external_adapters_fixture.rs rename to apps/elf-eval/tests/real_world_job_benchmark/external_adapters/fixture.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/external_adapters_graph_gates.rs b/apps/elf-eval/tests/real_world_job_benchmark/external_adapters/graph_gates.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/external_adapters_graph_gates.rs rename to apps/elf-eval/tests/real_world_job_benchmark/external_adapters/graph_gates.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/external_adapters_letta.rs b/apps/elf-eval/tests/real_world_job_benchmark/external_adapters/letta.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/external_adapters_letta.rs rename to apps/elf-eval/tests/real_world_job_benchmark/external_adapters/letta.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/external_adapters_live_sweep.rs b/apps/elf-eval/tests/real_world_job_benchmark/external_adapters/live_sweep.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/external_adapters_live_sweep.rs rename to apps/elf-eval/tests/real_world_job_benchmark/external_adapters/live_sweep.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/external_adapters_operator_debug.rs b/apps/elf-eval/tests/real_world_job_benchmark/external_adapters/operator_debug.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/external_adapters_operator_debug.rs rename to apps/elf-eval/tests/real_world_job_benchmark/external_adapters/operator_debug.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering.rs b/apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering.rs index 32de0325..5108ab32 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering.rs @@ -1,2 +1,2 @@ -mod markdown_rendering_external_adapters; -mod markdown_rendering_generated; +#[path = "markdown_rendering/external_adapters.rs"] mod external_adapters; +#[path = "markdown_rendering/generated.rs"] mod generated; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering_external_adapters.rs b/apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering/external_adapters.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering_external_adapters.rs rename to apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering/external_adapters.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering_generated.rs b/apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering/generated.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering_generated.rs rename to apps/elf-eval/tests/real_world_job_benchmark/markdown_rendering/generated.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/production_ops.rs b/apps/elf-eval/tests/real_world_job_benchmark/production_ops.rs index ba03c605..b962f8fc 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/production_ops.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/production_ops.rs @@ -1,5 +1,5 @@ +#[path = "production_ops/failure_cases.rs"] mod failure_cases; mod production_ops_evidence; -mod production_ops_failure_cases; mod production_ops_jobs; mod production_ops_summary; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/production_ops_failure_cases.rs b/apps/elf-eval/tests/real_world_job_benchmark/production_ops/failure_cases.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/production_ops_failure_cases.rs rename to apps/elf-eval/tests/real_world_job_benchmark/production_ops/failure_cases.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary.rs b/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary.rs index 0f70a260..9b614d6c 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary.rs @@ -1,19 +1,19 @@ -mod root_aggregate_summary_counts; -mod root_aggregate_summary_scoreboard; -mod root_aggregate_summary_suite_summaries; +#[path = "root_aggregate_summary/counts.rs"] mod counts; +#[path = "root_aggregate_summary/scoreboard.rs"] mod scoreboard; +#[path = "root_aggregate_summary/suite_summaries.rs"] mod suite_summaries; use color_eyre::Result; use serde_json::Value; pub(crate) fn assert_root_aggregate_summary(report: &Value) -> Result<()> { - root_aggregate_summary_counts::assert_root_summary_counts(report); - root_aggregate_summary_scoreboard::assert_root_scoreboard_summary(report)?; - root_aggregate_summary_counts::assert_root_consolidation_summary(report); - root_aggregate_summary_counts::assert_root_local_organizer_summary(report); - root_aggregate_summary_suite_summaries::assert_root_knowledge_summary(report); - root_aggregate_summary_suite_summaries::assert_root_proactive_brief_summary(report); - root_aggregate_summary_suite_summaries::assert_root_scheduled_memory_summary(report); - root_aggregate_summary_suite_summaries::assert_root_work_continuity_summary(report); + counts::assert_root_summary_counts(report); + scoreboard::assert_root_scoreboard_summary(report)?; + counts::assert_root_consolidation_summary(report); + counts::assert_root_local_organizer_summary(report); + suite_summaries::assert_root_knowledge_summary(report); + suite_summaries::assert_root_proactive_brief_summary(report); + suite_summaries::assert_root_scheduled_memory_summary(report); + suite_summaries::assert_root_work_continuity_summary(report); Ok(()) } diff --git a/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary_counts.rs b/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary/counts.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary_counts.rs rename to apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary/counts.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary_scoreboard.rs b/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary/scoreboard.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary_scoreboard.rs rename to apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary/scoreboard.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary_suite_summaries.rs b/apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary/suite_summaries.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary_suite_summaries.rs rename to apps/elf-eval/tests/real_world_job_benchmark/root_aggregate_summary/suite_summaries.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports.rs b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports.rs index 8b5a9ea2..7508fef6 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports.rs @@ -1,3 +1,3 @@ -mod trace_replay_reports_graph_topic_map; -mod trace_replay_reports_qmd_trace_replay; -mod trace_replay_reports_source_scan; +#[path = "trace_replay_reports/graph_topic_map.rs"] mod graph_topic_map; +#[path = "trace_replay_reports/qmd_trace_replay.rs"] mod qmd_trace_replay; +#[path = "trace_replay_reports/source_scan.rs"] mod source_scan; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_graph_topic_map.rs b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/graph_topic_map.rs similarity index 83% rename from apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_graph_topic_map.rs rename to apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/graph_topic_map.rs index 2a3c55d7..55a7b4d3 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_graph_topic_map.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/graph_topic_map.rs @@ -2,7 +2,7 @@ use std::fs; use color_eyre::Result; -use crate::{support, trace_replay_reports::trace_replay_reports_source_scan}; +use crate::{support, trace_replay_reports::source_scan}; #[test] fn graph_topic_map_report_wires_source_backed_graph_lite_readback() -> Result<()> { @@ -10,10 +10,9 @@ fn graph_topic_map_report_wires_source_backed_graph_lite_readback() -> Result<() let benchmarking_index = fs::read_to_string(support::benchmarking_index_path()?)?; let readme = fs::read_to_string(support::readme_path()?)?; let workspace = support::workspace_root()?; - let graph_report_service = - trace_replay_reports_source_scan::graph_report_service_sources(&workspace)?; - let api_routes = trace_replay_reports_source_scan::api_route_sources(&workspace)?; - let mcp_server = trace_replay_reports_source_scan::mcp_server_sources(&workspace)?; + let graph_report_service = source_scan::graph_report_service_sources(&workspace)?; + let api_routes = source_scan::api_route_sources(&workspace)?; + let mcp_server = source_scan::mcp_server_sources(&workspace)?; let graph_spec = fs::read_to_string( support::workspace_root()?.join("docs/spec/system_graph_memory_postgres_v1.md"), )?; diff --git a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay.rs b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay.rs similarity index 75% rename from apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay.rs rename to apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay.rs index 47e965b2..0914d4c0 100644 --- a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay.rs +++ b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay.rs @@ -1,7 +1,7 @@ -mod trace_replay_adoption_json; -mod trace_replay_diagnostics_json; -mod trace_replay_markdown_assertions; -mod trace_replay_viewer_boundaries; +#[path = "qmd_trace_replay/adoption_json.rs"] mod adoption_json; +#[path = "qmd_trace_replay/diagnostics_json.rs"] mod diagnostics_json; +#[path = "qmd_trace_replay/markdown_assertions.rs"] mod markdown_assertions; +#[path = "qmd_trace_replay/viewer_boundaries.rs"] mod viewer_boundaries; use std::fs; @@ -23,8 +23,8 @@ fn qmd_trace_replay_diagnostics_report_preserves_claim_boundaries() -> Result<() support::competitor_strength_adoption_report_json_path()?, )?)?; - trace_replay_diagnostics_json::assert_trace_replay_diagnostics_json(&report)?; - trace_replay_markdown_assertions::assert_trace_replay_diagnostics_markdown(&markdown); + diagnostics_json::assert_trace_replay_diagnostics_json(&report)?; + markdown_assertions::assert_trace_replay_diagnostics_markdown(&markdown); assert!(readme.contains("ELF/qmd Trace Replay Diagnostics Report - June 11, 2026")); assert!(benchmarking_index.contains("2026-06-11-elf-qmd-trace-replay-diagnostics-report.md")); @@ -34,7 +34,7 @@ fn qmd_trace_replay_diagnostics_report_preserves_claim_boundaries() -> Result<() assert!(adoption_report.contains("Letta scenario rows remain")); assert!(adoption_report.contains("blocked or `not_tested`")); - trace_replay_viewer_boundaries::assert_trace_replay_viewer_blocker_boundaries( + viewer_boundaries::assert_trace_replay_viewer_blocker_boundaries( &readme, &markdown, &adoption_report, @@ -54,7 +54,7 @@ fn qmd_trace_replay_diagnostics_report_preserves_claim_boundaries() -> Result<() } )); - trace_replay_adoption_json::assert_trace_replay_adoption_json(&adoption_json)?; + adoption_json::assert_trace_replay_adoption_json(&adoption_json)?; Ok(()) } diff --git a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay/trace_replay_adoption_json.rs b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay/adoption_json.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay/trace_replay_adoption_json.rs rename to apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay/adoption_json.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay/trace_replay_diagnostics_json.rs b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay/diagnostics_json.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay/trace_replay_diagnostics_json.rs rename to apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay/diagnostics_json.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay/trace_replay_markdown_assertions.rs b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay/markdown_assertions.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay/trace_replay_markdown_assertions.rs rename to apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay/markdown_assertions.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay/trace_replay_viewer_boundaries.rs b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay/viewer_boundaries.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_qmd_trace_replay/trace_replay_viewer_boundaries.rs rename to apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/qmd_trace_replay/viewer_boundaries.rs diff --git a/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_source_scan.rs b/apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/source_scan.rs similarity index 100% rename from apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports_source_scan.rs rename to apps/elf-eval/tests/real_world_job_benchmark/trace_replay_reports/source_scan.rs diff --git a/packages/elf-service/tests/acceptance/outbox_eventual_consistency.rs b/packages/elf-service/tests/acceptance/outbox_consistency.rs similarity index 100% rename from packages/elf-service/tests/acceptance/outbox_eventual_consistency.rs rename to packages/elf-service/tests/acceptance/outbox_consistency.rs diff --git a/packages/elf-service/tests/acceptance/suite.rs b/packages/elf-service/tests/acceptance/suite.rs index 416a7c80..0c30fa5b 100644 --- a/packages/elf-service/tests/acceptance/suite.rs +++ b/packages/elf-service/tests/acceptance/suite.rs @@ -10,7 +10,7 @@ mod graph_ingestion; mod idempotency; mod knowledge_pages; mod memory_history; -mod outbox_eventual_consistency; +mod outbox_consistency; #[path = "suite/providers.rs"] mod providers; mod rebuild_qdrant; #[path = "suite/runtime.rs"] mod runtime;