Update name to state (Azure#22991)

* Update name to state

* async

sdk/servicebus/azure-servicebus/CHANGELOG.md

@@ -1,11 +1,11 @@
 # Release History
 
-## 7.6.0 (Unreleased)
+## 7.6.0 (2022-02-10)
 
 ### Features Added
 
 - Introduce `ServiceBusMessageState` enum that can assume the values of `active`, `scheduled` or `deferred`.
-- Add `ServiceBusMessageState` property in `ServiceBusReceivedMessage`.
+- Add `state` property in `ServiceBusReceivedMessage`.
 
 ### Breaking Changes
 

sdk/servicebus/azure-servicebus/azure/servicebus/_common/message.py

@@ -970,13 +970,13 @@ def dead_letter_source(self):
         return None
 
     @property
-    def message_state(self):
-        # type: () -> int
+    def state(self):
+        # type: () -> ServiceBusMessageState
         """
         Defaults to Active. Represents the message state of the message. Can be Active, Deferred.
         or Scheduled.
 
-        :rtype: int
+        :rtype: ~azure.servicebus.ServiceBusMessageState
         """
         try:
             message_state = self._raw_amqp_message.annotations.get(MESSAGE_STATE_NAME)

sdk/servicebus/azure-servicebus/tests/async_tests/test_queues_async.py

@@ -2131,7 +2131,7 @@ async def test_queue_async_send_amqp_annotated_message(self, servicebus_namespac
     @CachedResourceGroupPreparer(name_prefix='servicebustest')
     @CachedServiceBusNamespacePreparer(name_prefix='servicebustest')
     @ServiceBusQueuePreparer(name_prefix='servicebustest', dead_lettering_on_message_expiration=True)
-    async def test_message_state_scheduled_async(self, servicebus_namespace_connection_string, servicebus_queue, **kwargs):
+    async def test_state_scheduled_async(self, servicebus_namespace_connection_string, servicebus_queue, **kwargs):
         async with ServiceBusClient.from_connection_string(
             servicebus_namespace_connection_string) as sb_client:
 
@@ -2146,15 +2146,15 @@ async def test_message_state_scheduled_async(self, servicebus_namespace_connecti
             async with receiver:
                 messages = await receiver.peek_messages()
                 for msg in messages:
-                    assert msg.message_state == ServiceBusMessageState.SCHEDULED
+                    assert msg.state == ServiceBusMessageState.SCHEDULED
 
 
     @pytest.mark.liveTest
     @pytest.mark.live_test_only
     @CachedResourceGroupPreparer(name_prefix='servicebustest')
     @CachedServiceBusNamespacePreparer(name_prefix='servicebustest')
     @ServiceBusQueuePreparer(name_prefix='servicebustest', dead_lettering_on_message_expiration=True)
-    async def test_message_state_deferred_async(self, servicebus_namespace_connection_string, servicebus_queue, **kwargs):
+    async def test_state_deferred_async(self, servicebus_namespace_connection_string, servicebus_queue, **kwargs):
         async with ServiceBusClient.from_connection_string(
             servicebus_namespace_connection_string) as sb_client:
 
@@ -2169,12 +2169,12 @@ async def test_message_state_deferred_async(self, servicebus_namespace_connectio
             async with receiver:
                 received_msgs = await receiver.receive_messages()
                 for message in received_msgs:
-                    assert message.message_state == ServiceBusMessageState.ACTIVE
+                    assert message.state == ServiceBusMessageState.ACTIVE
                     deferred_messages.append(message.sequence_number)
                     await receiver.defer_message(message)
                 if deferred_messages:
                     received_deferred_msg = await receiver.receive_deferred_messages(
                         sequence_numbers=deferred_messages
                         )                
                 for message in received_deferred_msg:
-                    assert message.message_state == ServiceBusMessageState.DEFERRED
+                    assert message.state == ServiceBusMessageState.DEFERRED

sdk/servicebus/azure-servicebus/tests/test_message.py

@@ -56,7 +56,7 @@ def test_servicebus_received_message_repr():
     assert "content_type=None, correlation_id=None, to=None, reply_to=None, reply_to_session_id=None, subject=None,"
     assert "partition_key=r_key, scheduled_enqueue_time_utc" in repr_str
 
-def test_servicebus_received_message_state():
+def test_servicebus_received_state():
     uamqp_received_message = uamqp.message.Message(
         body=b'data',
         annotations={
@@ -65,7 +65,7 @@ def test_servicebus_received_message_state():
         properties=uamqp.message.MessageProperties()
     )
     received_message = ServiceBusReceivedMessage(uamqp_received_message, receiver=None)
-    assert received_message.message_state == 3
+    assert received_message.state == 3
 
     uamqp_received_message = uamqp.message.Message(
         body=b'data',
@@ -75,7 +75,7 @@ def test_servicebus_received_message_state():
         properties=uamqp.message.MessageProperties()
     )
     received_message = ServiceBusReceivedMessage(uamqp_received_message, receiver=None)
-    assert received_message.message_state == ServiceBusMessageState.DEFERRED
+    assert received_message.state == ServiceBusMessageState.DEFERRED
 
     uamqp_received_message = uamqp.message.Message(
         body=b'data',
@@ -84,14 +84,14 @@ def test_servicebus_received_message_state():
         properties=uamqp.message.MessageProperties()
     )
     received_message = ServiceBusReceivedMessage(uamqp_received_message, receiver=None)
-    assert received_message.message_state == ServiceBusMessageState.ACTIVE
+    assert received_message.state == ServiceBusMessageState.ACTIVE
 
     uamqp_received_message = uamqp.message.Message(
         body=b'data',
         properties=uamqp.message.MessageProperties()
     )
     received_message = ServiceBusReceivedMessage(uamqp_received_message, receiver=None)
-    assert received_message.message_state == ServiceBusMessageState.ACTIVE
+    assert received_message.state == ServiceBusMessageState.ACTIVE
 
     uamqp_received_message = uamqp.message.Message(
         body=b'data',
@@ -101,7 +101,7 @@ def test_servicebus_received_message_state():
         properties=uamqp.message.MessageProperties()
     )
     received_message = ServiceBusReceivedMessage(uamqp_received_message, receiver=None)
-    assert received_message.message_state == ServiceBusMessageState.ACTIVE
+    assert received_message.state == ServiceBusMessageState.ACTIVE
 
 def test_servicebus_received_message_repr_with_props():
     uamqp_received_message = uamqp.message.Message(

sdk/servicebus/azure-servicebus/tests/test_queues.py

@@ -2590,7 +2590,7 @@ def test_queue_send_amqp_annotated_message(self, servicebus_namespace_connection
     @CachedResourceGroupPreparer(name_prefix='servicebustest')
     @CachedServiceBusNamespacePreparer(name_prefix='servicebustest')
     @ServiceBusQueuePreparer(name_prefix='servicebustest', dead_lettering_on_message_expiration=True)
-    def test_message_state_scheduled(self, servicebus_namespace_connection_string, servicebus_queue, **kwargs):
+    def test_state_scheduled(self, servicebus_namespace_connection_string, servicebus_queue, **kwargs):
         with ServiceBusClient.from_connection_string(
             servicebus_namespace_connection_string) as sb_client:
 
@@ -2603,15 +2603,15 @@ def test_message_state_scheduled(self, servicebus_namespace_connection_string, s
             receiver = sb_client.get_queue_receiver(servicebus_queue.name)
             with receiver:
                 for msg in receiver.peek_messages():
-                    assert msg.message_state == ServiceBusMessageState.SCHEDULED
+                    assert msg.state == ServiceBusMessageState.SCHEDULED
 
 
     @pytest.mark.liveTest
     @pytest.mark.live_test_only
     @CachedResourceGroupPreparer(name_prefix='servicebustest')
     @CachedServiceBusNamespacePreparer(name_prefix='servicebustest')
     @ServiceBusQueuePreparer(name_prefix='servicebustest', dead_lettering_on_message_expiration=True)
-    def test_message_state_deferred(self, servicebus_namespace_connection_string, servicebus_queue, **kwargs):
+    def test_state_deferred(self, servicebus_namespace_connection_string, servicebus_queue, **kwargs):
         with ServiceBusClient.from_connection_string(
             servicebus_namespace_connection_string) as sb_client:
 
@@ -2625,12 +2625,12 @@ def test_message_state_deferred(self, servicebus_namespace_connection_string, se
             with receiver:
                 received_msgs = receiver.receive_messages()
                 for message in received_msgs:
-                    assert message.message_state == ServiceBusMessageState.ACTIVE
+                    assert message.state == ServiceBusMessageState.ACTIVE
                     deferred_messages.append(message.sequence_number)
                     receiver.defer_message(message)
                 if deferred_messages:
                     received_deferred_msg = receiver.receive_deferred_messages(
                         sequence_numbers=deferred_messages
                         )
                 for message in received_deferred_msg:
-                    assert message.message_state == ServiceBusMessageState.DEFERRED
+                    assert message.state == ServiceBusMessageState.DEFERRED