Merge pull request #753 from microsoft/macae-v4-unittestcases-kd

test: Macae v4 unittestcases kd

Author: Roopan-Microsoft

.coveragerc

@@ -0,0 +1,25 @@
+[run]
+source = .
+omit = 
+    src/mcp_server/*
+    src/backend/tests/*
+    src/tests/mcp_server/*
+    src/tests/agents/*
+    src/**/__init__.py
+    tests/e2e-test/*
+    */venv/*
+    */env/*
+    */.pytest_cache/*
+    */node_modules/*
+
+[paths]
+source =
+    src/backend
+    */site-packages
+
+[report]
+exclude_lines =
+    pragma: no cover
+    def __repr__
+    raise AssertionError
+    raise NotImplementedError

.github/workflows/test.yml

@@ -4,9 +4,8 @@ on:
   push:
     branches:
       - main
-      - dev
-      - demo
-      - hotfix
+      - demo-v4
+      - dev-v4
     paths:
       - 'src/backend/**/*.py'
       - 'src/tests/**/*.py'
@@ -24,9 +23,8 @@ on:
       - synchronize
     branches:
       - main
-      - dev
-      - demo
-      - hotfix
+      - demo-v4
+      - dev-v4
     paths:
       - 'src/backend/**/*.py'
       - 'src/tests/**/*.py'
@@ -66,26 +64,23 @@ jobs:
             echo "skip_tests=false" >> $GITHUB_ENV
           fi
 
-      - name: Run tests with coverage
+      - name: Run backend tests with coverage
         if: env.skip_tests == 'false'
         run: |
-          pytest --cov=. --cov-report=term-missing --cov-report=xml \
-            --ignore=tests/e2e-test/tests \
-            --ignore=src/backend/tests/test_app.py \
-            --ignore=src/tests/agents/test_foundry_integration.py \
-            --ignore=src/tests/mcp_server/test_factory.py \
-            --ignore=src/tests/mcp_server/test_hr_service.py \
-            --ignore=src/backend/tests/test_config.py \
-            --ignore=src/tests/agents/test_human_approval_manager.py \
-            --ignore=src/backend/tests/test_team_specific_methods.py \
-            --ignore=src/backend/tests/models/test_messages.py \
-            --ignore=src/backend/tests/test_otlp_tracing.py \
-            --ignore=src/backend/tests/auth/test_auth_utils.py
-
-      # - name: Run tests with coverage
-      #   if: env.skip_tests == 'false'
-      #   run: |
-      #     pytest --cov=. --cov-report=term-missing --cov-report=xml --ignore=tests/e2e-test/tests
+          python -m pytest src/tests/backend/test_app.py --cov=backend.app --cov-report= --cov-config=.coveragerc -q > /dev/null 2>&1
+          python -m pytest src/tests/backend --cov=backend --cov-append --cov-report=xml --cov-report= --cov-config=.coveragerc --ignore=src/tests/backend/test_app.py 2>&1 | tee /tmp/pytest_output.txt
+          python -m coverage report --rcfile=.coveragerc
+          tail -1 /tmp/pytest_output.txt
+          
+          # Check coverage threshold
+          if [ -f coverage.xml ]; then
+            COVERAGE=$(python -c "import xml.etree.ElementTree as ET; tree = ET.parse('coverage.xml'); root = tree.getroot(); print(float(root.attrib['line-rate']) * 100)")
+            echo "Coverage: $COVERAGE%"
+            if (( $(echo "$COVERAGE < 80" | bc -l) )); then
+              echo "Coverage is below 80%, failing the job."
+              exit 1
+            fi
+          fi
           
       - name: Skip coverage report if no tests
         if: env.skip_tests == 'true'

pytest.ini

@@ -1,2 +1,7 @@
 [pytest]
 addopts = -p pytest_asyncio
+pythonpath = src
+testpaths = src/tests
+python_files = test_*.py *_test.py
+python_functions = test_*
+python_classes = Test*

src/__init__.py

@@ -0,0 +1 @@
+# src package

src/backend/__init__.py

@@ -0,0 +1 @@
+# backend package

