@ngocsangairvds/vsaf 4.1.8 → 4.1.9

package/skills/vds-skill/vds-scripts/diagram_generator/tests/test_component_coverage.py

@@ -1,182 +0,0 @@
-"""Property-based tests for component coverage.
-
-**Feature: insurance-diagram-accuracy, Property 2: Component Coverage**
-**Validates: Requirements 2.1, 2.2, 2.3, 2.4**
-
-For any service in the INSURANCE platform, the generated component diagram SHALL include
-all controller classes, service implementation classes, and repository interfaces found
-in the source code.
-"""
-
-import tempfile
-
-from hypothesis import given, settings
-from hypothesis import strategies as st
-from vds_diagram_generator.generator import PlantUMLGenerator
-from vds_diagram_generator.models import (
-    ControllerInfo,
-    EndpointInfo,
-    FeignClientInfo,
-    KafkaHandlerInfo,
-    RepositoryInfo,
-    ServiceAnalysis,
-    ServiceInfo,
-)
-
-# Strategies for generating test data
-endpoint_strategy = st.builds(
-    EndpointInfo,
-    method=st.sampled_from(["GET", "POST", "PUT", "DELETE"]),
-    path=st.text(alphabet="abcdefghijklmnopqrstuvwxyz/-_{}", min_size=1, max_size=50).map(lambda s: "/" + s),
-    method_name=st.text(alphabet="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", min_size=3, max_size=30),
-    service_method=st.none() | st.text(alphabet="abcdefghijklmnopqrstuvwxyz", min_size=3, max_size=20),
-)
-
-controller_strategy = st.builds(
-    ControllerInfo,
-    class_name=st.text(alphabet="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", min_size=5, max_size=30).map(
-        lambda s: s + "Controller"
-    ),
-    base_path=st.text(alphabet="abcdefghijklmnopqrstuvwxyz/-", min_size=0, max_size=30),
-    endpoints=st.lists(endpoint_strategy, min_size=1, max_size=5),
-)
-
-service_strategy = st.builds(
-    ServiceInfo,
-    class_name=st.text(alphabet="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", min_size=5, max_size=30).map(
-        lambda s: s + "ServiceImpl"
-    ),
-    interface_name=st.none()
-    | st.text(alphabet="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", min_size=5, max_size=25).map(
-        lambda s: s + "Service"
-    ),
-    methods=st.lists(st.text(alphabet="abcdefghijklmnopqrstuvwxyz", min_size=3, max_size=20), min_size=1, max_size=10),
-    dependencies=st.lists(
-        st.text(alphabet="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", min_size=5, max_size=20),
-        min_size=0,
-        max_size=5,
-    ),
-)
-
-repository_strategy = st.builds(
-    RepositoryInfo,
-    interface_name=st.text(
-        alphabet="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", min_size=5, max_size=25
-    ).map(lambda s: s + "Repository"),
-    entity_type=st.none()
-    | st.text(alphabet="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", min_size=3, max_size=20),
-    custom_methods=st.lists(
-        st.text(alphabet="abcdefghijklmnopqrstuvwxyz", min_size=5, max_size=25), min_size=0, max_size=5
-    ),
-)
-
-feign_client_strategy = st.builds(
-    FeignClientInfo,
-    interface_name=st.text(
-        alphabet="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", min_size=5, max_size=25
-    ).map(lambda s: s + "Client"),
-    target_service=st.text(alphabet="abcdefghijklmnopqrstuvwxyz-", min_size=5, max_size=30),
-    methods=st.lists(st.text(alphabet="abcdefghijklmnopqrstuvwxyz", min_size=3, max_size=20), min_size=1, max_size=5),
-)
-
-kafka_handler_strategy = st.builds(
-    KafkaHandlerInfo,
-    class_name=st.text(alphabet="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", min_size=5, max_size=25).map(
-        lambda s: s + "Handler"
-    ),
-    topics=st.lists(st.text(alphabet="abcdefghijklmnopqrstuvwxyz.-_", min_size=5, max_size=30), min_size=1, max_size=3),
-    methods=st.lists(st.text(alphabet="abcdefghijklmnopqrstuvwxyz", min_size=3, max_size=20), min_size=1, max_size=3),
-)
-
-service_analysis_strategy = st.builds(
-    ServiceAnalysis,
-    service_name=st.text(alphabet="abcdefghijklmnopqrstuvwxyz-", min_size=10, max_size=40),
-    controllers=st.lists(controller_strategy, min_size=1, max_size=3),
-    services=st.lists(service_strategy, min_size=1, max_size=3),
-    repositories=st.lists(repository_strategy, min_size=1, max_size=3),
-    feign_clients=st.lists(feign_client_strategy, min_size=0, max_size=3),
-    kafka_handlers=st.lists(kafka_handler_strategy, min_size=0, max_size=2),
-)
-
-
-class TestComponentCoverage:
-    """Property tests for component coverage.
-
-    **Feature: insurance-diagram-accuracy, Property 2: Component Coverage**
-    **Validates: Requirements 2.1, 2.2, 2.3, 2.4**
-    """
-
-    @given(analysis=service_analysis_strategy)
-    @settings(max_examples=100, deadline=None)
-    def test_component_diagram_includes_all_controllers(self, analysis: ServiceAnalysis) -> None:
-        """Property: All controller classes appear in the component diagram.
-
-        **Validates: Requirements 2.1** - WHEN a component diagram is generated
-        THEN the Diagram Generator SHALL include all actual controller classes.
-        """
-        generator = PlantUMLGenerator(tempfile.gettempdir())
-        diagram = generator.generate_component_diagram(analysis)
-
-        for controller in analysis.controllers:
-            assert controller.class_name in diagram, (
-                f"Controller {controller.class_name} not found in component diagram"
-            )
-
-    @given(analysis=service_analysis_strategy)
-    @settings(max_examples=100, deadline=None)
-    def test_component_diagram_includes_all_services(self, analysis: ServiceAnalysis) -> None:
-        """Property: All service implementation classes appear in the component diagram.
-
-        **Validates: Requirements 2.2** - WHEN a component diagram is generated
-        THEN the Diagram Generator SHALL include all actual service implementation classes.
-        """
-        generator = PlantUMLGenerator(tempfile.gettempdir())
-        diagram = generator.generate_component_diagram(analysis)
-
-        for service in analysis.services:
-            assert service.class_name in diagram, f"Service {service.class_name} not found in component diagram"
-
-    @given(analysis=service_analysis_strategy)
-    @settings(max_examples=100, deadline=None)
-    def test_component_diagram_includes_all_repositories(self, analysis: ServiceAnalysis) -> None:
-        """Property: All repository interfaces appear in the component diagram.
-
-        **Validates: Requirements 2.3** - WHEN a component diagram is generated
-        THEN the Diagram Generator SHALL include all repository interfaces.
-        """
-        generator = PlantUMLGenerator(tempfile.gettempdir())
-        diagram = generator.generate_component_diagram(analysis)
-
-        for repo in analysis.repositories:
-            assert repo.interface_name in diagram, f"Repository {repo.interface_name} not found in component diagram"
-
-    @given(analysis=service_analysis_strategy)
-    @settings(max_examples=100, deadline=None)
-    def test_component_diagram_includes_all_feign_clients(self, analysis: ServiceAnalysis) -> None:
-        """Property: All Feign client interfaces appear in the component diagram.
-
-        **Validates: Requirements 2.4** - WHEN a component diagram is generated
-        THEN the Diagram Generator SHALL show actual external service dependencies.
-        """
-        generator = PlantUMLGenerator(tempfile.gettempdir())
-        diagram = generator.generate_component_diagram(analysis)
-
-        for feign in analysis.feign_clients:
-            assert feign.interface_name in diagram, (
-                f"Feign client {feign.interface_name} not found in component diagram"
-            )
-
-    @given(analysis=service_analysis_strategy)
-    @settings(max_examples=100, deadline=None)
-    def test_component_diagram_shows_database_connection(self, analysis: ServiceAnalysis) -> None:
-        """Property: Component diagram shows database connection when repositories exist.
-
-        **Validates: Requirements 2.3** - Repositories should connect to database.
-        """
-        generator = PlantUMLGenerator(tempfile.gettempdir())
-        diagram = generator.generate_component_diagram(analysis)
-
-        if analysis.repositories:
-            assert "MariaDB" in diagram or "db" in diagram, (
-                "Database connection not shown in component diagram with repositories"
-            )

