Merge pull request #101 from rcore-os/testcleanup

Use Default to reduce some duplicate code in tests.

src/device/blk.rs

@@ -538,7 +538,7 @@ mod tests {
         hal::fake::FakeHal,
         transport::{
             fake::{FakeTransport, QueueStatus, State},
-            DeviceStatus, DeviceType,
+            DeviceType,
         },
     };
     use alloc::{sync::Arc, vec};
@@ -562,14 +562,11 @@ mod tests {
             opt_io_size: Volatile::new(0),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![QueueStatus::default()],
+            ..Default::default()
         }));
         let transport = FakeTransport {
-            device_type: DeviceType::Console,
+            device_type: DeviceType::Block,
             max_queue_size: QUEUE_SIZE.into(),
             device_features: BlkFeature::RO.bits(),
             config_space: NonNull::from(&mut config_space),
@@ -598,14 +595,11 @@ mod tests {
             opt_io_size: Volatile::new(0),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![QueueStatus::default()],
+            ..Default::default()
         }));
         let transport = FakeTransport {
-            device_type: DeviceType::Console,
+            device_type: DeviceType::Block,
             max_queue_size: QUEUE_SIZE.into(),
             device_features: 0,
             config_space: NonNull::from(&mut config_space),
@@ -671,14 +665,11 @@ mod tests {
             opt_io_size: Volatile::new(0),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![QueueStatus::default()],
+            ..Default::default()
         }));
         let transport = FakeTransport {
-            device_type: DeviceType::Console,
+            device_type: DeviceType::Block,
             max_queue_size: QUEUE_SIZE.into(),
             device_features: 0,
             config_space: NonNull::from(&mut config_space),
@@ -749,14 +740,11 @@ mod tests {
             opt_io_size: Volatile::new(0),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![QueueStatus::default()],
+            ..Default::default()
         }));
         let transport = FakeTransport {
-            device_type: DeviceType::Console,
+            device_type: DeviceType::Block,
             max_queue_size: QUEUE_SIZE.into(),
             device_features: BlkFeature::FLUSH.bits(),
             config_space: NonNull::from(&mut config_space),
@@ -819,14 +807,11 @@ mod tests {
             opt_io_size: Volatile::new(0),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![QueueStatus::default()],
+            ..Default::default()
         }));
         let transport = FakeTransport {
-            device_type: DeviceType::Console,
+            device_type: DeviceType::Block,
             max_queue_size: QUEUE_SIZE.into(),
             device_features: 0,
             config_space: NonNull::from(&mut config_space),

src/device/console.rs

@@ -241,7 +241,7 @@ mod tests {
         hal::fake::FakeHal,
         transport::{
             fake::{FakeTransport, QueueStatus, State},
-            DeviceStatus, DeviceType,
+            DeviceType,
         },
     };
     use alloc::{sync::Arc, vec};
@@ -257,11 +257,8 @@ mod tests {
             emerg_wr: WriteOnly::default(),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![QueueStatus::default(), QueueStatus::default()],
+            ..Default::default()
         }));
         let transport = FakeTransport {
             device_type: DeviceType::Console,
@@ -305,11 +302,8 @@ mod tests {
             emerg_wr: WriteOnly::default(),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![QueueStatus::default(), QueueStatus::default()],
+            ..Default::default()
         }));
         let transport = FakeTransport {
             device_type: DeviceType::Console,

src/device/socket/multiconnectionmanager.rs

@@ -380,7 +380,7 @@ mod tests {
         hal::fake::FakeHal,
         transport::{
             fake::{FakeTransport, QueueStatus, State},
-            DeviceStatus, DeviceType,
+            DeviceType,
         },
         volatile::ReadOnly,
     };
@@ -407,15 +407,12 @@ mod tests {
             guest_cid_high: ReadOnly::new(0),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![
                 QueueStatus::default(),
                 QueueStatus::default(),
                 QueueStatus::default(),
             ],
+            ..Default::default()
         }));
         let transport = FakeTransport {
             device_type: DeviceType::Socket,
@@ -622,15 +619,12 @@ mod tests {
             guest_cid_high: ReadOnly::new(0),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![
                 QueueStatus::default(),
                 QueueStatus::default(),
                 QueueStatus::default(),
             ],
+            ..Default::default()
         }));
         let transport = FakeTransport {
             device_type: DeviceType::Socket,

src/device/socket/singleconnectionmanager.rs

@@ -191,7 +191,7 @@ mod tests {
         hal::fake::FakeHal,
         transport::{
             fake::{FakeTransport, QueueStatus, State},
-            DeviceStatus, DeviceType,
+            DeviceType,
         },
         volatile::ReadOnly,
     };
@@ -218,15 +218,12 @@ mod tests {
             guest_cid_high: ReadOnly::new(0),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![
                 QueueStatus::default(),
                 QueueStatus::default(),
                 QueueStatus::default(),
             ],
+            ..Default::default()
         }));
         let transport = FakeTransport {
             device_type: DeviceType::Socket,

src/device/socket/vsock.rs

@@ -503,7 +503,7 @@ mod tests {
         hal::fake::FakeHal,
         transport::{
             fake::{FakeTransport, QueueStatus, State},
-            DeviceStatus, DeviceType,
+            DeviceType,
         },
         volatile::ReadOnly,
     };
@@ -518,15 +518,12 @@ mod tests {
             guest_cid_high: ReadOnly::new(0),
         };
         let state = Arc::new(Mutex::new(State {
-            status: DeviceStatus::empty(),
-            driver_features: 0,
-            guest_page_size: 0,
-            interrupt_pending: false,
             queues: vec![
                 QueueStatus::default(),
                 QueueStatus::default(),
                 QueueStatus::default(),
             ],
+            ..Default::default()
         }));
         let transport = FakeTransport {
             device_type: DeviceType::Socket,