Merge branch 'unitTesting' into develop

Author: redomar

src/com/redomar/game/audio/AudioEffect.java

@@ -7,10 +7,11 @@
  */
 public class AudioEffect{
 
-	Clip clip;
+	private Clip clip;
+	private boolean active = false;
 
 	public AudioEffect(String path){
-		try {
+		try{
 			AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(getClass().getResourceAsStream(path));
 			AudioFormat baseformat = audioInputStream.getFormat();
 			AudioInputStream decodedAudioInputStream = AudioSystem.getAudioInputStream(
@@ -27,6 +28,7 @@ public void play(){
 		stop();
 		clip.setFramePosition(0);
 		clip.start();
+		active = true;
 	}
 
 	public void setVolume(float velocity){
@@ -37,10 +39,16 @@ public void setVolume(float velocity){
 
 	public void stop() {
 		if (clip.isRunning()) clip.stop();
+		active = false;
 	}
 
 	public void close(){
 		stop();
 		clip.close();
 	}
-}
+
+	public boolean getActive(){
+		return this.active;
+	}
+
+}

src/com/redomar/game/entities/Player.java

@@ -29,8 +29,6 @@ public class Player extends Mob {
 	private int[] swimColour;
 	private int fireRate = 0;
 
-	private static AudioEffect shootSound;
-
 	public Player(LevelHandler level, int x, int y, InputHandler input,
 				  String userName, int shirtCol, int faceCol) {
 		super(level, "Player", x, y, speed, collisionBoders);
@@ -75,8 +73,6 @@ public void tick() {
 			if(fireRate <= 0){
 				if(Game.getMouse().getButton()== 1){
 					fireRate = Small.FIRE_RATE;
-					shootSound.setVolume(-15);
-					shootSound.play();
 				}else if(Game.getMouse().getButton() == 3){
 					fireRate = Medium.FIRE_RATE;
 				}
@@ -207,14 +203,6 @@ public void render(Screen screen) {
 		}
 	}
 
-	public static AudioEffect getShootSound() {
-		return shootSound;
-	}
-
-	public static void setShootSound(AudioEffect shootSound) {
-		Player.shootSound = shootSound;
-	}
-
 	public String getUsername() {
 		if (this.userName.isEmpty()) {
 			return guestPlayerName;

src/com/redomar/game/entities/projectiles/Small.java

@@ -1,12 +1,13 @@
 package com.redomar.game.entities.projectiles;
 
+import com.redomar.game.audio.AudioEffect;
 import com.redomar.game.gfx.Colours;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.level.LevelHandler;
 
 public class Small extends Projectile{
 
-	public static final int FIRE_RATE = 7;
+	public static final int FIRE_RATE = 10;
 
 	public Small(LevelHandler level, int x, int y, double dir) {
 		super(level, x, y, dir);
@@ -16,6 +17,12 @@ public Small(LevelHandler level, int x, int y, double dir) {
 
 		nx = speed * Math.cos(angle);
 		ny = speed * Math.sin(angle);
+
+		//smallSound.setVolume(-15);
+
+		AudioEffect smallSound;
+		smallSound = new AudioEffect("/sfx/smallProjectile.wav");
+		smallSound.play();
 	}
 
 	public void tick() {

src/com/redomar/game/menu/Menu.java

@@ -50,7 +50,7 @@ public static void play() {
 			splash.requestFocus();
 			splash.splashOn();
 			splash.setProgress(10, "Initializing SFX");
-			Player.setShootSound( new AudioEffect("/sfx/smallProjectile.wav"));
+
 			splash.setProgress(30, "Loading Music");
 			Game.setBackgroundMusic(new AudioHandler("/music/Towards The End.mp3"));
 			splash.setProgress(40, "Setting Volume");

test/com/redomar/game/audio/AudioEffectTest.java

@@ -0,0 +1,28 @@
+package com.redomar.game.audio;
+
+import org.junit.Test;
+
+import java.io.File;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Mohamed on 28/08/2016.
+ * This file tests the com.redomar.game.audio class
+ */
+public class AudioEffectTest {
+
+	@Test
+	public void playSoundEffectAndSetVolume() {
+		AudioHandler sound = new AudioHandler("/sfx/smallProjectile.wav");
+		sound.setVolume(-15);
+		sound.play();
+	}
+
+	@Test
+	public void sfxFileExists() throws Exception {
+		File sfx = new File("res/sfx/smallProjectile.wav");
+		assertTrue(sfx.exists());
+	}
+
+}

test/com/redomar/game/audio/AudioHandlerTest.java

@@ -0,0 +1,22 @@
+package com.redomar.game.audio;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by Mohamed on 28/08/2016.
+ * This file tests the com.redomar.game.audio.AudioHandler class
+ */
+public class AudioHandlerTest {
+
+	@Test
+	public void bgMusicExists() throws Exception {
+		File sfx = new File("res/music/Towards The End.mp3");
+		assertTrue(sfx.exists());
+	}
+
+}