Resolving PR comments: Remove fallback imports, fix copyright headers, remove .NET env vars, rename test directories, remove .coverage file

abdulanu0 · abdulanu0 · commit 59b71f624cd6 · 2025-11-07T13:30:22.000-08:00
diff --git a/.coverage b/.coverage
diff --git a/.gitignore b/.gitignore
@@ -73,6 +73,9 @@ build/
 .eggs/
 .pytest_cache/
 _version.py
+.coverage
+.coverage.*
+htmlcov/
 
 # Virtual environments
 .venv/
diff --git a/libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/utils/utility.py b/libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/utils/utility.py
@@ -80,7 +80,7 @@ def _get_current_environment() -> str:
     Returns:
         str: The current environment name.
     """
-    return os.getenv("ASPNETCORE_ENVIRONMENT") or os.getenv("DOTNET_ENVIRONMENT") or "Development"
+    return os.getenv("ENVIRONMENT") or "Development"
 
 
 def _get_mcp_platform_base_url() -> str:
diff --git a/tests/microsoft-agents-a365-notification/__init__.py b/tests/microsoft-agents-a365-notification/__init__.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for Microsoft Agents A365 Notifications module.
diff --git a/tests/microsoft-agents-a365-notification/models/__init__.py b/tests/microsoft-agents-a365-notification/models/__init__.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for Microsoft Agents A365 Notifications models.
diff --git a/tests/microsoft-agents-a365-notification/models/test_agent_notification.py b/tests/microsoft-agents-a365-notification/models/test_agent_notification.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for AgentNotification class
@@ -8,34 +7,9 @@
 from unittest.mock import AsyncMock, Mock
 
 import pytest
-
-# Mock external dependencies for testing
-try:
-    from microsoft_agents.activity import Activity, ChannelId
-    from microsoft_agents.hosting.core import TurnContext
-    from microsoft_agents.hosting.core.app.state import TurnState
-except ImportError:
-    # Create mocks if microsoft_agents v0.50+ is not available
-    class ChannelId:
-        MSTeams = "msteams"
-        Directline = "directline"
-        Webchat = "webchat"
-
-    class Activity:
-        def __init__(self, **kwargs):
-            for k, v in kwargs.items():
-                setattr(self, k, v)
-
-    class TurnContext:
-        def __init__(self, **kwargs):
-            for k, v in kwargs.items():
-                setattr(self, k, v)
-
-    class TurnState:
-        def __init__(self, **kwargs):
-            for k, v in kwargs.items():
-                setattr(self, k, v)
-
+from microsoft_agents.activity import Activity, ChannelId
+from microsoft_agents.hosting.core import TurnContext
+from microsoft_agents.hosting.core.app.state import TurnState
 
 from microsoft_agents_a365.notifications.agent_notification import AgentNotification
 from microsoft_agents_a365.notifications.models.agent_notification_activity import (
diff --git a/tests/microsoft-agents-a365-notification/models/test_agent_notification_activity.py b/tests/microsoft-agents-a365-notification/models/test_agent_notification_activity.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for AgentNotificationActivity class - Clean Version
diff --git a/tests/microsoft-agents-a365-notification/models/test_email_reference.py b/tests/microsoft-agents-a365-notification/models/test_email_reference.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for EmailReference class
diff --git a/tests/microsoft-agents-a365-notification/models/test_notification_types.py b/tests/microsoft-agents-a365-notification/models/test_notification_types.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for NotificationTypes enum
diff --git a/tests/microsoft-agents-a365-tooling-extensions-azureaifoundry-unittest/test_azureaifoundry_service_logic.py b/tests/microsoft-agents-a365-tooling-extensions-azureaifoundry-unittest/test_azureaifoundry_service_logic.py
diff --git a/tests/microsoft-agents-a365-tooling-extensions-openai-unittest/test_openai_service_logic.py b/tests/microsoft-agents-a365-tooling-extensions-openai-unittest/test_openai_service_logic.py
diff --git a/tests/microsoft-agents-a365-tooling-extensions-semantickernel-unittest/test_semantickernel_service_logic.py b/tests/microsoft-agents-a365-tooling-extensions-semantickernel-unittest/test_semantickernel_service_logic.py
diff --git a/tests/microsoft-agents-a365-tooling-unittest/__init__.py b/tests/microsoft-agents-a365-tooling-unittest/__init__.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for microsoft-agents-a365-tooling library.
diff --git a/tests/microsoft-agents-a365-tooling-unittest/models/__init__.py b/tests/microsoft-agents-a365-tooling-unittest/models/__init__.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Init file for models tests.
diff --git a/tests/microsoft-agents-a365-tooling-unittest/services/__init__.py b/tests/microsoft-agents-a365-tooling-unittest/services/__init__.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Init file for services tests.
diff --git a/tests/microsoft-agents-a365-tooling-unittest/services/test_mcp_tool_server_configuration_service.py b/tests/microsoft-agents-a365-tooling-unittest/services/test_mcp_tool_server_configuration_service.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for MockMcpToolServerConfigurationService core logic.
diff --git a/tests/microsoft-agents-a365-tooling-unittest/utils/__init__.py b/tests/microsoft-agents-a365-tooling-unittest/utils/__init__.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Init file for utils tests.
diff --git a/tests/microsoft-agents-a365-tooling-unittest/utils/test_constants.py b/tests/microsoft-agents-a365-tooling-unittest/utils/test_constants.py
@@ -1,19 +1,9 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for Constants class and its nested classes.
 """
 
