Error and Test Handling for Audio Class

Author: redomar

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

@@ -14,10 +14,19 @@ public AudioHandler(String path){
 	}
 
 	public AudioHandler(File file){
-		initiate(file.toString());
+		try {
+			if(file.toString() != ""){
+				initiate(file.toString());
+			} else {
+				throw new NullPointerException();
+			}
+		} catch (NullPointerException e){
+			System.err.println("Destination Cannot be empty");
+			throw e;
+		}
 	}
 
-	public void initiate(String path){
+	private void initiate(String path){
 		try{
 			AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(getClass().getResourceAsStream(path));
 			AudioFormat baseformat = audioInputStream.getFormat();

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

@@ -10,9 +10,8 @@
 public class Small extends Projectile{
 
 	public static final int FIRE_RATE = 10;
-
-	public AudioHandler smallSound;
-	public File file;
+	private static final File smallShot = new File("/music/small.mp3");
+	private static AudioHandler smallSound;
 
 	public Small(LevelHandler level, int x, int y, double dir) {
 		super(level, x, y, dir);
@@ -23,9 +22,7 @@ public Small(LevelHandler level, int x, int y, double dir) {
 		nx = speed * Math.cos(angle);
 		ny = speed * Math.sin(angle);
 
-		file = new File("/music/small.mp3");
-
-		smallSound = new AudioHandler(file);
+		smallSound = new AudioHandler(smallShot);
 		smallSound.setVolume(-15);
 		smallSound.play();
 	}

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

@@ -47,13 +47,11 @@ public static void play() {
 			splash.toFront();
 			splash.requestFocus();
 			splash.splashOn();
-			splash.setProgress(10, "Initializing SFX");
-
-			splash.setProgress(30, "Loading Music");
+			splash.setProgress(20, "Loading Music");
 			Game.setBackgroundMusic(new AudioHandler("/music/Towards The End.mp3"));
-			splash.setProgress(40, "Setting Volume");
+			splash.setProgress(50, "Setting Volume");
 			Game.getBackgroundMusic().setVolume(-20);
-			splash.setProgress(50, "Acquiring data: Multiplayer");
+			splash.setProgress(60, "Acquiring data: Multiplayer");
 			Thread.sleep(125);
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 			String multiMsg = "Sorry but multiplayer has been disabled on this version.\nIf you would like multiplayer checkout Alpha 1.6";

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

@@ -19,4 +19,10 @@ public void bgMusicExists() throws Exception {
 		assertTrue(sfx.exists());
 	}
 
+	@Test(expected = NullPointerException.class)
+	public void expectReturnExceptionFileEmptyDir(){
+		File empty = new File("");
+		AudioHandler audio = new AudioHandler(empty);
+	}
+
 }