Tests: fix Stream assertions

This doesn't change any expectations, only uses the much more useful overloads like Assert.Equal(a, b) instead of Assert.True(a == b) so we get much more useful output.

Something is wrong with our stream assumptions, but it's not super clear on what special IDs are what in the docuemtnation right now either...I think our resolution to special start IDs is off but let's get testing in order first.
parent 543dad5a
...@@ -63,13 +63,13 @@ public void StreamAddMultipleValuePairsWithAutoId() ...@@ -63,13 +63,13 @@ public void StreamAddMultipleValuePairsWithAutoId()
var entries = db.StreamRange(key); var entries = db.StreamRange(key);
Assert.True(entries.Length == 1); Assert.Single(entries);
Assert.Equal(messageId, entries[0].Id); Assert.Equal(messageId, entries[0].Id);
Assert.True(entries[0].Values.Length == 2); Assert.Equal(2, entries[0].Values.Length);
Assert.True(entries[0].Values[0].Name == "field1"); Assert.Equal("field1", entries[0].Values[0].Name);
Assert.True(entries[0].Values[0].Value == "value1"); Assert.Equal("value1", entries[0].Values[0].Value);
Assert.True(entries[0].Values[1].Name == "field2"); Assert.Equal("field2", entries[0].Values[1].Name);
Assert.True(entries[0].Values[1].Value == "value2"); Assert.Equal("value2", entries[0].Values[1].Value);
} }
} }
...@@ -113,7 +113,7 @@ public void StreamAddMultipleValuePairsWithManualId() ...@@ -113,7 +113,7 @@ public void StreamAddMultipleValuePairsWithManualId()
Assert.Equal(id, messageId); Assert.Equal(id, messageId);
Assert.NotNull(entries); Assert.NotNull(entries);
Assert.True(entries.Length == 1); Assert.Single(entries);
Assert.Equal(id, entries[0].Id); Assert.Equal(id, entries[0].Id);
} }
} }
...@@ -148,8 +148,8 @@ public void StreamConsumerGroupSetId() ...@@ -148,8 +148,8 @@ public void StreamConsumerGroupSetId()
Assert.NotNull(firstRead); Assert.NotNull(firstRead);
Assert.NotNull(secondRead); Assert.NotNull(secondRead);
Assert.True(firstRead.Length == 0); Assert.Empty(firstRead);
Assert.True(secondRead.Length == 2); Assert.Equal(2, secondRead.Length);
} }
} }
...@@ -174,7 +174,7 @@ public void StreamConsumerGroupWithNoConsumers() ...@@ -174,7 +174,7 @@ public void StreamConsumerGroupWithNoConsumers()
// Query redis for the group consumers, expect an empty list in response. // Query redis for the group consumers, expect an empty list in response.
var consumers = db.StreamConsumerInfo(key, groupName); var consumers = db.StreamConsumerInfo(key, groupName);
Assert.True(consumers.Length == 0); Assert.Empty(consumers);
} }
} }
...@@ -222,7 +222,7 @@ public void StreamConsumerGroupReadOnlyNewMessagesWithEmptyResponse() ...@@ -222,7 +222,7 @@ public void StreamConsumerGroupReadOnlyNewMessagesWithEmptyResponse()
// Read, expect no messages // Read, expect no messages
var entries = db.StreamReadGroup(key, groupName, "test_consumer", "0-0"); var entries = db.StreamReadGroup(key, groupName, "test_consumer", "0-0");
Assert.True(entries.Length == 0); Assert.Empty(entries);
} }
} }
...@@ -245,7 +245,7 @@ public void StreamConsumerGroupReadFromStreamBeginning() ...@@ -245,7 +245,7 @@ public void StreamConsumerGroupReadFromStreamBeginning()
var entries = db.StreamReadGroup(key, groupName, "test_consumer", "0-0"); var entries = db.StreamReadGroup(key, groupName, "test_consumer", "0-0");
Assert.True(entries.Length == 2); Assert.Equal(2, entries.Length);
Assert.True(id1 == entries[0].Id); Assert.True(id1 == entries[0].Id);
Assert.True(id2 == entries[1].Id); Assert.True(id2 == entries[1].Id);
} }
...@@ -274,7 +274,7 @@ public void StreamConsumerGroupReadFromStreamBeginningWithCount() ...@@ -274,7 +274,7 @@ public void StreamConsumerGroupReadFromStreamBeginningWithCount()
var entries = db.StreamReadGroup(key, groupName, "test_consumer", StreamPosition.NewMessages, 2); var entries = db.StreamReadGroup(key, groupName, "test_consumer", StreamPosition.NewMessages, 2);
// Ensure we only received the requested count and that the IDs match the expected values. // Ensure we only received the requested count and that the IDs match the expected values.
Assert.True(entries.Length == 2); Assert.Single(entries);
Assert.True(id2 == entries[0].Id); Assert.True(id2 == entries[0].Id);
Assert.True(id3 == entries[1].Id); Assert.True(id3 == entries[1].Id);
} }
...@@ -314,10 +314,10 @@ public void StreamConsumerGroupAcknowledgeMessage() ...@@ -314,10 +314,10 @@ public void StreamConsumerGroupAcknowledgeMessage()
// Read the group again, it should only return the unacknowledged message. // Read the group again, it should only return the unacknowledged message.
var notAcknowledged = db.StreamReadGroup(key, groupName, consumer, "0-0"); var notAcknowledged = db.StreamReadGroup(key, groupName, consumer, "0-0");
Assert.True(entries.Length == 4); Assert.Equal(4, entries.Length);
Assert.Equal(1, oneAck); Assert.Equal(1, oneAck);
Assert.Equal(2, twoAck); Assert.Equal(2, twoAck);
Assert.True(notAcknowledged.Length == 1); Assert.Single(notAcknowledged);
Assert.Equal(id2, notAcknowledged[0].Id); Assert.Equal(id2, notAcknowledged[0].Id);
} }
} }
...@@ -367,9 +367,9 @@ public void StreamConsumerGroupClaimMessages() ...@@ -367,9 +367,9 @@ public void StreamConsumerGroupClaimMessages()
var pendingSummary = db.StreamPending(key, groupName); var pendingSummary = db.StreamPending(key, groupName);
Assert.NotNull(pendingSummary.Consumers); Assert.NotNull(pendingSummary.Consumers);
Assert.True(pendingSummary.Consumers.Length == 1); Assert.Single(pendingSummary.Consumers);
Assert.Equal(4, pendingSummary.Consumers[0].PendingMessageCount); Assert.Equal(4, pendingSummary.Consumers[0].PendingMessageCount);
Assert.True(pendingMessages.Length == messages.Length); Assert.Equal(pendingMessages.Length, messages.Length);
} }
} }
...@@ -464,9 +464,9 @@ public void StreamConsumerGroupReadMultipleOneReadBeginningOneReadNew() ...@@ -464,9 +464,9 @@ public void StreamConsumerGroupReadMultipleOneReadBeginningOneReadNew()
var streams = db.StreamReadGroup(pairs, groupName, "test_consumer"); var streams = db.StreamReadGroup(pairs, groupName, "test_consumer");
Assert.NotNull(streams); Assert.NotNull(streams);
Assert.True(streams.Length == 2); Assert.Equal(2, streams.Length);
Assert.True(streams[0].Entries.Length == 0); Assert.Empty(streams[0].Entries);
Assert.True(streams[1].Entries.Length == 3); Assert.Equal(3, streams[1].Entries.Length);
} }
} }
...@@ -499,9 +499,9 @@ public void StreamConsumerGroupReadMultipleOnlyNewMessagesExpectNoResult() ...@@ -499,9 +499,9 @@ public void StreamConsumerGroupReadMultipleOnlyNewMessagesExpectNoResult()
var streams = db.StreamReadGroup(pairs, groupName, "test_consumer"); var streams = db.StreamReadGroup(pairs, groupName, "test_consumer");
Assert.NotNull(streams); Assert.NotNull(streams);
Assert.True(streams.Length == 2); Assert.Equal(2, streams.Length);
Assert.True(streams[0].Entries.Length == 0); Assert.Empty(streams[0].Entries);
Assert.True(streams[1].Entries.Length == 0); Assert.Empty(streams[1].Entries);
} }
} }
...@@ -540,9 +540,9 @@ public void StreamConsumerGroupReadMultipleOnlyNewMessagesExpect1Result() ...@@ -540,9 +540,9 @@ public void StreamConsumerGroupReadMultipleOnlyNewMessagesExpect1Result()
var streams = db.StreamReadGroup(pairs, groupName, "test_consumer"); var streams = db.StreamReadGroup(pairs, groupName, "test_consumer");
Assert.NotNull(streams); Assert.NotNull(streams);
Assert.True(streams.Length == 2); Assert.Equal(2, streams.Length);
Assert.True(streams[0].Entries.Length == 1); Assert.Single(streams[0].Entries);
Assert.True(streams[1].Entries.Length == 1); Assert.Single(streams[1].Entries);
Assert.Equal(id1, streams[0].Entries[0].Id); Assert.Equal(id1, streams[0].Entries[0].Id);
Assert.Equal(id2, streams[1].Entries[0].Id); Assert.Equal(id2, streams[1].Entries[0].Id);
} }
...@@ -583,9 +583,9 @@ public void StreamConsumerGroupReadMultipleRestrictCount() ...@@ -583,9 +583,9 @@ public void StreamConsumerGroupReadMultipleRestrictCount()
var streams = db.StreamReadGroup(pairs, groupName, "test_consumer", 2); var streams = db.StreamReadGroup(pairs, groupName, "test_consumer", 2);
Assert.NotNull(streams); Assert.NotNull(streams);
Assert.True(streams.Length == 2); Assert.Equal(2, streams.Length);
Assert.True(streams[0].Entries.Length == 1); Assert.Single(streams[0].Entries);
Assert.True(streams[1].Entries.Length == 2); Assert.Equal(2, streams[1].Entries.Length);
Assert.Equal(id1_2, streams[0].Entries[0].Id); Assert.Equal(id1_2, streams[0].Entries[0].Id);
} }
} }
...@@ -609,10 +609,10 @@ public void StreamConsumerGroupViewPendingInfoNoConsumers() ...@@ -609,10 +609,10 @@ public void StreamConsumerGroupViewPendingInfoNoConsumers()
var pendingInfo = db.StreamPending(key, groupName); var pendingInfo = db.StreamPending(key, groupName);
Assert.Equal(0, pendingInfo.PendingMessageCount); Assert.Equal(0, pendingInfo.PendingMessageCount);
Assert.True(pendingInfo.LowestPendingMessageId == RedisValue.Null); Assert.Equal(RedisValue.Null, pendingInfo.LowestPendingMessageId);
Assert.True(pendingInfo.HighestPendingMessageId == RedisValue.Null); Assert.Equal(RedisValue.Null, pendingInfo.HighestPendingMessageId);
Assert.NotNull(pendingInfo.Consumers); Assert.NotNull(pendingInfo.Consumers);
Assert.True(pendingInfo.Consumers.Length == 0); Assert.Empty(pendingInfo.Consumers);
} }
} }
...@@ -638,7 +638,7 @@ public void StreamConsumerGroupViewPendingInfoWhenNothingPending() ...@@ -638,7 +638,7 @@ public void StreamConsumerGroupViewPendingInfoWhenNothingPending()
consumerName: RedisValue.Null); consumerName: RedisValue.Null);
Assert.NotNull(pendingMessages); Assert.NotNull(pendingMessages);
Assert.True(pendingMessages.Length == 0); Assert.Empty(pendingMessages);
} }
} }
...@@ -793,8 +793,8 @@ public void StreamDeleteConsumer() ...@@ -793,8 +793,8 @@ public void StreamDeleteConsumer()
var postDeleteConsumers = db.StreamConsumerInfo(key, groupName); var postDeleteConsumers = db.StreamConsumerInfo(key, groupName);
Assert.Equal(2, deleteResult); Assert.Equal(2, deleteResult);
Assert.True(preDeleteConsumers.Length == 1); Assert.Single(preDeleteConsumers);
Assert.True(postDeleteConsumers.Length == 0); Assert.Empty(postDeleteConsumers);
} }
} }
...@@ -826,8 +826,8 @@ public void StreamDeleteConsumerGroup() ...@@ -826,8 +826,8 @@ public void StreamDeleteConsumerGroup()
var postDeleteInfo = db.StreamInfo(key); var postDeleteInfo = db.StreamInfo(key);
Assert.True(deleteResult); Assert.True(deleteResult);
Assert.True(preDeleteInfo.ConsumerGroupCount == 1); Assert.Equal(1, preDeleteInfo.ConsumerGroupCount);
Assert.True(postDeleteInfo.ConsumerGroupCount == 0); Assert.Equal(0, postDeleteInfo.ConsumerGroupCount);
} }
} }
...@@ -1027,7 +1027,7 @@ public void StreamNoConsumerGroups() ...@@ -1027,7 +1027,7 @@ public void StreamNoConsumerGroups()
var groups = db.StreamGroupInfo(key); var groups = db.StreamGroupInfo(key);
Assert.NotNull(groups); Assert.NotNull(groups);
Assert.True(groups.Length == 0); Assert.Empty(groups);
} }
} }
...@@ -1054,7 +1054,7 @@ public void StreamPendingNoMessagesOrConsumers() ...@@ -1054,7 +1054,7 @@ public void StreamPendingNoMessagesOrConsumers()
Assert.Equal(RedisValue.Null, pendingInfo.LowestPendingMessageId); Assert.Equal(RedisValue.Null, pendingInfo.LowestPendingMessageId);
Assert.Equal(RedisValue.Null, pendingInfo.HighestPendingMessageId); Assert.Equal(RedisValue.Null, pendingInfo.HighestPendingMessageId);
Assert.NotNull(pendingInfo.Consumers); Assert.NotNull(pendingInfo.Consumers);
Assert.True(pendingInfo.Consumers.Length == 0); Assert.Empty(pendingInfo.Consumers);
} }
} }
...@@ -1113,7 +1113,7 @@ public void StreamRead() ...@@ -1113,7 +1113,7 @@ public void StreamRead()
// Read the entire stream from the beginning. // Read the entire stream from the beginning.
var entries = db.StreamRead(key, "0-0"); var entries = db.StreamRead(key, "0-0");
Assert.True(entries.Length == 3); Assert.Equal(3, entries.Length);
Assert.Equal(id1, entries[0].Id); Assert.Equal(id1, entries[0].Id);
Assert.Equal(id2, entries[1].Id); Assert.Equal(id2, entries[1].Id);
Assert.Equal(id3, entries[2].Id); Assert.Equal(id3, entries[2].Id);
...@@ -1141,7 +1141,7 @@ public void StreamReadEmptyStream() ...@@ -1141,7 +1141,7 @@ public void StreamReadEmptyStream()
// Read the entire stream from the beginning. // Read the entire stream from the beginning.
var entries = db.StreamRead(key, "0-0"); var entries = db.StreamRead(key, "0-0");
Assert.True(entries.Length == 0); Assert.Empty(entries);
Assert.Equal(0, len); Assert.Equal(0, len);
} }
} }
...@@ -1173,8 +1173,8 @@ public void StreamReadEmptyStreams() ...@@ -1173,8 +1173,8 @@ public void StreamReadEmptyStreams()
var entries1 = db.StreamRead(key1, "0-0"); var entries1 = db.StreamRead(key1, "0-0");
var entries2 = db.StreamRead(key2, "0-0"); var entries2 = db.StreamRead(key2, "0-0");
Assert.True(entries1.Length == 0); Assert.Empty(entries1);
Assert.True(entries2.Length == 0); Assert.Empty(entries2);
Assert.Equal(0, len1); Assert.Equal(0, len1);
Assert.Equal(0, len2); Assert.Equal(0, len2);
...@@ -1269,12 +1269,12 @@ public void StreamReadMultipleStreams() ...@@ -1269,12 +1269,12 @@ public void StreamReadMultipleStreams()
Assert.True(streams.Length == 2); Assert.True(streams.Length == 2);
Assert.Equal(key1, streams[0].Key); Assert.Equal(key1, streams[0].Key);
Assert.True(streams[0].Entries.Length == 2); Assert.Equal(2, streams[0].Entries.Length);
Assert.Equal(id1, streams[0].Entries[0].Id); Assert.Equal(id1, streams[0].Entries[0].Id);
Assert.Equal(id2, streams[0].Entries[1].Id); Assert.Equal(id2, streams[0].Entries[1].Id);
Assert.Equal(key2, streams[1].Key); Assert.Equal(key2, streams[1].Key);
Assert.True(streams[1].Entries.Length == 2); Assert.Equal(2, streams[1].Entries.Length);
Assert.Equal(id3, streams[1].Entries[0].Id); Assert.Equal(id3, streams[1].Entries[0].Id);
Assert.Equal(id4, streams[1].Entries[1].Id); Assert.Equal(id4, streams[1].Entries[1].Id);
} }
...@@ -1306,11 +1306,11 @@ public void StreamReadMultipleStreamsWithCount() ...@@ -1306,11 +1306,11 @@ public void StreamReadMultipleStreamsWithCount()
var streams = db.StreamRead(streamList, countPerStream: 1); var streams = db.StreamRead(streamList, countPerStream: 1);
// We should get both streams back. // We should get both streams back.
Assert.True(streams.Length == 2); Assert.Equal(2, streams.Length);
// Ensure we only got one message per stream. // Ensure we only got one message per stream.
Assert.True(streams[0].Entries.Length == 1); Assert.Single(streams[0].Entries);
Assert.True(streams[1].Entries.Length == 1); Assert.Single(streams[1].Entries);
// Check the message IDs as well. // Check the message IDs as well.
Assert.Equal(id1, streams[0].Entries[0].Id); Assert.Equal(id1, streams[0].Entries[0].Id);
...@@ -1346,10 +1346,10 @@ public void StreamReadMultipleStreamsWithReadPastSecondStream() ...@@ -1346,10 +1346,10 @@ public void StreamReadMultipleStreamsWithReadPastSecondStream()
var streams = db.StreamRead(streamList); var streams = db.StreamRead(streamList);
// We should only get the first stream back. // We should only get the first stream back.
Assert.True(streams.Length == 1); Assert.Single(streams);
Assert.Equal(key1, streams[0].Key); Assert.Equal(key1, streams[0].Key);
Assert.True(streams[0].Entries.Length == 2); Assert.Equal(2, streams[0].Entries.Length);
} }
} }
...@@ -1380,7 +1380,7 @@ public void StreamReadMultipleStreamsWithEmptyResponse() ...@@ -1380,7 +1380,7 @@ public void StreamReadMultipleStreamsWithEmptyResponse()
var streams = db.StreamRead(streamList); var streams = db.StreamRead(streamList);
// We expect an empty response. // We expect an empty response.
Assert.True(streams.Length == 0); Assert.Empty(streams);
} }
} }
...@@ -1402,7 +1402,7 @@ public void StreamReadPastEndOfStream() ...@@ -1402,7 +1402,7 @@ public void StreamReadPastEndOfStream()
var entries = db.StreamRead(key, id2); var entries = db.StreamRead(key, id2);
Assert.True(entries.Length == 0); Assert.Empty(entries);
} }
} }
...@@ -1448,7 +1448,7 @@ public void StreamReadRangeOfEmptyStream() ...@@ -1448,7 +1448,7 @@ public void StreamReadRangeOfEmptyStream()
Assert.Equal(2, deleted); Assert.Equal(2, deleted);
Assert.NotNull(entries); Assert.NotNull(entries);
Assert.True(entries.Length == 0); Assert.Empty(entries);
} }
} }
...@@ -1468,7 +1468,7 @@ public void StreamReadRangeWithCount() ...@@ -1468,7 +1468,7 @@ public void StreamReadRangeWithCount()
var entries = db.StreamRange(key, count: 1); var entries = db.StreamRange(key, count: 1);
Assert.True(entries.Length == 1); Assert.Single(entries);
Assert.Equal(id1, entries[0].Id); Assert.Equal(id1, entries[0].Id);
} }
} }
...@@ -1489,7 +1489,7 @@ public void StreamReadRangeReverse() ...@@ -1489,7 +1489,7 @@ public void StreamReadRangeReverse()
var entries = db.StreamRange(key, messageOrder: Order.Descending); var entries = db.StreamRange(key, messageOrder: Order.Descending);
Assert.True(entries.Length == 2); Assert.Equal(2, entries.Length);
Assert.Equal(id2, entries[0].Id); Assert.Equal(id2, entries[0].Id);
Assert.Equal(id1, entries[1].Id); Assert.Equal(id1, entries[1].Id);
} }
...@@ -1511,7 +1511,7 @@ public void StreamReadRangeReverseWithCount() ...@@ -1511,7 +1511,7 @@ public void StreamReadRangeReverseWithCount()
var entries = db.StreamRange(key, id1, id2, 1, Order.Descending); var entries = db.StreamRange(key, id1, id2, 1, Order.Descending);
Assert.True(entries.Length == 1); Assert.Single(entries);
Assert.Equal(id2, entries[0].Id); Assert.Equal(id2, entries[0].Id);
} }
} }
...@@ -1534,7 +1534,7 @@ public void StreamReadWithAfterIdAndCount_1() ...@@ -1534,7 +1534,7 @@ public void StreamReadWithAfterIdAndCount_1()
// Only read a single item from the stream. // Only read a single item from the stream.
var entries = db.StreamRead(key, id1, 1); var entries = db.StreamRead(key, id1, 1);
Assert.True(entries.Length == 1); Assert.Single(entries);
Assert.Equal(id2, entries[0].Id); Assert.Equal(id2, entries[0].Id);
} }
} }
...@@ -1558,7 +1558,7 @@ public void StreamReadWithAfterIdAndCount_2() ...@@ -1558,7 +1558,7 @@ public void StreamReadWithAfterIdAndCount_2()
// Read multiple items from the stream. // Read multiple items from the stream.
var entries = db.StreamRead(key, id1, 2); var entries = db.StreamRead(key, id1, 2);
Assert.True(entries.Length == 2); Assert.Equal(2, entries.Length);
Assert.Equal(id2, entries[0].Id); Assert.Equal(id2, entries[0].Id);
Assert.Equal(id3, entries[1].Id); Assert.Equal(id3, entries[1].Id);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment