update some tests

Author: scmacdon

python/example_code/neptune/tests/neptune_stubber.py

@@ -242,6 +242,30 @@ def stub_delete_db_cluster(self, cluster_id, error_code=None):
                 expected_params
             )
 
+    def stub_describe_all_db_clusters(self, pages, error_code=None):
+        """
+        Stub for describe_db_clusters using a paginator simulation.
+        :param pages: List of pages, where each page is a list of DBClusters.
+                      Example: [[{...}], [{...}]] simulates 2 pages.
+        """
+        if error_code:
+            self.stubber.add_client_error(
+                "describe_db_clusters",
+                service_error_code=error_code,
+                service_message=f"{error_code} error",
+                expected_params={}
+            )
+        else:
+            for clusters in pages:
+                response = {
+                    "DBClusters": clusters
+                }
+                self.stubber.add_response(
+                    "describe_db_clusters",
+                    response,
+                    expected_params={}
+                )
+
     def stub_delete_db_subnet_group(self, group_name, error_code=None):
         expected_params = {
             "DBSubnetGroupName": group_name
@@ -260,3 +284,4 @@ def stub_delete_db_subnet_group(self, group_name, error_code=None):
                 {},
                 expected_params
             )
+

python/example_code/neptune/tests/test_hello.py

@@ -1,63 +1,38 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+import boto3
 import pytest
-from unittest.mock import MagicMock
+from botocore.stub import Stubber
 from botocore.exceptions import ClientError
-
-from hello_neptune import describe_db_clusters  # replace with actual import
+from hello_neptune import describe_db_clusters
 
 
 @pytest.fixture
-def mock_neptune_client():
-    """Return a mocked boto3 Neptune client."""
-    return MagicMock()
-
-
-def test_describe_db_clusters_unit(mock_neptune_client, capsys):
-    """
-    Unit test for describe_db_clusters with paginator.
-    Mocks the Neptune client's paginator and verifies expected output is printed.
-    """
-
-    # Create a mock paginator
-    mock_paginator = MagicMock()
-    mock_neptune_client.get_paginator.return_value = mock_paginator
-
-    # Mock pages returned by paginate()
-    mock_paginator.paginate.return_value = [
-        {
-            "DBClusters": [
-                {
-                    "DBClusterIdentifier": "my-test-cluster",
-                    "Status": "available"
-                }
-            ]
-        },
-        {
-            "DBClusters": [
-                {
-                    "DBClusterIdentifier": "my-second-cluster",
-                    "Status": "modifying"
-                }
-            ]
-        }
-    ]
-
-    try:
-        describe_db_clusters(mock_neptune_client)
-        captured = capsys.readouterr()
-
-        # Check that expected outputs from both pages were printed
-        assert "my-test-cluster" in captured.out
-        assert "available" in captured.out
-        assert "my-second-cluster" in captured.out
-        assert "modifying" in captured.out
-
-        mock_neptune_client.get_paginator.assert_called_once_with("describe_db_clusters")
-        mock_paginator.paginate.assert_called_once()
-
-    except ClientError as e:
-        pytest.fail(f"AWS ClientError occurred: {e.response['Error']['Message']}")
-    except Exception as e:
-        pytest.fail(f"Unexpected error: {str(e)}")
+def neptune_client_stub():
+    client = boto3.client("neptune", region_name="us-east-1")
+    stubber = Stubber(client)
+    stubber.activate()
+    yield client, stubber
+    stubber.deactivate()
+
+
+def test_describe_db_clusters_with_stubber_single_page(neptune_client_stub, capsys):
+    client, stubber = neptune_client_stub
+
+    # Simulate a single-page paginator result with both clusters in one call
+    stubber.add_response("describe_db_clusters", {
+        "DBClusters": [
+            {"DBClusterIdentifier": "my-test-cluster", "Status": "available"},
+            {"DBClusterIdentifier": "my-second-cluster", "Status": "modifying"}
+        ]
+    })
+
+    describe_db_clusters(client)
+
+    captured = capsys.readouterr()
+
+    assert "my-test-cluster" in captured.out
+    assert "available" in captured.out
+    assert "my-second-cluster" in captured.out
+    assert "modifying" in captured.out

scenarios/basics/neptune/SPECIFICATION.md

@@ -36,11 +36,11 @@ The Amazon Neptune Basics scenario executes the following operations.
 
 5. **Show Neptune Cluster details**:
    - Description: Shows the details of the cluster by invoking `describeDBClusters`.
-   - Exception Handling: Check to see if a `ResourceNotFoundException` is thrown. If so, display the message and end the program.
+   - Exception Handling: Check to see if a `DBClusterNotFound` is thrown. If so, display the message and end the program.
 
 6. **Stop the Cluster**:
    - Description: Stop the cluster by invoking `stopDBCluster`. Poll the cluster until it reaches a `stopped`state. 
-   - Exception Handling: Check to see if a `ResourceNotFoundException` is thrown. If so, display the message and end the program.
+   - Exception Handling: Check to see if a `DBClusterNotFound` is thrown. If so, display the message and end the program.
 
 7. **Start the cluster**:
    - Description: Start the cluster by invoking `startBCluster`. Poll the cluster until it reaches an `available`state.