package/skills/vds-skill/vds-scripts/diagram_generator/tests/test_mermaid_output.py

@@ -1,80 +0,0 @@
-from pathlib import Path
-
-from vds_diagram_generator.mermaid_generator import MermaidGenerator
-from vds_diagram_generator.models import (
-    ControllerInfo,
-    EndpointInfo,
-    KafkaHandlerInfo,
-    RepositoryInfo,
-    ServiceAnalysis,
-    ServiceInfo,
-)
-
-
-def _sample_analysis() -> ServiceAnalysis:
-    return ServiceAnalysis(
-        service_name="sample-service",
-        controllers=[
-            ControllerInfo(
-                class_name="PolicyController",
-                base_path="/policy",
-                endpoints=[
-                    EndpointInfo(
-                        method="GET",
-                        path="/policy/{id}",
-                        method_name="getPolicy",
-                        service_method="fetchPolicy",
-                        service_class="PolicyServiceImpl",
-                    )
-                ],
-            )
-        ],
-        services=[
-            ServiceInfo(
-                class_name="PolicyServiceImpl",
-                interface_name="PolicyService",
-                methods=["fetchPolicy"],
-                dependencies=[],
-            )
-        ],
-        repositories=[
-            RepositoryInfo(
-                interface_name="PolicyRepository",
-                entity_type="Policy",
-                custom_methods=["findById"],
-            )
-        ],
-        feign_clients=[],
-        kafka_handlers=[
-            KafkaHandlerInfo(
-                class_name="EventConsumerHandler",
-                topics=["policy-event"],
-                methods=["processEvent"],
-            )
-        ],
-    )
-
-
-def test_mermaid_sequence_diagram_contains_participants(tmp_path: Path) -> None:
-    analysis = _sample_analysis()
-    generator = MermaidGenerator(tmp_path)
-
-    content = generator.generate_sequence_diagram(analysis)
-
-    assert "sequenceDiagram" in content
-    assert 'participant PolicyController as "PolicyController <<Controller>>"' in content
-    assert "Client->>PolicyController" in content
-    assert "Kafka->>EventConsumerHandler" in content
-
-
-def test_mermaid_files_written(tmp_path: Path) -> None:
-    analysis = _sample_analysis()
-    generator = MermaidGenerator(tmp_path)
-
-    seq_path, comp_path = generator.save_diagrams(analysis, tmp_path)
-
-    assert seq_path.exists()
-    assert comp_path.exists()
-    assert seq_path.suffix == ".mmd"
-    assert comp_path.suffix == ".mmd"
-    assert "graph TD" in comp_path.read_text(encoding="utf-8")

