Reorganize test structure: move integration tests into subdirectory

Consolidates integration tests under tests/integration/ with updated paths
in documentation, CI workflows, and configuration files. Improves project
organization by clearly separating integration test artifacts.

Author: dtehan-td

.github/CI.md

@@ -28,18 +28,18 @@ uv sync --extra dev
 uv run mypy src/
 
 # Middleware unit tests (no database required)
-uv run python tests/middleware_transport_tests.py
+uv run python tests/integration/middleware_transport_tests.py
 
 # HTTP transport smoke test (no database required)
-uv run python tests/smoke_http.py --verbose
+uv run python tests/integration/smoke_http.py --verbose
 
 # Integration tests — stdio (requires a live Teradata connection)
 export DATABASE_URI="teradata://user:pass@host:1025/database"
-uv run python tests/run_mcp_tests.py "uv run teradata-mcp-server"
+uv run python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server"
 
 # Integration tests — streamable-http (requires a live Teradata connection)
 export DATABASE_URI="teradata://user:pass@host:1025/database"
-uv run python tests/run_mcp_tests.py "uv run teradata-mcp-server" --transport streamable-http
+uv run python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server" --transport streamable-http
 ```
 
 ### Configuring the `DATABASE_URI` Secret

.github/workflows/ci.yml

@@ -53,9 +53,9 @@ jobs:
           python-version: "3.11"
       - run: uv sync --frozen
       - name: Run middleware unit tests (no database required)
-        run: uv run python tests/middleware_transport_tests.py
+        run: uv run python tests/integration/middleware_transport_tests.py
       - name: Run HTTP smoke test (no database required)
-        run: uv run python tests/smoke_http.py --verbose
+        run: uv run python tests/integration/smoke_http.py --verbose
 
   test-stdio:
     name: Integration Tests (stdio)
@@ -74,7 +74,7 @@ jobs:
         if: ${{ env.DATABASE_URI != '' }}
         env:
           DATABASE_URI: ${{ secrets.DATABASE_URI }}
-        run: uv run python tests/run_mcp_tests.py "uv run teradata-mcp-server"
+        run: uv run python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server"
       - name: Warn if DATABASE_URI not configured
         if: ${{ env.DATABASE_URI == '' }}
         env:
@@ -98,7 +98,7 @@ jobs:
         if: ${{ env.DATABASE_URI != '' }}
         env:
           DATABASE_URI: ${{ secrets.DATABASE_URI }}
-        run: uv run python tests/run_mcp_tests.py "uv run teradata-mcp-server" --transport streamable-http
+        run: uv run python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server" --transport streamable-http
       - name: Warn if DATABASE_URI not configured
         if: ${{ env.DATABASE_URI == '' }}
         env:

CLAUDE.md

@@ -33,7 +33,7 @@ uv run mypy src/
 
 # Run tests (requires a live Teradata connection)
 export DATABASE_URI="teradata://user:pass@host:1025/database"
-uv run python tests/run_mcp_tests.py "uv run teradata-mcp-server"
+uv run python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server"
 
 # Docker
 docker compose up teradata-mcp-server
@@ -104,7 +104,7 @@ For stdio transport, logs go to file only (to avoid polluting MCP stdout). Log l
 
 ### Testing
 
-Tests require a live Teradata database. Test cases are JSON files in `tests/cases/` (e.g., `core_test_cases.json`). The test runner (`tests/run_mcp_tests.py`) dynamically discovers available tools and only runs matching test cases. Results are saved as timestamped JSON in `var/test-reports/`.
+Tests require a live Teradata database. Test cases are JSON files in `tests/integration/cases/` (e.g., `core_test_cases.json`). The test runner (`tests/integration/run_mcp_tests.py`) dynamically discovers available tools and only runs matching test cases. Results are saved as timestamped JSON in `var/test-reports/`.
 
 ## Code Conventions
 

ddls_extracted/evals_employees_DDL.sql

@@ -0,0 +1,25 @@
+/*
+ * File: evals_employees_DDL.sql
+ * Generated: 2026-06-23 14:16:55
+ * Type: TABLE
+ * Database: demo_user
+ * Object: evals_employees
+ * Size: 572 characters
+ */
+
+CREATE SET TABLE demo_user.evals_employees ,FALLBACK ,
+     NO BEFORE JOURNAL,
+     NO AFTER JOURNAL,
+     CHECKSUM = DEFAULT,
+     DEFAULT MERGEBLOCKRATIO,
+     MAP = TD_MAP1
+     (
+      employee_id INTEGER NOT NULL,
+      name VARCHAR(100) CHARACTER SET LATIN NOT CASESPECIFIC NOT NULL,
+      department VARCHAR(50) CHARACTER SET LATIN NOT CASESPECIFIC NOT NULL,
+      salary DECIMAL(10,2),
+      region VARCHAR(50) CHARACTER SET LATIN NOT CASESPECIFIC NOT NULL,
+      hire_date DATE FORMAT 'YY/MM/DD' NOT NULL,
+      manager_id INTEGER, 
+PRIMARY KEY ( employee_id ))
+;

ddls_extracted/evals_orders_DDL.sql

@@ -0,0 +1,25 @@
+/*
+ * File: evals_orders_DDL.sql
+ * Generated: 2026-06-23 14:16:30
+ * Type: TABLE
+ * Database: demo_user
+ * Object: evals_orders
+ * Size: 563 characters
+ */
+
+CREATE SET TABLE demo_user.evals_orders ,FALLBACK ,
+     NO BEFORE JOURNAL,
+     NO AFTER JOURNAL,
+     CHECKSUM = DEFAULT,
+     DEFAULT MERGEBLOCKRATIO,
+     MAP = TD_MAP1
+     (
+      order_id INTEGER NOT NULL,
+      customer_name VARCHAR(100) CHARACTER SET LATIN NOT CASESPECIFIC NOT NULL,
+      order_date DATE FORMAT 'YY/MM/DD' NOT NULL,
+      ship_date DATE FORMAT 'YY/MM/DD',
+      amount DECIMAL(10,2) NOT NULL,
+      product_category VARCHAR(50) CHARACTER SET LATIN NOT CASESPECIFIC NOT NULL,
+      quantity INTEGER NOT NULL, 
+PRIMARY KEY ( order_id ))
+;

docs/developer_guide/CONTRIBUTING.md

@@ -7,8 +7,8 @@ Make sure you have setup your environment based on the Developer Guide in this r
 ## Development Guidelines
 - Always engage on the discussion board or create an issue before creating a PR. 
 - All PRs must have at least one issue associated.
-- Run the full pre-push checklist before opening a PR, and copy/paste the test report output in the PR: lint (`uv run ruff check src/`), type check (`uv run mypy src/`), HTTP smoke test (`uv run python tests/smoke_http.py`), and integration tests over both stdio and HTTP (`uv run python tests/run_mcp_tests.py "uv run teradata-mcp-server"` and `... --transport streamable-http`). See the [Developer Guide](./DEVELOPER_GUIDE.md) for the full ordered checklist.
-- Create a new test case if you add a new tool. For more information see [our testing guide](/tests/README.md)
+- Run the full pre-push checklist before opening a PR, and copy/paste the test report output in the PR: lint (`uv run ruff check src/`), type check (`uv run mypy src/`), HTTP smoke test (`uv run python tests/integration/smoke_http.py`), and integration tests over both stdio and HTTP (`uv run python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server"` and `... --transport streamable-http`). See the [Developer Guide](./DEVELOPER_GUIDE.md) for the full ordered checklist.
+- Create a new test case if you add a new tool. For more information see [our testing guide](/tests/integration/README.md)
 - All code must be reviewed via a pull request. Before anything can be merged, it must be reviewed by at least 2 others. [Contributing to a project step by step instuctions](https://docs.github.com/en/get-started/exploring-projects-on-github/contributing-to-a-project)
 - Squash commits into a single commit for your PR. We want to keep a clean git history.
 - Code should adhere to lint and codestyle tests. While you can commit code that doesn't validate but still works, it is encouraged to validate your code. It saves other's headaches down the road.

docs/developer_guide/DEVELOPER_GUIDE.md

@@ -52,14 +52,14 @@ uv run mypy src/
 # 3. HTTP transport smoke test (no database required)
 #    Catches startup-time errors in HTTP-specific code paths (middleware,
 #    imports, constructor errors) that the stdio suite cannot reach.
-uv run python tests/smoke_http.py --verbose
+uv run python tests/integration/smoke_http.py --verbose
 
 # 4. Integration tests — stdio (requires DATABASE_URI)
 export DATABASE_URI="teradata://user:pass@host:1025/database"
-uv run python tests/run_mcp_tests.py "uv run teradata-mcp-server"
+uv run python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server"
 
 # 5. Integration tests — streamable-http (requires DATABASE_URI)
-uv run python tests/run_mcp_tests.py "uv run teradata-mcp-server" --transport streamable-http
+uv run python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server" --transport streamable-http
 ```
 
 Steps 1–3 have no database dependency and are quick — run them on every change. Steps 4–5 require VPN and credentials; run them when you have changed tool handlers, middleware, or connection logic.
@@ -650,18 +650,18 @@ Use the provided testing tool to run tests, add tests if you add a new tool.
 
 We have a "core" test suite for all the core tools provided with this server, separate ones for the add-ons (eg. Enterprise Feature Store, Enterprise Vector Store) and you can add more for your custom tools.
 
-See guidelines and details in [our testing guide](/tests/README.md)
+See guidelines and details in [our testing guide](/tests/integration/README.md)
 
 Run testing before PR, and copy/paste the test report status in the PR. 
 
 **Development testing:**
 ```bash
-python tests/run_mcp_tests.py "uv run teradata-mcp-server"
+python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server"
 ```
 
 **Installed package testing:**
 ```bash
-python tests/run_mcp_tests.py "teradata-mcp-server"
+python tests/integration/run_mcp_tests.py "teradata-mcp-server"
 ```
 
 <br><br><br>

docs/developer_guide/PROGRESSIVE_DISCLOSURE.md

@@ -249,7 +249,7 @@ All existing tests continue to work:
 
 ```bash
 export DATABASE_URI="teradata://user:pass@host:1025/database"
-uv run python tests/run_mcp_tests.py "uv run teradata-mcp-server"
+uv run python tests/integration/run_mcp_tests.py "uv run teradata-mcp-server"
 ```
 
 ## Benefits

pyproject.toml

@@ -124,7 +124,7 @@ ignore = [
 
 [tool.ruff.lint.per-file-ignores]
 "*/__init__.py" = ["F403", "F401"]  # Allow wildcard imports and unused imports in __init__.py
-"tests/*" = ["F401", "F403", "PLR0913"]  # More lenient for test files
+"tests/**" = ["F401", "F403", "PLR0913"]  # More lenient for test files
 
 [tool.ruff.lint.isort]
 known-first-party = ["teradata_mcp_server"]