-import sys
-from pathlib import Path
-
-# Add the parent directory to the path to import the modules
-sys.path.insert(
-    0,
-    str(Path(__file__).parent.parent.parent.parent / "libraries" / "microsoft-agents-a365-tooling"),
-)
-
 from microsoft_agents_a365.tooling.utils.constants import Constants
 
 
diff --git a/tests/microsoft-agents-a365-tooling-unittest/utils/test_utility.py b/tests/microsoft-agents-a365-tooling-unittest/utils/test_utility.py
@@ -1,5 +1,4 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
+# Copyright (c) Microsoft. All rights reserved.
 
 """
 Unit tests for utility functions in the tooling package.
@@ -8,15 +7,6 @@
 import os
 from unittest.mock import patch
 
-# Add the parent directory to the path to import the modules
-import sys
-from pathlib import Path
-
-sys.path.insert(
-    0,
-    str(Path(__file__).parent.parent.parent.parent / "libraries" / "microsoft-agents-a365-tooling"),
-)
-
 from microsoft_agents_a365.tooling.utils.utility import (
     get_tooling_gateway_for_digital_worker,
     get_mcp_base_url,
@@ -41,8 +31,7 @@ def setup_method(self):
         self.original_env = {
             key: os.environ.get(key)
             for key in [
-                "ASPNETCORE_ENVIRONMENT",
-                "DOTNET_ENVIRONMENT",
+                "ENVIRONMENT",
                 "MCP_PLATFORM_ENDPOINT",
                 "TOOLS_MODE",
                 "MOCK_MCP_SERVER_URL",
@@ -86,8 +75,7 @@ def test_get_tooling_gateway_with_custom_endpoint(self):
     def test_get_mcp_base_url_production(self):
         """Test get_mcp_base_url in production environment."""
         # Arrange - Set production environment
-        os.environ.pop("ASPNETCORE_ENVIRONMENT", None)
-        os.environ.pop("DOTNET_ENVIRONMENT", None)
+        os.environ.pop("ENVIRONMENT", None)
 
         # Act
         result = get_mcp_base_url()
@@ -96,7 +84,7 @@ def test_get_mcp_base_url_production(self):
         expected = f"{MCP_PLATFORM_PROD_BASE_URL}/mcp/environments"
         assert result == expected
 
-    @patch.dict(os.environ, {"ASPNETCORE_ENVIRONMENT": "Development"}, clear=False)
+    @patch.dict(os.environ, {"ENVIRONMENT": "Development"}, clear=False)
     def test_get_mcp_base_url_development_default_mode(self):
         """Test get_mcp_base_url in development environment with default mode."""
         # Act
@@ -108,7 +96,7 @@ def test_get_mcp_base_url_development_default_mode(self):
 
     @patch.dict(
         os.environ,
-        {"ASPNETCORE_ENVIRONMENT": "Development", "TOOLS_MODE": "MockMCPServer"},
+        {"ENVIRONMENT": "Development", "TOOLS_MODE": "MockMCPServer"},
         clear=False,
     )
     def test_get_mcp_base_url_development_mock_mode_default_url(self):
@@ -123,7 +111,7 @@ def test_get_mcp_base_url_development_mock_mode_default_url(self):
     @patch.dict(
         os.environ,
         {
-            "ASPNETCORE_ENVIRONMENT": "Development",
+            "ENVIRONMENT": "Development",
             "TOOLS_MODE": "MockMCPServer",
             "MOCK_MCP_SERVER_URL": "http://custom-mock:8080/mock/servers",
         },
@@ -155,7 +143,7 @@ def test_build_mcp_server_url_production(self):
 
     @patch.dict(
         os.environ,
-        {"ASPNETCORE_ENVIRONMENT": "Development", "TOOLS_MODE": "MockMCPServer"},
+        {"ENVIRONMENT": "Development", "TOOLS_MODE": "MockMCPServer"},
         clear=False,
     )
     def test_build_mcp_server_url_development_mock_mode(self):
@@ -171,7 +159,7 @@ def test_build_mcp_server_url_development_mock_mode(self):
         expected = "http://localhost:5309/mcp-mock/agents/servers/test_server"
         assert result == expected
 
-    @patch.dict(os.environ, {"ASPNETCORE_ENVIRONMENT": "Development"}, clear=False)
+    @patch.dict(os.environ, {"ENVIRONMENT": "Development"}, clear=False)
     def test_build_mcp_server_url_development_platform_mode(self):
         """Test build_mcp_server_url in development with platform mode."""
         # Arrange
@@ -190,40 +178,17 @@ def test_build_mcp_server_url_development_platform_mode(self):
     def test_get_current_environment_default(self):
         """Test _get_current_environment returns default when no env vars set."""
         # Arrange - Clear environment variables
-        os.environ.pop("ASPNETCORE_ENVIRONMENT", None)
-        os.environ.pop("DOTNET_ENVIRONMENT", None)
+        os.environ.pop("ENVIRONMENT", None)
 
         # Act
         result = _get_current_environment()
 
         # Assert
         assert result == "Development"
 
-    @patch.dict(os.environ, {"ASPNETCORE_ENVIRONMENT": "Production"}, clear=False)
-    def test_get_current_environment_aspnetcore(self):
-        """Test _get_current_environment returns ASPNETCORE_ENVIRONMENT value."""
-        # Act
-        result = _get_current_environment()
-
-        # Assert
-        assert result == "Production"
-
-    @patch.dict(os.environ, {"DOTNET_ENVIRONMENT": "Staging"}, clear=False)
-    def test_get_current_environment_dotnet(self):
-        """Test _get_current_environment returns DOTNET_ENVIRONMENT value."""
-        # Act
-        result = _get_current_environment()
-
-        # Assert
-        assert result == "Staging"
-
-    @patch.dict(
-        os.environ,
-        {"ASPNETCORE_ENVIRONMENT": "Production", "DOTNET_ENVIRONMENT": "Staging"},
-        clear=False,
-    )
-    def test_get_current_environment_aspnetcore_priority(self):
-        """Test _get_current_environment prioritizes ASPNETCORE_ENVIRONMENT."""
+    @patch.dict(os.environ, {"ENVIRONMENT": "Production"}, clear=False)
+    def test_get_current_environment_set(self):
+        """Test _get_current_environment returns ENVIRONMENT value."""
         # Act
         result = _get_current_environment()
 
@@ -300,10 +265,9 @@ def test_get_tools_mode_invalid_defaults_to_platform(self):
     def test_get_ppapi_token_scope_production(self):
         """Test get_ppapi_token_scope returns production scope."""
         # Arrange - Set environment to production explicitly
-        os.environ.pop("ASPNETCORE_ENVIRONMENT", None)
-        os.environ.pop("DOTNET_ENVIRONMENT", None)
+        os.environ.pop("ENVIRONMENT", None)
         # The _get_current_environment defaults to "Development", so we need to set it to something else
-        os.environ["ASPNETCORE_ENVIRONMENT"] = "Production"
+        os.environ["ENVIRONMENT"] = "Production"
 
         # Act
         result = get_ppapi_token_scope()
@@ -312,7 +276,7 @@ def test_get_ppapi_token_scope_production(self):
         expected = [PPAPI_TOKEN_SCOPE + "/.default"]
         assert result == expected
 
-    @patch.dict(os.environ, {"ASPNETCORE_ENVIRONMENT": "Development"}, clear=False)
+    @patch.dict(os.environ, {"ENVIRONMENT": "Development"}, clear=False)
     def test_get_ppapi_token_scope_development(self):
         """Test get_ppapi_token_scope returns test scope in development."""
         # Act
@@ -322,16 +286,6 @@ def test_get_ppapi_token_scope_development(self):
         expected = [PPAPI_TEST_TOKEN_SCOPE + "/.default"]
         assert result == expected
 
-    @patch.dict(os.environ, {"DOTNET_ENVIRONMENT": "Development"}, clear=False)
-    def test_get_ppapi_token_scope_development_dotnet_env(self):
-        """Test get_ppapi_token_scope works with DOTNET_ENVIRONMENT."""
-        # Act
-        result = get_ppapi_token_scope()
-
-        # Assert
-        expected = [PPAPI_TEST_TOKEN_SCOPE + "/.default"]
-        assert result == expected
-
     def test_tools_mode_enum_values(self):
         """Test ToolsMode enum has expected values."""
         # Assert
