From afac14a4bbd22ccdf048a9c9345d9ffe0b465765 Mon Sep 17 00:00:00 2001
From: Vlad Nitu <V.P.Nitu@student.tudelft.nl>
Date: Sun, 10 Jul 2022 02:23:57 +0300
Subject: [PATCH 1/3] Added mockito dependency into pom.xml file

Took 11 minutes
---
 pom.xml                     | 7 +++++++
 src/test/java/TileTest.java | 2 ++
 2 files changed, 9 insertions(+)
 create mode 100644 src/test/java/TileTest.java

diff --git a/pom.xml b/pom.xml
index de19852d..7035f612 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,13 @@
 			<artifactId>AppleJavaExtensions</artifactId>
 			<version>1.4</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>4.6.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/test/java/TileTest.java b/src/test/java/TileTest.java
new file mode 100644
index 00000000..9a7142ea
--- /dev/null
+++ b/src/test/java/TileTest.java
@@ -0,0 +1,2 @@
+package PACKAGE_NAME;public class TileTest {
+}

From 0949dbf0cd9f78f133267bddea227778a4eaac24 Mon Sep 17 00:00:00 2001
From: Vlad Nitu <V.P.Nitu@student.tudelft.nl>
Date: Sun, 10 Jul 2022 02:24:14 +0300
Subject: [PATCH 2/3] Unit tested Tile.java class

---
 src/test/java/TileTest.java | 49 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/test/java/TileTest.java b/src/test/java/TileTest.java
index 9a7142ea..97552d22 100644
--- a/src/test/java/TileTest.java
+++ b/src/test/java/TileTest.java
@@ -1,2 +1,49 @@
-package PACKAGE_NAME;public class TileTest {
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import processing.core.PImage;
+import processing.core.PVector;
+import project_16x16.Tileset;
+import project_16x16.components.Tile;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+
+public class TileTest {
+
+    private Tile tile;
+    private PImage image;
+
+
+    @BeforeEach
+    void setup()  {
+        image = mock(PImage.class);
+        tile = new Tile(1, "tile", image, Tile.TileType.BACKGROUND);
+    }
+
+    @Test
+    void constructorTest() {
+            assertNotNull(tile);
+    }
+    @Test
+    void getIDTest() {
+        assertEquals(tile.getID(), 1);
+    }
+    @Test
+    void getNameTest() {
+        assertEquals(tile.getName(), "tile");
+    }
+    @Test
+    void getPImageTest() {
+        assertEquals(tile.getPImage(), image);
+    }
+    @Test
+    void getTileTypeTest() {
+        assertEquals(tile.getTileType(), Tile.TileType.BACKGROUND);
+    }
+    @Test
+    void getPositionTest() {
+        PVector vector = new PVector(Tileset.TILESETWIDTH, 0); // as ID = 1
+        assertEquals(tile.getPosition(), vector);
+    }
 }

From 07de5e813de7661be0cdcfa7ec5938c71513e060 Mon Sep 17 00:00:00 2001
From: Vlad Nitu <V.P.Nitu@student.tudelft.nl>
Date: Tue, 12 Jul 2022 20:35:23 +0200
Subject: [PATCH 3/3] Solved conflict keeping your changes

Took 2 minutes
---
 src/test/java/TileTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/TileTest.java b/src/test/java/TileTest.java
index 97552d22..0f5ab19f 100644
--- a/src/test/java/TileTest.java
+++ b/src/test/java/TileTest.java
@@ -27,7 +27,7 @@ void constructorTest() {
     }
     @Test
     void getIDTest() {
-        assertEquals(tile.getID(), 1);
+        assertEquals(tile.getId(), 1);
     }
     @Test
     void getNameTest() {