();
- private Printing print = new Printing();
public GameServer(Game game) {
this.setGame(game);
@@ -42,42 +43,36 @@ public void run() {
socket.receive(packet);
} catch (IOException e) {
e.printStackTrace();
+ break;
}
- this.parsePacket(packet.getData(), packet.getAddress(),
- packet.getPort());
+ this.parsePacket(packet.getData(), packet.getAddress(), packet.getPort());
- // String message = new String(packet.getData());
- // System.out.println("CLIENT ["+packet.getAddress().getHostAddress()+":"+packet.getPort()+"] "+message);
- // if(message.trim().equalsIgnoreCase("ping")){
- // sendData("pong".getBytes(), packet.getAddress(),
- // packet.getPort());
- // }
+ String message = new String(packet.getData());
+ System.out.println("CLIENT [" + packet.getAddress().getHostAddress() + ":" + packet.getPort() + "] " + message);
+ if (message.trim().equalsIgnoreCase("ping")) {
+ sendData("pong".getBytes(), packet.getAddress(), packet.getPort());
+ }
}
}
private void parsePacket(byte[] data, InetAddress address, int port) {
String message = new String(data).trim();
PacketTypes type = Packet.lookupPacket(message.substring(0, 2));
- Packet packet = null;
+ Packet packet;
switch (type) {
default:
case INVALID:
break;
case LOGIN:
packet = new Packet00Login(data);
- print.print("[" + address.getHostAddress() + ":" + port
- + "] " + ((Packet00Login) packet).getUsername()
- + " has connected...", PrintTypes.SERVER);
- PlayerMP player = new PlayerMP(Game.getLevel(), 10, 10,
- ((Packet00Login) packet).getUsername(), address, port, Game.getShirtCol(), Game.getFaceCol());
+ print.print("[" + address.getHostAddress() + ":" + port + "] " + ((Packet00Login) packet).getUsername() + " has connected...", PrintTypes.SERVER);
+ PlayerMP player = new PlayerMP(Game.getLevel(), 10, 10, ((Packet00Login) packet).getUsername(), address, port, Game.getShirtCol(), Game.getFaceCol());
this.addConnection(player, (Packet00Login) packet);
break;
case DISCONNECT:
packet = new Packet01Disconnect(data);
- print.print("[" + address.getHostAddress() + ":" + port
- + "] " + ((Packet01Disconnect) packet).getUsername()
- + " has disconnected...", PrintTypes.SERVER);
+ print.print("[" + address.getHostAddress() + ":" + port + "] " + ((Packet01Disconnect) packet).getUsername() + " has disconnected...", PrintTypes.SERVER);
this.removeConnection((Packet01Disconnect) packet);
break;
case MOVE:
@@ -103,8 +98,8 @@ public void addConnection(PlayerMP player, Packet00Login packet) {
boolean alreadyConnected = false;
for (PlayerMP p : this.connectedPlayers) {
if (player.getUsername().equalsIgnoreCase(p.getUsername())) {
- if (p.ipAddess == null) {
- p.ipAddess = player.ipAddess;
+ if (p.ipAddress == null) {
+ p.ipAddress = player.ipAddress;
}
if (p.port == -1) {
@@ -113,10 +108,10 @@ public void addConnection(PlayerMP player, Packet00Login packet) {
alreadyConnected = true;
} else {
- sendData(packet.getData(), p.ipAddess, p.port);
+ sendData(packet.getData(), p.ipAddress, p.port);
packet = new Packet00Login(p.getUsername(), (int) p.getX(), (int) p.getY());
- sendData(packet.getData(), player.ipAddess, player.port);
+ sendData(packet.getData(), player.ipAddress, player.port);
}
}
if (!alreadyConnected) {
@@ -151,8 +146,7 @@ public int getPlayerMPIndex(String username) {
}
public void sendData(byte[] data, InetAddress ipAddress, int port) {
- DatagramPacket packet = new DatagramPacket(data, data.length,
- ipAddress, port);
+ DatagramPacket packet = new DatagramPacket(data, data.length, ipAddress, port);
try {
this.socket.send(packet);
} catch (IOException e) {
@@ -162,7 +156,7 @@ public void sendData(byte[] data, InetAddress ipAddress, int port) {
public void sendDataToAllClients(byte[] data) {
for (PlayerMP p : connectedPlayers) {
- sendData(data, p.ipAddess, p.port);
+ sendData(data, p.ipAddress, p.port);
}
}
diff --git a/src/com/redomar/game/net/packets/Packet.java b/src/com/redomar/game/net/packets/Packet.java
index 743784f..938c085 100644
--- a/src/com/redomar/game/net/packets/Packet.java
+++ b/src/com/redomar/game/net/packets/Packet.java
@@ -3,39 +3,15 @@
import com.redomar.game.net.GameClient;
import com.redomar.game.net.GameServer;
+@Deprecated
public abstract class Packet {
- public static enum PacketTypes {
- INVALID(-1), LOGIN(00), DISCONNECT(01), MOVE(02);
-
- private int packetId;
-
- private PacketTypes(int packetId) {
- this.packetId = packetId;
- }
-
- public int getId() {
- return packetId;
- }
- }
-
public byte packetId;
public Packet(int packetId) {
this.packetId = (byte) packetId;
}
- public abstract byte[] getData();
-
- public abstract void writeData(GameClient client);
-
- public abstract void writeData(GameServer server);
-
- public String readData(byte[] data) {
- String message = new String(data).trim();
- return message.substring(2);
- }
-
public static PacketTypes lookupPacket(String packetId) {
try {
return lookupPacket(Integer.parseInt(packetId));
@@ -52,4 +28,29 @@ public static PacketTypes lookupPacket(int id) {
}
return PacketTypes.INVALID;
}
+
+ public abstract byte[] getData();
+
+ public abstract void writeData(GameClient client);
+
+ public abstract void writeData(GameServer server);
+
+ public String readData(byte[] data) {
+ String message = new String(data).trim();
+ return message.substring(2);
+ }
+
+ public enum PacketTypes {
+ INVALID(-1), LOGIN(0x00), DISCONNECT(0x01), MOVE(0x02);
+
+ private final int packetId;
+
+ PacketTypes(int packetId) {
+ this.packetId = packetId;
+ }
+
+ public int getId() {
+ return packetId;
+ }
+ }
}
diff --git a/src/com/redomar/game/net/packets/Packet00Login.java b/src/com/redomar/game/net/packets/Packet00Login.java
index 4e61dc4..6382b83 100644
--- a/src/com/redomar/game/net/packets/Packet00Login.java
+++ b/src/com/redomar/game/net/packets/Packet00Login.java
@@ -3,13 +3,15 @@
import com.redomar.game.net.GameClient;
import com.redomar.game.net.GameServer;
+@Deprecated
public class Packet00Login extends Packet {
- private String username;
- private int x, y;
+ private final String username;
+ private final int x;
+ private final int y;
public Packet00Login(byte[] data) {
- super(00);
+ super(0x00);
String[] dataArray = readData(data).split(",");
this.username = dataArray[0];
this.x = Integer.parseInt(dataArray[1]);
@@ -17,7 +19,7 @@ public Packet00Login(byte[] data) {
}
public Packet00Login(String username, int x, int y) {
- super(00);
+ super(0x00);
this.username = username;
this.x = x;
this.y = y;
diff --git a/src/com/redomar/game/net/packets/Packet01Disconnect.java b/src/com/redomar/game/net/packets/Packet01Disconnect.java
index d95eec5..4ac5e20 100644
--- a/src/com/redomar/game/net/packets/Packet01Disconnect.java
+++ b/src/com/redomar/game/net/packets/Packet01Disconnect.java
@@ -3,17 +3,18 @@
import com.redomar.game.net.GameClient;
import com.redomar.game.net.GameServer;
+@Deprecated
public class Packet01Disconnect extends Packet {
- private String username;
+ private final String username;
public Packet01Disconnect(byte[] data) {
- super(01);
+ super(0x01);
this.username = readData(data);
}
public Packet01Disconnect(String username) {
- super(01);
+ super(0x01);
this.username = username;
}
diff --git a/src/com/redomar/game/net/packets/Packet02Move.java b/src/com/redomar/game/net/packets/Packet02Move.java
index 8f1e47d..1336ee0 100644
--- a/src/com/redomar/game/net/packets/Packet02Move.java
+++ b/src/com/redomar/game/net/packets/Packet02Move.java
@@ -3,16 +3,18 @@
import com.redomar.game.net.GameClient;
import com.redomar.game.net.GameServer;
+@Deprecated
public class Packet02Move extends Packet {
- private String username;
- private int x, y;
- private int numSteps = 0;
- private boolean isMoving;
- private int movingDir = 1;
+ private final String username;
+ private final int x;
+ private final int y;
+ private final int numSteps;
+ private final boolean isMoving;
+ private final int movingDir;
public Packet02Move(byte[] data) {
- super(02);
+ super(0x02);
String[] dataArray = readData(data).split(",");
this.username = dataArray[0];
this.x = Integer.parseInt(dataArray[1]);
@@ -22,9 +24,8 @@ public Packet02Move(byte[] data) {
this.movingDir = Integer.parseInt(dataArray[5]);
}
- public Packet02Move(String username, int x, int y, int numSteps,
- boolean isMoving, int movingDir) {
- super(02);
+ public Packet02Move(String username, int x, int y, int numSteps, boolean isMoving, int movingDir) {
+ super(0x02);
this.username = username;
this.x = x;
this.y = y;
@@ -35,9 +36,7 @@ public Packet02Move(String username, int x, int y, int numSteps,
@Override
public byte[] getData() {
- return ("02" + this.username + "," + this.x + "," + this.y + ","
- + this.getNumSteps() + "," + (this.isMoving ? 1 : 0) + "," + this
- .getMovingDir()).getBytes();
+ return ("02" + this.username + "," + this.x + "," + this.y + "," + this.getNumSteps() + "," + (this.isMoving ? 1 : 0) + "," + this.getMovingDir()).getBytes();
}
@Override
diff --git a/src/com/redomar/game/objects/Inventory.java b/src/com/redomar/game/objects/Inventory.java
index ad181a5..96a24e1 100644
--- a/src/com/redomar/game/objects/Inventory.java
+++ b/src/com/redomar/game/objects/Inventory.java
@@ -10,7 +10,7 @@ public class Inventory {
public static boolean closing;
public static boolean reset;
public static boolean enabled;
- private static InventoryWindow inv_window = new InventoryWindow();
+ private static final InventoryWindow inv_window = new InventoryWindow();
public static void activate() {
x = (int) Game.getPlayer().getX();
@@ -20,17 +20,14 @@ public static void activate() {
if (enabled) {
if (!open) {
if (!closing) {
- System.out.println("Opened\nInside this Bag their is:"
- + inside());
+ System.out.println("Opened\nInside this Bag their is:" + inside());
open = true;
Game.getPlayer().setMoving(false);
- Game.getInput().untoggle(true);
inv_window.start();
}
} else {
if (closing) {
Game.getPlayer().setMoving(true);
- Game.getInput().untoggle(false);
inv_window.stop();
inv_window.getFrame().setVisible(false);
inv_window.getFrame().stopFrame();
@@ -42,7 +39,7 @@ public static void activate() {
}
}
} else {
- if (open == true || reset == true || closing == true) {
+ if (open || reset || closing) {
reset = false;
open = false;
closing = false;
@@ -53,7 +50,7 @@ public static void activate() {
private static String inside() {
String items = " ";
for (Items item : Items.values()) {
- items = items + item.toString() + ", ";
+ items = String.format("%s%s, ", items, item.toString());
}
return items;
}
diff --git a/src/com/redomar/game/objects/InventoryHandler.java b/src/com/redomar/game/objects/InventoryHandler.java
index 93b6128..e7b1cdd 100644
--- a/src/com/redomar/game/objects/InventoryHandler.java
+++ b/src/com/redomar/game/objects/InventoryHandler.java
@@ -7,11 +7,7 @@
public class InventoryHandler implements WindowListener {
- @SuppressWarnings("unused")
- private DedicatedJFrame frame;
-
public InventoryHandler(DedicatedJFrame frame) {
- this.frame = frame;
DedicatedJFrame.getFrameStatic().addWindowListener(this);
}
diff --git a/src/com/redomar/game/objects/InventoryWindow.java b/src/com/redomar/game/objects/InventoryWindow.java
index 30afd00..94d7d45 100644
--- a/src/com/redomar/game/objects/InventoryWindow.java
+++ b/src/com/redomar/game/objects/InventoryWindow.java
@@ -5,7 +5,7 @@
import java.awt.*;
import java.awt.image.BufferStrategy;
-public class InventoryWindow implements Runnable{
+public class InventoryWindow implements Runnable {
private static final int WIDTH = 160;
private static final int HEIGHT = (WIDTH / 3 * 2);
@@ -25,13 +25,13 @@ public static void setWindow(InventoryHandler inventoryHandler) {
InventoryWindow.window = inventoryHandler;
}
- public synchronized void start(){
+ public synchronized void start() {
running = true;
setFrame(new DedicatedJFrame(WIDTH, HEIGHT, SCALE, NAME));
new Thread(this, NAME).start();
}
- public synchronized void stop(){
+ public synchronized void stop() {
running = false;
}
@@ -72,8 +72,7 @@ public void run() {
if (System.currentTimeMillis() - lastTimer >= 1000) {
lastTimer += 1000;
- frame.getFrame().setTitle(
- "Frames: " + frames + " Ticks: " + ticks);
+ frame.getFrame().setTitle("Frames: " + frames + " Ticks: " + ticks);
frames = 0;
ticks = 0;
}
@@ -82,14 +81,14 @@ public void run() {
private void render() {
BufferStrategy bs = frame.getBufferStrategy();
- if(bs == null){
+ if (bs == null) {
frame.createBufferStrategy(3);
return;
}
Graphics g = bs.getDrawGraphics();
g.setColor(Color.BLACK);
- g.fillRect(0, 0, WIDTH*SCALE+10, HEIGHT*SCALE+10);
+ g.fillRect(0, 0, WIDTH * SCALE + 10, HEIGHT * SCALE + 10);
g.setColor(Color.WHITE);
g.drawString(NAME, 50, 50);
bs.show();
diff --git a/src/com/redomar/game/objects/Items.java b/src/com/redomar/game/objects/Items.java
index 2bb4ffc..55f705a 100644
--- a/src/com/redomar/game/objects/Items.java
+++ b/src/com/redomar/game/objects/Items.java
@@ -1,8 +1,5 @@
package com.redomar.game.objects;
public enum Items {
- Stick,
- Torch,
- Sword,
- Apple
+ Stick, Torch, Sword, Apple
}
diff --git a/src/com/redomar/game/scenes/Scene.java b/src/com/redomar/game/scenes/Scene.java
index 0ca0f6d..2b869c6 100644
--- a/src/com/redomar/game/scenes/Scene.java
+++ b/src/com/redomar/game/scenes/Scene.java
@@ -6,17 +6,17 @@
public class Scene {
private int xOffset, yOffset;
- private Screen screen;
- private LevelHandler level;
+ private final Screen screen;
+ private final LevelHandler level;
- public Scene(int xOffset, int yOffset, Screen screen, LevelHandler level){
+ public Scene(int xOffset, int yOffset, Screen screen, LevelHandler level) {
this.xOffset = xOffset;
this.yOffset = yOffset;
this.screen = screen;
this.level = level;
}
- public void playerScene(){
+ public void playerScene() {
if (xOffset < 0) {
xOffset = 0;
}
diff --git a/src/com/redomar/game/script/PopUp.java b/src/com/redomar/game/script/PopUp.java
deleted file mode 100644
index 466e621..0000000
--- a/src/com/redomar/game/script/PopUp.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.redomar.game.script;
-
-import com.redomar.game.Game;
-
-import javax.swing.*;
-
-public class PopUp{
-
- private JFrame frame;
-
- public PopUp(){
- frame = Game.getFrame();
- }
-
- public int Warn(String msg){
- Object[] options = {"Continue"};
- return JOptionPane.showOptionDialog(frame, msg, "Notice", JOptionPane.YES_OPTION, JOptionPane.QUESTION_MESSAGE,
- null, options, options[0]);
- }
-}
diff --git a/src/com/redomar/game/script/PrintTypes.java b/src/com/redomar/game/script/PrintTypes.java
deleted file mode 100644
index 0a366a5..0000000
--- a/src/com/redomar/game/script/PrintTypes.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.redomar.game.script;
-
-public enum PrintTypes {
- GAME,
- LEVEL,
- MUSIC,
- ERROR,
- TEST,
- NETWORK,
- SERVER
-}
diff --git a/src/com/redomar/game/script/Printing.java b/src/com/redomar/game/script/Printing.java
deleted file mode 100644
index aba3de7..0000000
--- a/src/com/redomar/game/script/Printing.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.redomar.game.script;
-
-import com.redomar.game.lib.Time;
-
-import java.io.File;
-import java.util.Arrays;
-
-public class Printing {
-
- private static int lineNumber = 0;
- private PrintTypes type;
- private Time time = new Time();
- private String message;
- private String msgTime;
- private String msgType;
- private boolean errorMode = false;
- private PrintToLog logFile;
-
- public Printing() {
-
- }
-
- public void print(String message, PrintTypes type) {
- this.type = type;
- setMessage(message);
- readMessageType(type);
- printOut();
- }
-
- private void printOut(){
- msgTime = "[" + time.getTime() + "]";
- msgType = "[" + type.toString() + "]";
-
- logFile = printToLogType(type);
- if (lineNumber == 0) {
-
- String dashes = "";
- String title = ("[" + time.getTimeDate() + "]");
- char dash = '-';
- int number = title.length() / 3;
-
- char[] repeat = new char[number];
- Arrays.fill(repeat, dash);
- dashes += new String(repeat);
-
- logFile.log(dashes + title + dashes + "\n" + msgTime + msgType + this.getMessage());
- lineNumber++;
- } else {
- logFile.log(msgTime + msgType + this.getMessage());
- }
-
-
- if(errorMode) {
- System.err.println(msgType + msgTime + message);
- }else{
- System.out.println(msgType + msgTime + message);
- }
- }
-
- 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;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- private void readMessageType(PrintTypes type){
- this.errorMode = type == PrintTypes.ERROR;
- }
-}
diff --git a/test/com/redomar/game/audio/AudioEffectTest.java b/test/com/redomar/game/audio/AudioEffectTest.java
deleted file mode 100644
index 0c621ff..0000000
--- a/test/com/redomar/game/audio/AudioEffectTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-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 sfxFileExists() throws Exception {
- File sfx = new File("res/sfx/smallProjectile.wav");
- assertTrue(sfx.exists());
- }
-
-}
\ No newline at end of file
diff --git a/test/com/redomar/game/audio/AudioHandlerTest.java b/test/com/redomar/game/audio/AudioHandlerTest.java
index a942818..c17faa7 100644
--- a/test/com/redomar/game/audio/AudioHandlerTest.java
+++ b/test/com/redomar/game/audio/AudioHandlerTest.java
@@ -5,7 +5,7 @@
import java.io.File;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
/**
* Created by Mohamed on 28/08/2016.
@@ -13,10 +13,31 @@
*/
public class AudioHandlerTest {
+ @Before
+ public void before() {
+ AudioHandler.musicPrinter.mute();
+ }
+
@Test
- public void bgMusicExists() throws Exception {
+ public void bgMusicExists() {
File sfx = new File("res/music/Towards The End.mp3");
assertTrue(sfx.exists());
}
+ @Test(expected = NullPointerException.class)
+ public void expectReturnExceptionFileEmptyDir() {
+ File empty = new File("");
+ new AudioHandler(empty);
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void expectReturnExceptionFileEmptyPath() {
+ new AudioHandler("");
+ }
+
+ @Test()
+ public void tryInitiatingAndPlayingNonExistingFile() {
+ new AudioHandler("//").play();
+ }
+
}
\ No newline at end of file
diff --git a/test/com/redomar/game/lib/HashTest.java b/test/com/redomar/game/lib/HashTest.java
new file mode 100644
index 0000000..bb5055d
--- /dev/null
+++ b/test/com/redomar/game/lib/HashTest.java
@@ -0,0 +1,64 @@
+package com.redomar.game.lib;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class HashTest {
+
+ private HashGen hashGen;
+
+ @Before
+ public void setUp() throws Exception{
+ hashGen = new HashGen(false,10);
+ }
+
+ @Test
+ public void hashNotEmpty(){
+ assertNotNull(hashGen.getHash());
+ }
+
+ @Test
+ public void hashZeroLengthNotNull(){
+ HashGen hg = new HashGen(false,0);
+ assertNotNull(hg.getHash());
+ }
+
+ @Test
+ public void compareHashAndPrevious(){
+ hashGen.setHexLength(8);
+ assertEquals(hashGen.getHash(), hashGen.getPreviousHash());
+ }
+
+ @Test
+ public void previousShouldNotGenNewHash(){
+ assertEquals(hashGen.getPreviousHash(), hashGen.getPreviousHash());
+ }
+
+ @Test
+ public void hashLengthEqualsZero(){
+ HashGen hg = new HashGen(false, 0);
+ assertEquals(0,hg.getHash().length());
+ }
+
+ @Test
+ public void hashLengthEqualsGivenLength(){
+ HashGen hg = new HashGen(false, 80);
+ assertEquals(80, hg.getHash().length());
+ }
+
+ @Test
+ public void hashLengthEqualsSetLength(){
+ HashGen hg = new HashGen(false, 80);
+ hg.setHexLength(5);
+ assertEquals(5,hg.getHash().length());
+ }
+
+ @Test
+ public void hashPrefix(){
+ HashGen hg = new HashGen(true,0);
+ assertEquals("0x", hg.getHash());
+ }
+
+}
diff --git a/test/com/redomar/game/log/PopUpTest.java b/test/com/redomar/game/log/PopUpTest.java
new file mode 100644
index 0000000..3ccb68d
--- /dev/null
+++ b/test/com/redomar/game/log/PopUpTest.java
@@ -0,0 +1,23 @@
+package com.redomar.game.log;
+
+import com.redomar.game.menu.PopUp;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class PopUpTest {
+ private PopUp popUp;
+
+ @Before
+ public void setUp() {
+ popUp = new PopUp();
+ popUp.active = false;
+ }
+
+ @Test
+ public void warnIntEfflux() {
+ assertEquals(1, popUp.Warn("TEST"));
+ }
+
+}
diff --git a/test/com/redomar/game/script/PrintToLogTest.java b/test/com/redomar/game/log/PrintToLogTest.java
similarity index 86%
rename from test/com/redomar/game/script/PrintToLogTest.java
rename to test/com/redomar/game/log/PrintToLogTest.java
index ecc651e..f38dda5 100644
--- a/test/com/redomar/game/script/PrintToLogTest.java
+++ b/test/com/redomar/game/log/PrintToLogTest.java
@@ -1,13 +1,12 @@
-package com.redomar.game.script;
+package com.redomar.game.log;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* Created by Mohamed on 23/08/2016.
- *
+ *
* This file tests the com.redomar.game.script.PrintToLog class
*/
public class PrintToLogTest {
diff --git a/test/com/redomar/game/log/PrinterTest.java b/test/com/redomar/game/log/PrinterTest.java
new file mode 100644
index 0000000..187f524
--- /dev/null
+++ b/test/com/redomar/game/log/PrinterTest.java
@@ -0,0 +1,48 @@
+package com.redomar.game.log;
+
+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 PrinterTest {
+
+ private Printer printer;
+
+ @Before
+ public void setUp() {
+ printer = new Printer();
+ }
+
+ @Test
+ public void printToFileWorks() {
+ printer.print("TESTING STRING", PrintTypes.TEST);
+ File file = new File(".PrintType-TEST.txt");
+ assertTrue(file.exists());
+ assertTrue(file.delete());
+ }
+
+ @Test
+ public void getMessageIsNull() {
+ assertNull(printer.getMessage());
+ }
+
+ @Test
+ public void messageShouldBeNullAfterPrinting() {
+ printer.print("Not Null", PrintTypes.TEST);
+ assertNotNull(printer.getMessage());
+ }
+
+ @After
+ public void cleanUp() {
+ printer = null;
+ }
+
+}
\ No newline at end of file
diff --git a/test/com/redomar/game/script/PrintingTest.java b/test/com/redomar/game/script/PrintingTest.java
deleted file mode 100644
index ab38469..0000000
--- a/test/com/redomar/game/script/PrintingTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-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;
- }
-
-}
\ No newline at end of file