adding a test when both publisher address and message address are set

Author: DanielePalaia

rabbitmq_amqp_python_client/__init__.py

@@ -12,7 +12,10 @@
     StreamOptions,
 )
 from .environment import Environment
-from .exceptions import ArgumentOutOfRangeException
+from .exceptions import (
+    ArgumentOutOfRangeException,
+    ValidationCodeException,
+)
 from .management import Management
 from .publisher import Publisher
 from .qpid.proton._data import symbol  # noqa: E402
@@ -62,6 +65,7 @@
     "AddressHelper",
     "AMQPMessagingHandler",
     "ArgumentOutOfRangeException",
+    "ValidationCodeException",
     "SslConfigurationContext",
     "ClientCert",
     "ConnectionClosed",

rabbitmq_amqp_python_client/publisher.py

@@ -2,7 +2,10 @@
 from typing import Optional
 
 from .address_helper import validate_address
-from .exceptions import ArgumentOutOfRangeException
+from .exceptions import (
+    ArgumentOutOfRangeException,
+    ValidationCodeException,
+)
 from .options import SenderOptionUnseattle
 from .qpid.proton._delivery import Delivery
 from .qpid.proton._message import Message
@@ -27,6 +30,11 @@ def _open(self) -> None:
             self._sender = self._create_sender(self._addr)
 
     def publish(self, message: Message) -> Delivery:
+        if (self._addr != "") and (message.address is not None):
+            raise ValidationCodeException(
+                "address specified in both message and publisher"
+            )
+
         if self._addr != "":
             if self._sender is not None:
                 return self._sender.send(message)

tests/test_publisher.py

@@ -10,6 +10,7 @@
     OutcomeState,
     QuorumQueueSpecification,
     StreamSpecification,
+    ValidationCodeException,
 )
 
 from .http_requests import delete_all_connections
@@ -160,6 +161,32 @@ def test_publish_per_message_to_invalid_destination(connection: Connection) -> N
     assert raised is True
 
 
+def test_publish_per_message_both_address(connection: Connection) -> None:
+
+    queue_name = "test-queue-1"
+    raised = False
+
+    management = connection.management()
+    management.declare_queue(QuorumQueueSpecification(name=queue_name))
+
+    message = Message(body="test")
+    message = AddressHelper.message_to_address_helper(message, "/queues/" + queue_name)
+    publisher = connection.publisher("/queues/" + queue_name)
+
+    try:
+        publisher.publish(message)
+    except ValidationCodeException:
+        raised = True
+
+    if publisher is not None:
+        publisher.close()
+
+    management.delete_queue(queue_name)
+    management.close()
+
+    assert raised is True
+
+
 def test_publish_exchange(connection: Connection) -> None:
 
     exchange_name = "test-exchange"