diff --git a/src/main/java/es/uvigo/esei/daa/entities/Pet.java b/src/main/java/es/uvigo/esei/daa/entities/Pet.java
index 40cba5e188082d4fe00392111c4ddfd4468368e8..156c8a3ad3175b7c6f4f618ae79ad35bd4126198 100644
--- a/src/main/java/es/uvigo/esei/daa/entities/Pet.java
+++ b/src/main/java/es/uvigo/esei/daa/entities/Pet.java
@@ -18,7 +18,7 @@ public class Pet {
 	public Pet(int idPet, String name, int idMaster) {
 		super();
 		this.idPet = idPet;
-		this.name = name;
+		this.name = requireNonNull(name);
 		this.idMaster = idMaster;
 	}
 
@@ -34,7 +34,7 @@ public class Pet {
 		return name;
 	}
 	public void setName(String name) {
-		this.name = name;
+		this.name = requireNonNull(name);
 	}
 	public int getIdMaster() {
 		return idMaster;
diff --git a/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..22dccd28abfee58519c8037638701440b74d3030
--- /dev/null
+++ b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java
@@ -0,0 +1,113 @@
+package es.uvigo.esei.daa.entities;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+
+
+
+public class PetUnitTest {
+	
+	@Test
+	public void testConstructorWhithParams() {
+		final int idPet = 1;
+		final String name = "Tallulah";
+		final int idMaster = 2;
+		
+		
+		final Pet pet = new Pet(idPet,name,idMaster);
+		
+		assertThat(pet.getIdPet(), is(idPet));
+		assertThat(pet.getName(), is(name));
+		assertThat(pet.getIdMaster(), is(idMaster));
+	}
+	
+	
+	@Test(expected = NullPointerException.class)
+	public void testConstructorNullName() {
+		new Pet(1, null, 2);
+	}
+	
+
+	@Test
+	public void testSetName() {
+		final int idPet = 1;
+		final String name = "Tallulah";
+		final int idMaster = 2;
+		
+		
+		final Pet pet = new Pet(idPet,name,idMaster);
+		pet.setName("Jimminy");
+		
+		assertThat(pet.getIdPet(), is(idPet));
+		assertThat(pet.getName(), is("Jimminy"));
+		assertThat(pet.getIdMaster(), is(idMaster));
+	}
+
+	@Test(expected = NullPointerException.class)
+	public void testSetNullName() {
+		final int idPet = 1;
+		final String name = "Tallulah";
+		final int idMaster = 2;
+		
+		final Pet pet = new Pet(idPet,name,idMaster);
+		
+		pet.setName(null);
+	}
+
+	@Test
+	public void testSetIdPet() {
+		final int idPet = 1;
+		final String name = "Tallulah";
+		final int idMaster = 2;
+		
+		
+		final Pet pet = new Pet(idPet,name,idMaster);
+		pet.setIdPet(4);;
+		
+		assertThat(pet.getIdPet(), is(4));
+		assertThat(pet.getName(), is(name));
+		assertThat(pet.getIdMaster(), is(idMaster));
+	}
+	
+	@Test
+	public void testSetIdMaster() {
+		final int idPet = 1;
+		final String name = "Tallulah";
+		final int idMaster = 2;
+		
+		
+		final Pet pet = new Pet(idPet,name,idMaster);
+		pet.setIdMaster(7);;
+		
+		assertThat(pet.getIdPet(), is(idPet));
+		assertThat(pet.getName(), is(name));
+		assertThat(pet.getIdMaster(), is(7));
+	}
+	
+
+
+	@Test
+	public void testEqualsObject() {
+		final Pet petA = new Pet(1, "Name A", 3);
+		final Pet petB = new Pet(1, "Name B", 5);
+		
+		assertTrue(petA.equals(petB));
+	}
+
+	@Test
+	public void testEqualsHashcode() {
+		EqualsVerifier.forClass(Pet.class)
+			.withIgnoredFields("name", "idMaster")
+			.suppress(Warning.STRICT_INHERITANCE)
+			.suppress(Warning.NONFINAL_FIELDS)
+		.verify();
+	}
+
+}