package/skills/vds-skill/vds-scripts/diagram_generator/tests/test_png_generation.py

@@ -1,112 +0,0 @@
-"""Property tests for PNG generation.
-
-**Feature: insurance-diagram-accuracy, Property 4: PNG Generation**
-**Validates: Requirements 4.1, 4.2**
-
-For any valid PUML file, rendering to PNG should produce a valid PNG file
-that exists and has non-zero size.
-"""
-
-from pathlib import Path
-
-from hypothesis import given, settings
-from hypothesis import strategies as st
-
-# List of services that should have PNG files
-SERVICES = [
-    "insurance-policy-business",
-    "insurance-claim-business",
-    "insurance-customer-business",
-    "insurance-proposal-business",
-    "insurance-promotion-business",
-    "insurance-payment-service",
-    "insurance-payment-service-v2",
-    "insurance-notification-spi",
-    "insurance-job-scheduler",
-    "insurance-centralized-sync-service",
-    "insurance-ocr-service",
-    "insurance-cms-be",
-    "insurance-customer-webview",
-    "insurance-insurer-service",
-    "insurance-socialized-insurance-service",
-    "insuremo-embedded-rule",
-    "insurance-timeout-process",
-    "insurance-renewal-process",
-    "insurance-reconcile-process",
-    "insurance-auto-underwriting-process",
-    "insurance-authentication-sync-process",
-    "insurance-common",
-    "insurance-insuremo-common",
-]
-
-BASE_PATH = Path(__file__).parent.parent.parent.parent / "docs-nttc/projects/INSURANCE/analysis/current-state"
-
-
-class TestPNGGeneration:
-    """Property tests for PNG generation."""
-
-    @given(service=st.sampled_from(SERVICES))
-    @settings(max_examples=len(SERVICES))
-    def test_sequence_diagram_png_exists(self, service: str):
-        """Property: For any service, sequence diagram PNG should exist.
-
-        **Feature: insurance-diagram-accuracy, Property 4: PNG Generation**
-        **Validates: Requirements 4.1**
-        """
-        service_dir = BASE_PATH / service
-        png_path = service_dir / f"{service}-sequence.png"
-
-        assert png_path.exists(), f"Sequence PNG missing for {service}"
-        assert png_path.stat().st_size > 0, f"Sequence PNG is empty for {service}"
-
-    @given(service=st.sampled_from(SERVICES))
-    @settings(max_examples=len(SERVICES))
-    def test_component_diagram_png_exists(self, service: str):
-        """Property: For any service, component diagram PNG should exist.
-
-        **Feature: insurance-diagram-accuracy, Property 4: PNG Generation**
-        **Validates: Requirements 4.1**
-        """
-        service_dir = BASE_PATH / service
-        png_path = service_dir / f"{service}-component.png"
-
-        assert png_path.exists(), f"Component PNG missing for {service}"
-        assert png_path.stat().st_size > 0, f"Component PNG is empty for {service}"
-
-    @given(service=st.sampled_from(SERVICES))
-    @settings(max_examples=len(SERVICES))
-    def test_png_is_valid_image(self, service: str):
-        """Property: For any service, PNG files should be valid PNG images.
-
-        **Feature: insurance-diagram-accuracy, Property 4: PNG Generation**
-        **Validates: Requirements 4.2**
-        """
-        service_dir = BASE_PATH / service
-
-        for diagram_type in ["sequence", "component"]:
-            png_path = service_dir / f"{service}-{diagram_type}.png"
-            if png_path.exists():
-                # Check PNG magic bytes
-                with open(png_path, "rb") as f:
-                    header = f.read(8)
-                    # PNG signature: 89 50 4E 47 0D 0A 1A 0A
-                    assert header[:4] == b"\x89PNG", f"Invalid PNG header for {service}-{diagram_type}"
-
-    def test_all_services_have_both_diagrams(self):
-        """Verify all services have both sequence and component PNG diagrams.
-
-        **Feature: insurance-diagram-accuracy, Property 4: PNG Generation**
-        **Validates: Requirements 4.1, 4.2**
-        """
-        missing = []
-        for service in SERVICES:
-            service_dir = BASE_PATH / service
-            seq_png = service_dir / f"{service}-sequence.png"
-            comp_png = service_dir / f"{service}-component.png"
-
-            if not seq_png.exists():
-                missing.append(f"{service}: sequence PNG")
-            if not comp_png.exists():
-                missing.append(f"{service}: component PNG")
-
-        assert not missing, f"Missing PNG files: {missing}"

