From 7971034fde457651748feedaccdafd73592fa4b4 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Tue, 27 Oct 2020 17:04:52 -0500
Subject: [PATCH] Fixed audio tests.

---
 .../audio/sfx/event_mapper/combat/tests.rs    | 22 +++++++++++++------
 .../audio/sfx/event_mapper/movement/tests.rs  |  8 ++++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
index ad03ea0ea5..448c976f6b 100644
--- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
+++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
@@ -23,7 +23,10 @@ fn maps_wield_while_equipping() {
 
     let result = CombatEventMapper::map_event(
         &CharacterState::Equipping(states::equipping::Data {
-            time_left: Duration::from_millis(10),
+            static_data: states::equipping::StaticData {
+                buildup_duration: Duration::from_millis(10),
+            },
+            timer: Duration::default(),
         }),
         &PreviousEntityState {
             event: SfxEvent::Idle,
@@ -77,12 +80,17 @@ fn maps_basic_melee() {
 
     let result = CombatEventMapper::map_event(
         &CharacterState::BasicMelee(states::basic_melee::Data {
-            buildup_duration: Duration::default(),
-            recover_duration: Duration::default(),
-            knockback: 0.0,
-            base_healthchange: 10,
-            range: 1.0,
-            max_angle: 1.0,
+            static_data: states::basic_melee::StaticData {
+                buildup_duration: Duration::default(),
+                swing_duration: Duration::default(),
+                recover_duration: Duration::default(),
+                base_damage: 10,
+                knockback: 0.0,
+                range: 1.0,
+                max_angle: 1.0,
+            },
+            timer: Duration::default(),
+            stage_section: states::utils::StageSection::Buildup,
             exhausted: false,
         }),
         &PreviousEntityState {
diff --git a/voxygen/src/audio/sfx/event_mapper/movement/tests.rs b/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
index 40ef0d5edb..1ac43e80a3 100644
--- a/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
+++ b/voxygen/src/audio/sfx/event_mapper/movement/tests.rs
@@ -153,7 +153,13 @@ fn does_not_map_run_with_sufficient_velocity_but_not_on_ground() {
 fn maps_roll() {
     let result = MovementEventMapper::map_movement_event(
         &CharacterState::Roll(states::roll::Data {
-            remaining_duration: Duration::from_millis(300),
+            static_data: states::roll::StaticData {
+                buildup_duration: Duration::default(),
+                movement_duration: Duration::default(),
+                recover_duration: Duration::default(),
+            },
+            timer: Duration::default(),
+            stage_section: states::utils::StageSection::Buildup,
             was_wielded: true,
         }),
         &PhysicsState {