Merge branch 'unitTesting' into develop

Author: redomar

.travis.yml

@@ -3,5 +3,4 @@ language: java
 # blocklist
 branches:
   except:
-  - develop
-  - unitTesting
+  - develop

README.md

@@ -1,6 +1,5 @@
-JavaGame Alpha v1.8.2 [![Travis-CI Build Status](https://travis-ci.org/redomar/JavaGame.svg?branch=master)](https://travis-ci.org/redomar/JavaGame)
-=====================
-Acknowledgement: Inspired from [vanZeben](https://github.com/vanZeben)
+JavaGame [![GitHub release](https://img.shields.io/github/release/redomar/JavaGame.svg?style=flat-square&label=Alpha)](https://github.com/redomar/JavaGame/releases/latest) [![Travis-CI Build Status](https://img.shields.io/travis/redomar/JavaGame.svg?style=flat-square)](https://travis-ci.org/redomar/JavaGame) [![GitHub license](https://img.shields.io/badge/license-AGPLv3-red.svg?style=flat-square)](https://raw.githubusercontent.com/Redomar/JavaGame/master/LICENSE)
+==
 
 #####What is JavaGame?
 JavaGame is a game project that have been working on since May 2013. I have added many features to the game over the last year and I plan on adding even more features. This game is purely for my own sake to practice my skills in Java.
@@ -10,9 +9,9 @@ Well i'm still not sure what exactly i'm going to do with it, and I haven't thou
 
 #####Play the Game
 * For latest version get 
-   * [v1.8](https://github.com/redomar/JavaGame/releases/tag/v1.8)
+   * [![GitHub release](https://img.shields.io/github/release/redomar/JavaGame.svg?style=flat-square&label=Alpha)](https://github.com/redomar/JavaGame/releases/latest)
 * For multiplayer enabled get 
-   * [v1.5.4](https://github.com/redomar/JavaGame/releases/tag/v1.5.4)
+   * [![GitHub release](https://img.shields.io/badge/Alpha-v1.5.4-cc0000.svg)](https://github.com/redomar/JavaGame/releases/v1.5.4)
 
 #####Your version naming is all wrong
 Yes, I recently noticed that there is a standard called Semantic Versioning that I should follow. Currently my project isn't organised as well as I hoped so starting from the Beta I will follow Semantic Versioning schema.
@@ -36,3 +35,5 @@ Watch this video [here](http://youtu.be/_3nCgac3KKM) or checkout the [GitHub Pag
 * Commit your changes (```git commit -m "Change Title"```)
 * Push to the branch (```git push origin my_branch```)
 * Open a [Pull Request](https://github.com/redomar/JavaGame/pull/new/master)
+
+Inspired from [vanZeben](https://github.com/vanZeben).

build.gradle

@@ -4,8 +4,15 @@ repositories{
 
 apply plugin: 'java'
 
-sourceSets.main.java.srcDir 'src'
-sourceSets.main.resources.srcDirs 'res'
+sourceSets{
+    main{
+        java.srcDir 'src'
+        resources.srcDir 'res'
+    }
+    test{
+        java.srcDir 'test'
+    }
+}
 
 dependencies{
     compile 'org.apache.commons:commons-lang3:3.4'

src/com/redomar/game/InputHandler.java

@@ -124,6 +124,7 @@ private void toggleKey(int keyCode, boolean isPressed) {
 
 	private void quitGame() {
 		Game.setClosing(true);
+		print.removeLog();
 		try {
 			Thread.sleep(1000);
 		} catch (InterruptedException e) {

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

@@ -20,7 +20,7 @@ public Projectile(LevelHandler level, int x, int y, double dir) {
 		super(level);
 		xOrigin = x;
 		yOrigin = y;
-		angle = dir + (Math.random() * (dir + 0.2));
+		angle = dir;
 		this.x = x;
 		this.y = y;
 	}

src/com/redomar/game/script/PrintTypes.java

@@ -5,6 +5,7 @@ public enum PrintTypes {
 	LEVEL,
 	MUSIC,
 	ERROR,
+	TEST,
 	NETWORK,
-	SERVER;
+	SERVER
 }

src/com/redomar/game/script/Printing.java

@@ -2,6 +2,7 @@
 
 import com.redomar.game.lib.Time;
 
+import java.io.File;
 import java.util.Arrays;
 
 public class Printing {
@@ -30,7 +31,7 @@ private void printOut(){
 		msgTime = "[" + time.getTime() + "]";
 		msgType = "[" + type.toString() + "]";
 
-		logFile = new PrintToLog(".log.txt");
+		logFile = printToLogType(type);
 		if (lineNumber == 0) {
 
 			String dashes = "";
@@ -56,6 +57,18 @@ private void printOut(){
 		}
 	}
 
+	private PrintToLog printToLogType(PrintTypes type){
+		if (type == PrintTypes.TEST){
+			return new PrintToLog(".PrintType-TEST.txt");
+		} else {
+			return new PrintToLog(".log.txt");
+		}
+	}
+
+	public void removeLog(){
+		new File(".log.txt").delete()
+	}
+
 	public String getMessage() {
 		return message;
 	}

test/com/redomar/game/script/PrintToLogTest.java

@@ -2,6 +2,7 @@
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -11,7 +12,7 @@
  */
 public class PrintToLogTest {
 
-	PrintToLog print;
+	private PrintToLog print;
 
 	@Test(expected = NullPointerException.class)
 	public void PrintToLogNullFile() {
@@ -20,9 +21,9 @@ public void PrintToLogNullFile() {
 
 	@Test
 	public void PrintToLogDoesWork() {
-		print = new PrintToLog(".Test.txt");
+		print = new PrintToLog(".PrintToLogDoesWork.txt");
 		assertTrue(print.getUrl().exists());
-		print.getUrl().delete();
+		assertTrue(print.getUrl().delete());
 	}
 
 }

test/com/redomar/game/script/PrintingTest.java

@@ -0,0 +1,48 @@
+package com.redomar.game.script;
+
+import org.junit.After;
+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.script.Printing class
+ */
+public class PrintingTest {
+
+	private Printing printing;
+
+	@Before
+	public void setUp() throws Exception {
+		printing = new Printing();
+	}
+
+	@Test
+	public void printToFileWorks() throws Exception {
+		printing.print("TESTING STRING", PrintTypes.TEST);
+		File file = new File(".PrintType-TEST.txt");
+		assertTrue(file.exists());
+		assertTrue(file.delete());
+	}
+
+	@Test
+	public void getMessageIsNull() {
+		assertNull(printing.getMessage());
+	}
+
+	@Test
+	public void getMessageIsNotNull() {
+		printing.setMessage("Not Null");
+		assertNotNull(printing.getMessage());
+	}
+
+	@After
+	public void cleanUp(){
+		printing = null;
+	}
+
+}