package/skills/vds-skill/vds-scripts/diagram_generator/tests/test_scenario_templates.py

@@ -1,15 +0,0 @@
-from vds_diagram_generator.scenario_templates import list_templates_text, load_templates
-
-
-def test_load_templates_contains_policy_template() -> None:
-    templates = load_templates()
-    assert "policy-renewal" in templates
-    tpl = templates["policy-renewal"]
-    assert tpl.match == "renewal"
-    assert tpl.sequence_scope == "all"
-    assert tpl.controllers and "PolicyController" in tpl.controllers
-
-
-def test_list_templates_text_mentions_names() -> None:
-    listing = list_templates_text()
-    assert "policy-renewal" in listing

package/skills/vds-skill/vds-scripts/diagram_generator/tests/test_sequence_accuracy.py

@@ -1,93 +0,0 @@
-"""Property tests for sequence diagram accuracy verification."""
-
-import pytest
-from vds_diagram_generator.analyzer import JavaCodeAnalyzer
-from vds_diagram_generator.config import get_settings
-from vds_diagram_generator.generator import PlantUMLGenerator
-
-
-def test_all_endpoints_exist_in_source():
-    """Property test: Verify all endpoints in diagram exist in source code."""
-    settings = get_settings()
-    source_path = settings.get_project_source_path("INSURANCE")
-
-    if not source_path.exists():
-        pytest.skip("INSURANCE project source not found")
-
-    analyzer = JavaCodeAnalyzer(source_path)
-    analysis = analyzer.analyze_service("insurance-policy-business")
-
-    generator = PlantUMLGenerator(".")
-    diagram = generator.generate_sequence_diagram(analysis, include_rest_flows=True, include_kafka_flows=False)
-
-    for controller in analysis.controllers:
-        for endpoint in controller.endpoints:
-            assert endpoint.method in diagram
-            assert endpoint.path in diagram or endpoint.method_name in diagram
-
-
-def test_service_calls_inferred_correctly():
-    """Property test: Verify service method inference accuracy."""
-    settings = get_settings()
-    source_path = settings.get_project_source_path("INSURANCE")
-
-    if not source_path.exists():
-        pytest.skip("INSURANCE project source not found")
-
-    analyzer = JavaCodeAnalyzer(source_path)
-    analysis = analyzer.analyze_service("insurance-policy-business")
-
-    generator = PlantUMLGenerator(".")
-    diagram = generator.generate_sequence_diagram(analysis, include_rest_flows=True, include_kafka_flows=False)
-
-    inferred_count = 0
-    for controller in analysis.controllers:
-        for endpoint in controller.endpoints:
-            if endpoint.service_method:
-                inferred_count += 1
-                assert endpoint.service_method in diagram
-
-    assert inferred_count > 0
-
-
-def test_kafka_topics_match_source():
-    """Verify Kafka topics in diagram match @KafkaListener annotations."""
-    settings = get_settings()
-    source_path = settings.get_project_source_path("INSURANCE")
-
-    if not source_path.exists():
-        pytest.skip("INSURANCE project source not found")
-
-    analyzer = JavaCodeAnalyzer(source_path)
-    analysis = analyzer.analyze_service("insurance-policy-business")
-
-    generator = PlantUMLGenerator(".")
-    diagram = generator.generate_sequence_diagram(analysis, include_rest_flows=False, include_kafka_flows=True)
-
-    for handler in analysis.kafka_handlers:
-        for topic in handler.topics:
-            assert topic in diagram or "Kafka" in diagram
-
-
-def test_sequence_diagram_matches_code_structure():
-    """Integration test: Compare generated diagram with actual code structure."""
-    settings = get_settings()
-    source_path = settings.get_project_source_path("INSURANCE")
-
-    if not source_path.exists():
-        pytest.skip("INSURANCE project source not found")
-
-    analyzer = JavaCodeAnalyzer(source_path)
-    analysis = analyzer.analyze_service("insurance-policy-business")
-
-    generator = PlantUMLGenerator(".")
-    diagram = generator.generate_sequence_diagram(analysis)
-
-    assert len(analysis.controllers) > 0
-    assert len(analysis.services) > 0
-
-    for controller in analysis.controllers:
-        assert controller.class_name in diagram
-
-    for service in analysis.services[:5]:
-        assert service.class_name in diagram

