1 files changed, 26 insertions, 17 deletions

diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index 48bba1b..e548221 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -31,11 +31,11 @@ private:
 
 private:
 	Mediator mediator;
-	ComponentManager component_manager{mediator};
-	ResourceManager resource_manager{mediator};
+	ComponentManager component_manager {mediator};
+	ResourceManager resource_manager {mediator};
 
 public:
-	TestAudioSystem system{mediator};
+	TestAudioSystem system {mediator};
 	TestSoundContext & context = system.context;
 
 private:
@@ -50,16 +50,18 @@ TEST_F(AudioTest, Default) {
 	EXPECT_CALL(context, stop(_)).Times(0);
 	EXPECT_CALL(context, set_volume(_, _)).Times(0);
 	EXPECT_CALL(context, set_loop(_, _)).Times(0);
-	system.update();
+	system.fixed_update();
 }
 
 TEST_F(AudioTest, Play) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
 
 		EXPECT_CALL(context, play(_)).Times(0);
+		EXPECT_CALL(context, set_loop(_, _)).Times(0);
+		EXPECT_CALL(context, set_volume(_, _)).Times(0);
 		component.play();
 	}
 
@@ -67,12 +69,14 @@ TEST_F(AudioTest, Play) {
 		InSequence seq;
 
 		EXPECT_CALL(context, play(_)).Times(1);
-		system.update();
+		EXPECT_CALL(context, set_loop(_, _)).Times(1);
+		EXPECT_CALL(context, set_volume(_, _)).Times(1);
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, Stop) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
@@ -85,12 +89,12 @@ TEST_F(AudioTest, Stop) {
 		InSequence seq;
 
 		EXPECT_CALL(context, stop(_)).Times(1);
-		system.update();
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, Volume) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
@@ -103,12 +107,12 @@ TEST_F(AudioTest, Volume) {
 		InSequence seq;
 
 		EXPECT_CALL(context, set_volume(_, component.volume)).Times(1);
-		system.update();
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, Looping) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
@@ -121,33 +125,36 @@ TEST_F(AudioTest, Looping) {
 		InSequence seq;
 
 		EXPECT_CALL(context, set_loop(_, component.loop)).Times(1);
-		system.update();
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, StopOnDeactivate) {
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
 
 		EXPECT_CALL(context, stop(_)).Times(1);
 		component.active = false;
-		system.update();
+		system.fixed_update();
 	}
 }
 
 TEST_F(AudioTest, PlayOnActive) {
 	component.active = false;
 	component.play_on_awake = true;
-	system.update();
+	system.fixed_update();
 
 	{
 		InSequence seq;
 
 		EXPECT_CALL(context, play(_)).Times(1);
+		EXPECT_CALL(context, set_loop(_, _)).Times(1);
+		EXPECT_CALL(context, set_volume(_, _)).Times(1);
+
 		component.active = true;
-		system.update();
+		system.fixed_update();
 	}
 }
 
@@ -156,6 +163,8 @@ TEST_F(AudioTest, PlayImmediately) {
 	component.play();
 
 	EXPECT_CALL(context, play(_)).Times(1);
+	EXPECT_CALL(context, set_volume(_, _)).Times(1);
+	EXPECT_CALL(context, set_loop(_, _)).Times(1);
 
-	system.update();
+	system.fixed_update();
 }