Reorganizing Test Structure

.azdo/ci-pr.yaml

@@ -28,7 +28,7 @@ steps:
 - script: |
     python -m pip install --upgrade pip
     python -m pip install flake8 pytest pytest-mock black pytest-asyncio build setuptools-git-versioning
-    if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    if [ -f dev_dependencies.txt ]; then pip install -r dev_dependencies.txt; fi
   displayName: 'Install dependencies'
 
 - script: |

.github/workflows/python-package.yml

@@ -30,8 +30,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest pytest-mock black pytest-asyncio build setuptools-git-versioning
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        python -m pip install flake8 black build setuptools-git-versioning
+        if [ -f dev_dependencies.txt ]; then pip install -r dev_dependencies.txt; fi
     - name: Check format with black
       run: |
         # stop the build if black raises an issue

dev_dependencies.txt

@@ -0,0 +1,3 @@
+pytest
+pytest-asyncio
+pytest-mock

libraries/microsoft-agents-hosting-core/microsoft_agents/hosting/core/storage/_storage_test_utils.py → tests/_common/storage/utils.py

@@ -4,11 +4,12 @@
 from abc import ABC
 from typing import Any
 
-from .storage import Storage
-from .store_item import StoreItem
-from ._type_aliases import JSON
-from .memory_storage import MemoryStorage
-
+from microsoft_agents.hosting.core.storage import (
+    Storage,
+    StoreItem,
+    MemoryStorage
+)
+from microsoft_agents.hosting.core.storage._type_aliases import JSON
 
 class MockStoreItem(StoreItem):
     """Test implementation of StoreItem for testing purposes"""

libraries/microsoft-agents-activity/tests/test_activity.py → tests/activity/test_activity.py

@@ -18,8 +18,8 @@
     Thing,
 )
 
-from .activity_data.activity_test_data import MyChannelData
-from .activity_tools.testing_activity import create_test_activity
+from .data.activity_test_data import MyChannelData
+from .tools.testing_activity import create_test_activity
 
 
 def helper_validate_recipient_and_from(

libraries/microsoft-agents-activity/tests/test_tools.py → tests/activity/test_tools.py

@@ -9,7 +9,7 @@
     pick_model_dict,
 )
 
-from .activity_tools.testing_model_utils import SkipFalse, SkipEmpty, PickField
+from .tools.testing_model_utils import SkipFalse, SkipEmpty, PickField
 
 
 class TestModelUtils:

libraries/microsoft-agents-hosting-core/tests/test_agent_state.py → tests/hosting_core/test_agent_state.py

@@ -25,7 +25,7 @@
     ChannelAccount,
     ConversationAccount,
 )
-from core_tools.testing_adapter import TestingAdapter
+from .tools.testing_adapter import TestingAdapter
 
 
 class MockCustomState(AgentState):