Add tests

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

frame/message-queue/src/integration_test.rs

@@ -21,7 +21,10 @@
 #![cfg(test)]
 
 use crate::{
-	mock::{new_test_ext, IntoWeight, MockedWeightInfo, NumMessagesProcessed, SuspendedQueues},
+	mock::{
+		new_test_ext, CountingMessageProcessor, IntoWeight, MockedWeightInfo, NumMessagesProcessed,
+		SuspendedQueues,
+	},
 	mock_helpers::MessageOrigin,
 	*,
 };
@@ -90,7 +93,7 @@ parameter_types! {
 impl Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = MockedWeightInfo;
-	type MessageProcessor = mock::CountingMessageProcessor;
+	type MessageProcessor = CountingMessageProcessor;
 	type Size = u32;
 	type QueueChangeHandler = ();
 	type HeapSize = HeapSize;

frame/message-queue/src/mock.rs

@@ -292,7 +292,11 @@ pub fn set_weight(name: &str, w: Weight) {
 
 /// Assert that exactly these pages are present. Assumes `Here` origin.
 pub fn assert_pages(indices: &[u32]) {
-	assert_eq!(Pages::<Test>::iter().count(), indices.len(), "Wrong number of pages in the queue");
+	assert_eq!(
+		Pages::<Test>::iter_keys().count(),
+		indices.len(),
+		"Wrong number of pages in the queue"
+	);
 	for i in indices {
 		assert!(Pages::<Test>::contains_key(MessageOrigin::Here, i));
 	}

frame/message-queue/src/tests.rs

@@ -437,7 +437,7 @@ fn service_page_works() {
 				assert_eq!(status, Bailed);
 			}
 		}
-		assert!(!Pages::<Test>::contains_key(Here, 0), "The page got removed");
+		assert_pages(&[]);
 	});
 }
 
@@ -503,6 +503,58 @@ fn service_page_item_bails() {
 	});
 }
 
+#[test]
+fn service_page_suspension_works() {
+	use super::integration_test::Test; // Run with larger page size.
+	use MessageOrigin::*;
+	use PageExecutionStatus::*;
+
+	new_test_ext::<Test>().execute_with(|| {
+		let (page, mut msgs) = full_page::<Test>();
+		assert!(msgs >= 10, "pre-condition: need at least 10 msgs per page");
+		let mut book = book_for::<Test>(&page);
+		Pages::<Test>::insert(Here, 0, page);
+
+		// First we process 5 messages from this page.
+		let mut meter = WeightMeter::from_limit(5.into_weight());
+		let (_, status) =
+			crate::Pallet::<Test>::service_page(&Here, &mut book, &mut meter, Weight::MAX);
+
+		assert_eq!(NumMessagesProcessed::take(), 5);
+		assert!(meter.remaining().is_zero());
+		assert_eq!(status, Bailed); // It bailed since weight is missing.
+		msgs -= 5;
+
+		// Then we pause the queue.
+		SuspendedQueues::set(vec![Here]);
+		// Noting happens...
+		for _ in 0..5 {
+			let (_, status) = crate::Pallet::<Test>::service_page(
+				&Here,
+				&mut book,
+				&mut WeightMeter::max_limit(),
+				Weight::MAX,
+			);
+			assert_eq!(status, NoProgress);
+			assert!(NumMessagesProcessed::take().is_zero());
+		}
+
+		// Resume and process all remaining.
+		SuspendedQueues::take();
+		let (_, status) = crate::Pallet::<Test>::service_page(
+			&Here,
+			&mut book,
+			&mut WeightMeter::max_limit(),
+			Weight::MAX,
+		);
+		assert_eq!(status, NoMore);
+		assert_eq!(NumMessagesProcessed::take(), msgs);
+
+		assert!(Pages::<Test>::iter_keys().count().is_zero());
+		MessageQueue::do_try_state().expect("Pallet is in a valid state");
+	});
+}
+
 #[test]
 fn bump_service_head_works() {
 	use MessageOrigin::*;