Simplify tests by using ContextInstances

projectharmonia · Nov 1, 2024 · a2f092d · a2f092d
1 parent aacb172
commit a2f092d
Show file tree

Hide file tree

Showing 10 changed files with 433 additions and 645 deletions.
diff --git a/tests/accumulation.rs b/tests/accumulation.rs
@@ -1,21 +1,11 @@
-mod action_recorder;
-
 use bevy::{input::InputPlugin, prelude::*};
 use bevy_enhanced_input::prelude::*;
 
-use action_recorder::{ActionRecorderPlugin, AppTriggeredExt, RecordedActions};
-
 #[test]
 fn max_abs() {
     let mut app = App::new();
-    app.add_plugins((
-        MinimalPlugins,
-        InputPlugin,
-        EnhancedInputPlugin,
-        ActionRecorderPlugin,
-    ))
-    .add_input_context::<DummyContext>()
-    .record_action::<MaxAbs>();
+    app.add_plugins((MinimalPlugins, InputPlugin, EnhancedInputPlugin))
+        .add_input_context::<DummyContext>();
 
     let entity = app.world_mut().spawn(DummyContext).id();
 
@@ -27,23 +17,17 @@ fn max_abs() {
 
     app.update();
 
-    let recorded = app.world().resource::<RecordedActions>();
-    let events = recorded.get::<MaxAbs>(entity).unwrap();
-    let event = events.last().unwrap();
-    assert_eq!(event.value, Vec2::Y.into());
+    let instances = app.world().resource::<ContextInstances>();
+    let ctx = instances.get::<DummyContext>(entity).unwrap();
+    let action = ctx.action::<MaxAbs>().unwrap();
+    assert_eq!(action.value(), Vec2::Y.into());
 }
 
 #[test]
 fn cumulative() {
     let mut app = App::new();
-    app.add_plugins((
-        MinimalPlugins,
-        InputPlugin,
-        EnhancedInputPlugin,
-        ActionRecorderPlugin,
-    ))
-    .add_input_context::<DummyContext>()
-    .record_action::<Cumulative>();
+    app.add_plugins((MinimalPlugins, InputPlugin, EnhancedInputPlugin))
+        .add_input_context::<DummyContext>();
 
     let entity = app.world_mut().spawn(DummyContext).id();
 
@@ -55,9 +39,14 @@ fn cumulative() {
 
     app.update();
 
-    let recorded = app.world().resource::<RecordedActions>();
-    let events = recorded.get::<Cumulative>(entity).unwrap();
-    assert!(events.is_empty(), "up and down should cancel each other");
+    let instances = app.world().resource::<ContextInstances>();
+    let ctx = instances.get::<DummyContext>(entity).unwrap();
+    let action = ctx.action::<Cumulative>().unwrap();
+    assert_eq!(
+        action.value(),
+        Vec2::ZERO.into(),
+        "up and down should cancel each other"
+    );
 }
 
 #[derive(Debug, Component)]

diff --git a/tests/action_recorder/mod.rs b/tests/action_recorder/mod.rs
diff --git a/tests/bind_presets.rs b/tests/bind_presets.rs
@@ -1,5 +1,3 @@
-mod action_recorder;
-
 use bevy::{
     input::{
         gamepad::{GamepadConnection, GamepadConnectionEvent, GamepadInfo},
@@ -9,19 +7,11 @@ use bevy::{
 };
 use bevy_enhanced_input::prelude::*;
 
-use action_recorder::{ActionRecorderPlugin, AppTriggeredExt, RecordedActions};
-
 #[test]
 fn wasd_and_arrows() {
     let mut app = App::new();
-    app.add_plugins((
-        MinimalPlugins,
-        InputPlugin,
-        EnhancedInputPlugin,
-        ActionRecorderPlugin,
-    ))
-    .add_input_context::<DummyContext>()
-    .record_action::<DummyAction>();
+    app.add_plugins((MinimalPlugins, InputPlugin, EnhancedInputPlugin))
+        .add_input_context::<DummyContext>();
 
     let entity = app.world_mut().spawn(DummyContext).id();
 
@@ -43,11 +33,11 @@ fn wasd_and_arrows() {
 
         app.update();
 
-        let recorded = app.world().resource::<RecordedActions>();
-        let events = recorded.get::<DummyAction>(entity).unwrap();
-        let event = events.last().unwrap();
+        let instances = app.world().resource::<ContextInstances>();
+        let ctx = instances.get::<DummyContext>(entity).unwrap();
+        let action = ctx.action::<DummyAction>().unwrap();
         assert_eq!(
-            event.value,
+            action.value(),
             dir.into(),
             "`{key:?}` should result in `{dir}`"
         );
@@ -63,14 +53,8 @@ fn wasd_and_arrows() {
 #[test]
 fn dpad() {
     let mut app = App::new();
-    app.add_plugins((
-        MinimalPlugins,
-        InputPlugin,
-        EnhancedInputPlugin,
-        ActionRecorderPlugin,
-    ))
-    .add_input_context::<DummyContext>()
-    .record_action::<DummyAction>();
+    app.add_plugins((MinimalPlugins, InputPlugin, EnhancedInputPlugin))
+        .add_input_context::<DummyContext>();
 
     let gamepad = Gamepad::new(0);
     app.world_mut().send_event(GamepadConnectionEvent {
@@ -101,11 +85,11 @@ fn dpad() {
 
         app.update();
 
-        let recorded = app.world().resource::<RecordedActions>();
-        let events = recorded.get::<DummyAction>(entity).unwrap();
-        let event = events.last().unwrap();
+        let instances = app.world().resource::<ContextInstances>();
+        let ctx = instances.get::<DummyContext>(entity).unwrap();
+        let action = ctx.action::<DummyAction>().unwrap();
         assert_eq!(
-            event.value,
+            action.value(),
             dir.into(),
             "`{button:?}` should result in `{dir}`"
         );
@@ -121,14 +105,8 @@ fn dpad() {
 #[test]
 fn sticks() {
     let mut app = App::new();
-    app.add_plugins((
-        MinimalPlugins,
-        InputPlugin,
-        EnhancedInputPlugin,
-        ActionRecorderPlugin,
-    ))
-    .add_input_context::<DummyContext>()
-    .record_action::<DummyAction>();
+    app.add_plugins((MinimalPlugins, InputPlugin, EnhancedInputPlugin))
+        .add_input_context::<DummyContext>();
 
     let gamepad = Gamepad::new(0);
     app.world_mut().send_event(GamepadConnectionEvent {
@@ -160,11 +138,11 @@ fn sticks() {
 
             app.update();
 
-            let recorded = app.world().resource::<RecordedActions>();
-            let events = recorded.get::<DummyAction>(entity).unwrap();
-            let event = events.last().unwrap();
+            let instances = app.world().resource::<ContextInstances>();
+            let ctx = instances.get::<DummyContext>(entity).unwrap();
+            let action = ctx.action::<DummyAction>().unwrap();
             assert_eq!(
-                event.value,
+                action.value(),
                 dir.into(),
                 "`{axis:?}` should result in `{dir}`"
             );