Moved Sound Unit Test

Makefile

@@ -275,7 +275,7 @@ endif
 #################################################################
 # Unit Test builds
 #################################################################
-TEST_FLAGS=-Wall -g -O0 -DDEBUG -lstdc++
+TEST_FLAGS=-Wall -g -O0 -DDEBUG -lstdc++ -Iinclude
 
 TEST_MAP_TR5=~/projects/Data/models/tombraider/tr5/demo.trc
 TEST_MAP_TR4=~/projects/Data/models/tombraider/tr4/angkor1.tr4
@@ -303,7 +303,7 @@ TombRaider.test:
 
 GLString.test:
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) -Wall -Iinclude -D__TEST__ -DHAVE_MTK -DHAVE_SDL -DUSING_MTK_TGA \
+	$(CC) -Wall -Iinclude -DHAVE_MTK -DHAVE_SDL -DUSING_MTK_TGA \
 	$(shell sdl-config --cflags) $(shell sdl-config --libs) \
 	$(GL_LIBS) $(GL_DEFS) -lm -lstdc++ \
 	src/Texture.cpp src/mtk_tga.cpp \
@@ -360,9 +360,9 @@ Network.test:
 
 Sound.test:
 	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(TEST_FLAGS) -DUNIT_TEST_SOUND \
-		-DUSING_OPENAL $(AUDIO_LIBS) \
-		src/Sound.cpp -o $(BUILD_TEST_DIR)/Sound.test
+	$(CC) $(TEST_FLAGS) \
+		-DUSING_OPENAL $(AUDIO_LIBS) $(AUDIO_DEFS) \
+		src/Sound.cpp test/Sound.cpp -o $(BUILD_TEST_DIR)/Sound.test
 ifeq ($(UNAME),Darwin)
 	install_name_tool -change libalut.0.1.0.dylib /opt/local/lib/libalut.0.1.0.dylib $(BUILD_TEST_DIR)/Sound.test
 endif

include/Sound.h

@@ -2,8 +2,6 @@
  * \file Sound.h
  * \brief This is the audio manager Header
  *
- * Defining UNIT_TEST_SOUND builds Sound class as a console unit test
- *
  * \author Mongoose
  * \author xythobuz
  */

src/Sound.cpp

@@ -2,8 +2,6 @@
  * \file Sound.cpp
  * \brief This is the audio manager Implementation
  *
- * Defining UNIT_TEST_SOUND builds Sound class as a console unit test
- *
  * \author Mongoose
  * \author xythobuz
  */
@@ -290,68 +288,3 @@ void Sound::stop(int source)
 #endif
 }
 
-
-///////////////////////////////////////////////////////
-
-
-#ifdef UNIT_TEST_SOUND
-/*!
- * \brief Sound Unit Test
- * \param argc Number of arguments. Has to be > 1
- * \param argv Argument array. argv[1] will be played as wav file
- * \returns always zero
- */
-int main(int argc, char* argv[])
-{
-	Sound snd;
-	FILE *f;
-	unsigned int l;
-	unsigned char *buf;
-   int id, ret;
-
-
-	if (argc > 1)
-	{
-		snd.init();
-		printf("Loading %s\n", argv[1]);
-		ret = snd.addFile(argv[1], &id, snd.SoundFlagsNone);
-		printf("Load returned %i\n", ret);
-		printf("Playing %u::%s\n", id, argv[1]);
-		snd.play(id);
-
-		printf("Waiting...\n");
-		sleep(1);
-
-		f = fopen(argv[1], "rb");
-
-		if (f)
-		{
-			fseek(f, 0, SEEK_END);
-			l = ftell(f);
-			fseek(f, 0, SEEK_SET);
-
-			buf = new unsigned char[l];
-			fread(buf, l, 1, f);
-
-			fclose(f);
-
-			printf("Loading buffer of %s\n", argv[1]);
-			ret = snd.addWave(buf, l, &id, snd.SoundFlagsNone);
-			printf("Load returned %i\n", ret);
-			printf("Playing buffer of %u::%s\n", id, argv[1]);
-			snd.play(id);
-
-			delete [] buf;
-			printf("Waiting...\n");
-			sleep(1);
-		}
-	}
-	else
-	{
-		printf("%s filename.wav\n", argv[0]);
-	}
-
-	return 0;
-}
-#endif
-

test/Sound.cpp

@@ -0,0 +1,71 @@
+/*!
+ * \file Sound.cpp
+ * \brief This is the audio manager Unit Test
+ *
+ * \author Mongoose
+ * \author xythobuz
+ */
+#include <stdio.h>
+#include <unistd.h>
+
+#include <Sound.h>
+
+/*!
+ * \brief Sound Unit Test
+ * \param argc Number of arguments. Has to be > 1
+ * \param argv Argument array. argv[1] will be played as wav file
+ * \returns always zero
+ */
+int main(int argc, char* argv[])
+{
+	Sound snd;
+	FILE *f;
+	unsigned int l;
+	unsigned char *buf;
+   int id, ret;
+
+
+	if (argc > 1)
+	{
+		snd.init();
+		printf("Loading %s\n", argv[1]);
+		ret = snd.addFile(argv[1], &id, snd.SoundFlagsNone);
+		printf("Load returned %i\n", ret);
+		printf("Playing %u::%s\n", id, argv[1]);
+		snd.play(id);
+
+		printf("Waiting...\n");
+		sleep(1);
+
+		f = fopen(argv[1], "rb");
+
+		if (f)
+		{
+			fseek(f, 0, SEEK_END);
+			l = ftell(f);
+			fseek(f, 0, SEEK_SET);
+
+			buf = new unsigned char[l];
+			fread(buf, l, 1, f);
+
+			fclose(f);
+
+			printf("Loading buffer of %s\n", argv[1]);
+			ret = snd.addWave(buf, l, &id, snd.SoundFlagsNone);
+			printf("Load returned %i\n", ret);
+			printf("Playing buffer of %u::%s\n", id, argv[1]);
+			snd.play(id);
+
+			delete [] buf;
+			printf("Waiting...\n");
+			sleep(1);
+		}
+	}
+	else
+	{
+		printf("%s filename.wav\n", argv[0]);
+	}
+
+	return 0;
+}
+