package/skills/vds-skill/vds-scripts/diagram_generator/tests/test_structurizr_export.py

@@ -1,177 +0,0 @@
-"""Integration tests for Structurizr DSL + CLI tooling.
-
-**Feature: insurance-diagram-accuracy, Property 6: Structurizr Integration**
-**Validates: Requirements 19.2 (tests), 19.3 (backward compatibility), 19.4 (documentation readiness)**
-"""
-
-from __future__ import annotations
-
-import stat
-import tempfile
-import time
-from pathlib import Path
-
-from vds_diagram_generator.models import (
-    ControllerInfo,
-    EndpointInfo,
-    FeignClientInfo,
-    KafkaHandlerInfo,
-    RepositoryInfo,
-    ServiceAnalysis,
-    ServiceInfo,
-)
-from vds_diagram_generator.structurizr_cli import ExportFormat, StructurizrCLI, StructurizrExporter
-from vds_diagram_generator.structurizr_generator import StructurizrDSLGenerator
-
-
-def _sample_analysis() -> ServiceAnalysis:
-    controller = ControllerInfo(
-        class_name="PolicyController",
-        base_path="/policy",
-        endpoints=[
-            EndpointInfo(method="GET", path="/policy/{id}", method_name="getPolicy", service_method="findPolicy"),
-        ],
-    )
-    service = ServiceInfo(
-        class_name="PolicyServiceImpl",
-        interface_name="PolicyService",
-        methods=["findPolicy"],
-        dependencies=["PolicyRepository"],
-    )
-    repository = RepositoryInfo(
-        interface_name="PolicyRepository",
-        entity_type="PolicyEntity",
-        custom_methods=["findByPolicyNumber"],
-    )
-    feign = FeignClientInfo(
-        interface_name="InsurerClient",
-        target_service="insurer-service",
-        methods=["getInsurer"],
-    )
-    kafka_handler = KafkaHandlerInfo(
-        class_name="PolicyEventHandler",
-        topics=["policy.events"],
-        methods=["handlePolicyEvent"],
-    )
-
-    return ServiceAnalysis(
-        service_name="insurance-policy-business",
-        controllers=[controller],
-        services=[service],
-        repositories=[repository],
-        feign_clients=[feign],
-        kafka_handlers=[kafka_handler],
-    )
-
-
-class TestStructurizrDSLGenerator:
-    def test_service_workspace_contains_required_sections(self) -> None:
-        with tempfile.TemporaryDirectory() as tmpdir:
-            output_dir = Path(tmpdir)
-            generator = StructurizrDSLGenerator(output_dir)
-            workspace_path = generator.save_service_workspace(_sample_analysis(), output_dir=output_dir)
-
-            content = workspace_path.read_text(encoding="utf-8")
-            assert 'workspace "insurance-policy-business Architecture"' in content
-            assert "model {" in content
-            assert "views {" in content
-            assert "styles {" in content
-
-    def test_service_workspace_skips_rewrite_when_content_same(self) -> None:
-        with tempfile.TemporaryDirectory() as tmpdir:
-            output_dir = Path(tmpdir)
-            generator = StructurizrDSLGenerator(output_dir)
-            path = generator.save_service_workspace(_sample_analysis(), output_dir=output_dir)
-            first_mtime = path.stat().st_mtime_ns
-            time.sleep(0.01)  # ensure filesystem resolution window passes
-            path = generator.save_service_workspace(_sample_analysis(), output_dir=output_dir)
-            second_mtime = path.stat().st_mtime_ns
-            assert first_mtime == second_mtime, "File should not be rewritten when DSL is unchanged"
-
-
-def _create_fake_cli(tmpdir: Path) -> Path:
-    """Create a lightweight Structurizr CLI stub that writes a dummy output file."""
-    script_path = tmpdir / "structurizr-cli"
-    script_path.write_text(
-        """#!/usr/bin/env python3
-import sys
-from pathlib import Path
-
-args = sys.argv[1:]
-command = args[0] if args else ""
-if command != "export":
-    sys.exit(1)
-
-def _value(flag):
-    idx = args.index(flag)
-    return args[idx + 1]
-
-workspace = _value("-workspace")
-fmt = _value("-format")
-output = Path(_value("-output"))
-
-output.mkdir(parents=True, exist_ok=True)
-(output / "exported-diagram.puml").write_text("@startuml\\n@enduml", encoding="utf-8")
-print(f\"Exported workspace={workspace} format={fmt}\")
-""",
-        encoding="utf-8",
-    )
-    script_path.chmod(stat.S_IRWXU)
-    return script_path
-
-
-class TestStructurizrCLIIntegration:
-    def test_cli_export_success_with_stub(self) -> None:
-        with tempfile.TemporaryDirectory() as tmpdir:
-            base_dir = Path(tmpdir)
-            generator = StructurizrDSLGenerator(base_dir)
-            workspace_path = generator.save_service_workspace(_sample_analysis(), output_dir=base_dir / "dsl")
-            fake_cli = _create_fake_cli(base_dir)
-
-            cli = StructurizrCLI(cli_path=str(fake_cli))
-            output_dir = base_dir / "exported"
-            result = cli.export(workspace_path, output_dir, export_format=ExportFormat.C4_PLANTUML)
-
-            assert result.success is True
-            assert result.exported_files, "Expected exported files list"
-            exported_file = result.exported_files[0]
-            assert exported_file.exists()
-            assert "@startuml" in exported_file.read_text(encoding="utf-8")
-
-    def test_cli_export_handles_missing_cli(self) -> None:
-        with tempfile.TemporaryDirectory() as tmpdir:
-            base_dir = Path(tmpdir)
-            generator = StructurizrDSLGenerator(base_dir)
-            workspace_path = generator.save_service_workspace(_sample_analysis(), output_dir=base_dir / "dsl")
-
-            cli = StructurizrCLI(cli_path=None)  # force auto-detect failure
-            result = cli.export(workspace_path, base_dir / "exported")
-
-            assert result.success is False
-            assert "Structurizr CLI not found" in (result.error_message or "")
-
-
-class TestStructurizrExporterEndToEnd:
-    def test_exporter_generates_dsl_and_runs_cli(self) -> None:
-        with tempfile.TemporaryDirectory() as tmpdir:
-            base_dir = Path(tmpdir)
-            fake_cli = _create_fake_cli(base_dir)
-            exporter = StructurizrExporter(output_base_path=base_dir, cli_path=str(fake_cli))
-
-            dsl_path, export_result = exporter.export_service(_sample_analysis(), export_format=ExportFormat.PLANTUML)
-
-            assert dsl_path.exists()
-            assert export_result is not None
-            assert export_result.success
-            assert export_result.exported_files
-            assert export_result.exported_files[0].exists()
-
-    def test_exporter_gracefully_handles_missing_cli(self) -> None:
-        with tempfile.TemporaryDirectory() as tmpdir:
-            base_dir = Path(tmpdir)
-            exporter = StructurizrExporter(output_base_path=base_dir)
-
-            dsl_path, export_result = exporter.export_service(_sample_analysis())
-
-            assert dsl_path.exists()
-            assert export_result is None, "Exporter should skip CLI when unavailable to preserve backward compatibility"