Fix message state tests (Azure#25520)

Author: JoshLove-msft

sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusReceivedMessage.cs

@@ -425,7 +425,7 @@ public ServiceBusMessageState State
                     return (ServiceBusMessageState)val;
                 }
 
-                return default;
+                return ServiceBusMessageState.Active;
             }
             internal set
             {

sdk/servicebus/Azure.Messaging.ServiceBus/tests/Message/MessageLiveTests.cs

@@ -204,6 +204,10 @@ public async Task CreateFromReceivedMessageCopiesPropertiesTopic()
 
                 ServiceBusSessionReceiver receiver = await client.AcceptNextSessionAsync(scope.TopicName, scope.SubscriptionNames.First());
                 ServiceBusReceivedMessage received = await receiver.ReceiveMessageAsync();
+
+                // defer the message so we can verify that the Message State is cleared as expected by constructor
+                await receiver.DeferMessageAsync(received);
+                received = await receiver.PeekMessageAsync();
                 AmqpAnnotatedMessage rawReceived = received.GetRawAmqpMessage();
                 Assert.IsNotNull(rawReceived.Header.DeliveryCount);
                 Assert.IsTrue(rawReceived.MessageAnnotations.ContainsKey(AmqpMessageConstants.LockedUntilName));

sdk/servicebus/Azure.Messaging.ServiceBus/tests/Receiver/ReceiverLiveTests.cs

@@ -490,7 +490,7 @@ public async Task DeferMessagesList()
                 {
                     Assert.AreEqual(messageList[i].MessageId, deferredMessages[i].MessageId);
                     Assert.AreEqual(messageList[i].Body.ToArray(), deferredMessages[i].Body.ToArray());
-                    Assert.AreEqual(ServiceBusMessageState.Deferred, deferredMessages[i]);
+                    Assert.AreEqual(ServiceBusMessageState.Deferred, deferredMessages[i].State);
                 }
 
                 // verify that looking up a non-existent sequence number will throw
@@ -545,7 +545,7 @@ public async Task DeferMessagesArray()
                 {
                     Assert.AreEqual(messageList[i].MessageId, deferredMessages[i].MessageId);
                     Assert.AreEqual(messageList[i].Body.ToArray(), deferredMessages[i].Body.ToArray());
-                    Assert.AreEqual(ServiceBusMessageState.Deferred, deferredMessages[i]);
+                    Assert.AreEqual(ServiceBusMessageState.Deferred, deferredMessages[i].State);
                 }
 
                 // verify that an empty array can be passed
@@ -602,7 +602,7 @@ IEnumerable<long> GetEnumerable()
                 {
                     Assert.AreEqual(messageList[i].MessageId, deferredMessages[i].MessageId);
                     Assert.AreEqual(messageList[i].Body.ToArray(), deferredMessages[i].Body.ToArray());
-                    Assert.AreEqual(ServiceBusMessageState.Deferred, deferredMessages[i]);
+                    Assert.AreEqual(ServiceBusMessageState.Deferred, deferredMessages[i].State);
                 }
 
                 // verify that an empty enumerable can be passed
@@ -629,12 +629,12 @@ public async Task CanPeekADeferredMessage()
                 var peekedMsg = await receiver.PeekMessageAsync();
                 Assert.AreEqual(receivedMsg.MessageId, peekedMsg.MessageId);
                 Assert.AreEqual(receivedMsg.SequenceNumber, peekedMsg.SequenceNumber);
-                Assert.AreEqual(ServiceBusMessageState.Deferred, receivedMsg.State);
+                Assert.AreEqual(ServiceBusMessageState.Deferred, peekedMsg.State);
 
                 var deferredMsg = await receiver.ReceiveDeferredMessageAsync(peekedMsg.SequenceNumber);
                 Assert.AreEqual(peekedMsg.MessageId, deferredMsg.MessageId);
                 Assert.AreEqual(peekedMsg.SequenceNumber, deferredMsg.SequenceNumber);
-                Assert.AreEqual(peekedMsg.State, receivedMsg.State);
+                Assert.AreEqual(peekedMsg.State, deferredMsg.State);
             }
         }