Update tests to compile and remove warnings.

azriel91 · Jul 17, 2021 · 70c0226 · 70c0226
1 parent 3909ac4
commit 70c0226
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 56 deletions.
diff --git a/crate/workspace_tests/src/application_robot/state/robot_state.rs b/crate/workspace_tests/src/application_robot/state/robot_state.rs
@@ -271,7 +271,6 @@ mod test {
         setup(invocations, intercepts)
     }
 
-    #[macro_use]
     macro_rules! delegate_test {
         ($test_name:ident, $function:ident, $invocation:expr) => {
             #[test]
@@ -286,7 +285,6 @@ mod test {
         };
     }
 
-    #[macro_use]
     macro_rules! intercept_no_op_test {
         ($test_name:ident, $function:ident, $($invocation:expr),* $(,)*) => {
             #[test]
@@ -304,7 +302,6 @@ mod test {
         }
     }
 
-    #[macro_use]
     macro_rules! intercept_no_op_trans_test {
         ($test_name:ident, $function:ident, $expected_trans:expr, $($invocation:expr),* $(,)*) => {
             #[test]
@@ -323,7 +320,6 @@ mod test {
         }
     }
 
-    #[macro_use]
     macro_rules! intercept_begin_test {
         ($test_name:ident, $function:ident, $expected_trans:expr, $($invocation:expr),* $(,)*) => {
             #[test]
@@ -342,7 +338,6 @@ mod test {
         }
     }
 
-    #[macro_use]
     macro_rules! intercept_end_test {
         ($test_name:ident, $function:ident, $expected_trans:expr, $($invocation:expr),* $(,)*) => {
             #[test]
@@ -702,7 +697,6 @@ mod test {
 
     /// Declares a function that pushes the specified invocation to the
     /// `self.invocations` field.
-    #[macro_use]
     macro_rules! fn_ {
         ($function:ident, $invocation:expr) => {
             fn $function(&mut self, _: StateData<'_, T>) {
@@ -716,7 +710,6 @@ mod test {
     ///
     /// This macro passes the `self.id` field as a parameter to the `Invocation`
     /// variant.
-    #[macro_use]
     macro_rules! fn_id {
         ($function:ident, $invocation:expr; [$($additional_param:ty),*]) => {
             fn $function(&mut self, $(_: $additional_param),*) {
@@ -732,7 +725,6 @@ mod test {
     ///
     /// The function returns the value in the `self.trans` field, which is
     /// expected to contain a value.
-    #[macro_use]
     macro_rules! fn_trans {
         ($function:ident, $invocation:expr; [$($additional_param:ty),*]) => {
             fn $function(&mut self, $(_: $additional_param),*) -> Trans<T, E> {
@@ -749,7 +741,6 @@ mod test {
     /// `self.invocations` field.
     ///
     /// The function returns the optional value in the `self.$trans` field
-    #[macro_use]
     macro_rules! fn_opt_trans {
         ($function:ident, $invocation:expr, $trans:ident; [$($additional_param:ty),*]) => {
             fn $function(&mut self, $(_: $additional_param),*) -> Option<Trans<T, E>> {

diff --git a/crate/workspace_tests/src/application_test_support/autexousious_application.rs b/crate/workspace_tests/src/application_test_support/autexousious_application.rs
@@ -73,12 +73,8 @@ mod test {
 
                         assert!(
                             !object_entities.is_empty(),
-                            // kcov-ignore-start
-                            format!(
-                                // kcov-ignore-end
-                                "Expected at least one entity for the `{}` object type",
-                                object_type
-                            )
+                            "Expected at least one entity for the `{}` object type",
+                            object_type
                         );
                     });
 

diff --git a/crate/workspace_tests/src/asset_model/config/asset_slug.rs b/crate/workspace_tests/src/asset_model/config/asset_slug.rs
@@ -9,8 +9,7 @@ mod tests {
         assert_eq!(
             Err(AssetSlugBuildError::NoValueProvided {
                 segment: AssetSlugSegment::Namespace
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default().build()
         );
     }
@@ -20,8 +19,7 @@ mod tests {
         assert_eq!(
             Err(AssetSlugBuildError::SegmentEmpty {
                 segment: AssetSlugSegment::Namespace
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("".to_string())
                 .build()
@@ -34,8 +32,7 @@ mod tests {
             Err(AssetSlugBuildError::SegmentContainsControlChar {
                 segment: AssetSlugSegment::Namespace,
                 value: String::from("ab")
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("ab".to_string())
                 .build()
@@ -48,8 +45,7 @@ mod tests {
             Err(AssetSlugBuildError::SegmentContainsWhitespace {
                 segment: AssetSlugSegment::Namespace,
                 value: String::from("a b")
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("a b".to_string())
                 .build()
@@ -62,8 +58,7 @@ mod tests {
             Err(AssetSlugBuildError::SegmentContainsForwardSlash {
                 segment: AssetSlugSegment::Namespace,
                 value: String::from("a/b")
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("a/b".to_string())
                 .build()
@@ -76,8 +71,7 @@ mod tests {
             Err(AssetSlugBuildError::SegmentStartsWithNumericChar {
                 segment: AssetSlugSegment::Namespace,
                 value: String::from("1ab")
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("1ab".to_string())
                 .build()
@@ -89,8 +83,7 @@ mod tests {
         assert_eq!(
             Err(AssetSlugBuildError::NoValueProvided {
                 segment: AssetSlugSegment::Name
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("test".to_string())
                 .build()
@@ -102,8 +95,7 @@ mod tests {
         assert_eq!(
             Err(AssetSlugBuildError::SegmentEmpty {
                 segment: AssetSlugSegment::Name
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("test".to_string())
                 .name("".to_string())
@@ -117,8 +109,7 @@ mod tests {
             Err(AssetSlugBuildError::SegmentContainsControlChar {
                 segment: AssetSlugSegment::Name,
                 value: String::from("ab")
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("test".to_string())
                 .name("ab".to_string())
@@ -132,8 +123,7 @@ mod tests {
             Err(AssetSlugBuildError::SegmentContainsWhitespace {
                 segment: AssetSlugSegment::Name,
                 value: String::from("a b")
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("test".to_string())
                 .name("a b".to_string())
@@ -147,8 +137,7 @@ mod tests {
             Err(AssetSlugBuildError::SegmentContainsForwardSlash {
                 segment: AssetSlugSegment::Name,
                 value: String::from("a/b")
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("test".to_string())
                 .name("a/b".to_string())
@@ -162,8 +151,7 @@ mod tests {
             Err(AssetSlugBuildError::SegmentStartsWithNumericChar {
                 segment: AssetSlugSegment::Name,
                 value: String::from("1ab")
-            }
-            .to_string()),
+            }),
             AssetSlugBuilder::default()
                 .namespace("test".to_string())
                 .name("1ab".to_string())

diff --git a/crate/workspace_tests/src/debug_util_amethyst.rs b/crate/workspace_tests/src/debug_util_amethyst.rs
@@ -4,7 +4,6 @@ mod test {
 
     use debug_util_amethyst::{assert_eq_opt_trans, assert_eq_trans};
 
-    #[macro_use]
     macro_rules! test_opt_trans_panic {
         ($test_name:ident, $message:expr, $expected:expr, $actual:expr) => {
             #[test]

diff --git a/...orkspace_tests/src/input_reaction_play/system/button_input_reactions_transition_system.rs b/...orkspace_tests/src/input_reaction_play/system/button_input_reactions_transition_system.rs
@@ -4,23 +4,20 @@ mod tests {
 
     use amethyst::{
         assets::{AssetStorage, Loader},
-        ecs::{Builder, Entity, Read, ReadExpect, World, WorldExt, WriteStorage},
+        ecs::{Builder, Entity, Read, ReadExpect, World, WorldExt},
         input::InputEvent,
-        shred::{ResourceId, SystemData},
         shrev::EventChannel,
         winit::event::VirtualKeyCode,
         Error,
     };
     use application::IoUtils;
     use application_test_support::AutexousiousApplication;
-    use derivative::Derivative;
     use game_input_model::{config::ControlBindings, play::ButtonInputControlled};
     use input_reaction_loading::{IrsLoader, IrsLoaderParams};
     use input_reaction_model::{
         config::BasicIrr,
         loaded::{
-            InputReaction, InputReactions, InputReactionsHandle, InputReactionsSequence,
-            InputReactionsSequenceHandle,
+            InputReaction, InputReactions, InputReactionsSequence, InputReactionsSequenceHandle,
         },
     };
     use sequence_model::{
@@ -192,17 +189,6 @@ mod tests {
         ec.single_write(event);
     } // kcov-ignore
 
-    #[derive(Derivative, SystemData)]
-    #[derivative(Debug)]
-    struct TestSystemData<'s> {
-        #[derivative(Debug = "ignore")]
-        sequence_ids: WriteStorage<'s, SequenceId>,
-        #[derivative(Debug = "ignore")]
-        input_reactions_handles: WriteStorage<'s, InputReactionsHandle<InputReaction<BasicIrr>>>,
-        #[derivative(Debug = "ignore")]
-        button_input_controlleds: WriteStorage<'s, ButtonInputControlled>,
-    }
-
     struct SetupParams {
         sequence_id: SequenceId,
         input_event: Option<InputEvent<ControlBindings>>,