src/backend/app.py

@@ -5,21 +5,21 @@
 
 
 from azure.monitor.opentelemetry import configure_azure_monitor
-from common.config.app_config import config
-from common.models.messages_af import UserLanguage
+from backend.common.config.app_config import config
+from backend.common.models.messages_af import UserLanguage
 
 # FastAPI imports
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 
 # Local imports
-from middleware.health_check import HealthCheckMiddleware
-from v4.api.router import app_v4
+from backend.middleware.health_check import HealthCheckMiddleware
+from backend.v4.api.router import app_v4
 
 # Azure monitoring
 
 
-from v4.config.agent_registry import agent_registry
+from backend.v4.config.agent_registry import agent_registry
 
 
 @asynccontextmanager

src/backend/v4/config/settings.py

@@ -17,7 +17,7 @@
 # from agent_framework_azure_ai import AzureOpenAIChatClient
 from agent_framework import ChatOptions
 
-from v4.models.messages import MPlan, WebsocketMessageType
+from backend.v4.models.messages import MPlan, WebsocketMessageType
 
 logger = logging.getLogger(__name__)
 

src/backend/v4/models/messages.py

@@ -8,7 +8,7 @@
 from pydantic import BaseModel
 
 from common.models.messages_af import AgentMessageType
-from v4.models.models import MPlan, PlanStatus
+from backend.v4.models.models import MPlan, PlanStatus
 
 
 # ---------------------------------------------------------------------------

src/backend/v4/orchestration/helper/plan_to_mplan_converter.py

@@ -2,7 +2,7 @@
 import re
 from typing import Iterable, List, Optional
 
-from v4.models.models import MPlan, MStep
+from backend.v4.models.models import MPlan, MStep
 
 logger = logging.getLogger(__name__)
 

src/tests/backend/auth/conftest.py

@@ -0,0 +1,63 @@
+"""
+Test configuration for auth module tests.
+"""
+
+import pytest
+import sys
+import os
+from unittest.mock import MagicMock, patch
+import base64
+import json
+
+# Add the backend directory to the Python path for imports
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..', 'backend'))
+
+@pytest.fixture
+def mock_sample_headers():
+    """Mock headers with EasyAuth authentication data."""
+    return {
+        "x-ms-client-principal-id": "12345678-1234-1234-1234-123456789012",
+        "x-ms-client-principal-name": "testuser@example.com",
+        "x-ms-client-principal-idp": "aad",
+        "x-ms-token-aad-id-token": "sample.jwt.token",
+        "x-ms-client-principal": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsInRpZCI6IjEyMzQ1Njc4LTEyMzQtMTIzNC0xMjM0LTEyMzQ1Njc4OTAxMiJ9"
+    }
+
+@pytest.fixture
+def mock_empty_headers():
+    """Mock headers without authentication data."""
+    return {
+        "content-type": "application/json",
+        "user-agent": "test-agent"
+    }
+
+@pytest.fixture
+def mock_valid_base64_principal():
+    """Mock valid base64 encoded principal with tenant ID."""
+    mock_data = {
+        "typ": "JWT",
+        "alg": "RS256",
+        "tid": "87654321-4321-4321-4321-210987654321",
+        "oid": "12345678-1234-1234-1234-123456789012",
+        "preferred_username": "testuser@example.com",
+        "name": "Test User"
+    }
+    
+    json_str = json.dumps(mock_data)
+    return base64.b64encode(json_str.encode('utf-8')).decode('utf-8')
+
+@pytest.fixture
+def mock_invalid_base64_principal():
+    """Mock invalid base64 encoded principal."""
+    return "invalid_base64_string!"
+
+@pytest.fixture
+def sample_user_mock():
+    """Mock sample_user data for testing."""
+    return {
+        "x-ms-client-principal-id": "00000000-0000-0000-0000-000000000000",
+        "x-ms-client-principal-name": "testusername@contoso.com",
+        "x-ms-client-principal-idp": "aad",
+        "x-ms-token-aad-id-token": "your_aad_id_token",
+        "x-ms-client-principal": "your_base_64_encoded_token"
+    }