Commit 97783c55 authored by Administrator's avatar Administrator

Fixes errors in tests

parent 921c7a8b
...@@ -12,15 +12,15 @@ import static java.util.Objects.requireNonNull; ...@@ -12,15 +12,15 @@ import static java.util.Objects.requireNonNull;
private int id; private int id;
private String name; private String name;
private String animalType; private String animalType;
private int owner_id; private int ownerId;
Pet(){} Pet(){}
public Pet(int id, String name, String animalType, int owner_id) { public Pet(int id, String name, String animalType, int ownerId) {
this.id = id; this.id = id;
this.setName(name); this.setName(name);
this.setAnimalType(animalType); this.setAnimalType(animalType);
this.owner_id = owner_id; this.ownerId = ownerId;
} }
public int getId() { public int getId() {
...@@ -44,7 +44,7 @@ import static java.util.Objects.requireNonNull; ...@@ -44,7 +44,7 @@ import static java.util.Objects.requireNonNull;
} }
public int getOwnerId() { public int getOwnerId() {
return owner_id; return ownerId;
} }
@Override @Override
......
...@@ -79,7 +79,7 @@ public class PetsDAOTest { ...@@ -79,7 +79,7 @@ public class PetsDAOTest {
} }
@Test @Test
@ExpectedDatabase("/datasets/dataset-delete.xml") @ExpectedDatabase("/datasets/dataset-delete-pets.xml")
public void testDelete() throws DAOException { public void testDelete() throws DAOException {
this.dao.delete(existentId()); this.dao.delete(existentId());
......
...@@ -95,7 +95,7 @@ public class PetUnitTest { ...@@ -95,7 +95,7 @@ public class PetUnitTest {
@Test @Test
public void testEqualsHashcode() { public void testEqualsHashcode() {
EqualsVerifier.forClass(Pet.class) EqualsVerifier.forClass(Pet.class)
.withIgnoredFields("name", "animalType", "owner_id") .withIgnoredFields("name", "animalType", "ownerId")
.suppress(Warning.STRICT_INHERITANCE) .suppress(Warning.STRICT_INHERITANCE)
.suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.NONFINAL_FIELDS)
.verify(); .verify();
......
...@@ -23,6 +23,5 @@ ...@@ -23,6 +23,5 @@
<pet id="4" name="Tafi3" animalType="Perro3" owner_id="1"/> <pet id="4" name="Tafi3" animalType="Perro3" owner_id="1"/>
<pet id="5" name="Tafi4" animalType="Perro4" owner_id="1"/> <pet id="5" name="Tafi4" animalType="Perro4" owner_id="1"/>
<pet id="6" name="Tafi5" animalType="Perro5" owner_id="1"/> <pet id="6" name="Tafi5" animalType="Perro5" owner_id="1"/>
<pet id="7" name="Tafi7" animalType="Perro6" owner_id="1"/>
</dataset> </dataset>
\ No newline at end of file
...@@ -19,5 +19,6 @@ ...@@ -19,5 +19,6 @@
<pet id="2" name="Tafi1" animalType="Perro1" owner_id="1"/> <pet id="2" name="Tafi1" animalType="Perro1" owner_id="1"/>
<pet id="3" name="Tafi2" animalType="Perro2" owner_id="1"/> <pet id="3" name="Tafi2" animalType="Perro2" owner_id="1"/>
<pet id="4" name="Tafi3" animalType="Perro3" owner_id="1"/> <pet id="4" name="Tafi3" animalType="Perro3" owner_id="1"/>
<pet id="5" name="Tafi4" animalType="Perro4" owner_id="1"/>
<pet id="6" name="Tafi5" animalType="Perro5" owner_id="1"/> <pet id="6" name="Tafi5" animalType="Perro5" owner_id="1"/>
</dataset> </dataset>
\ No newline at end of file
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
<pet id="2" name="Tafi1" animalType="Perro1" owner_id="1"/> <pet id="2" name="Tafi1" animalType="Perro1" owner_id="1"/>
<pet id="3" name="Tafi2" animalType="Perro2" owner_id="1"/> <pet id="3" name="Tafi2" animalType="Perro2" owner_id="1"/>
<pet id="4" name="Tafi3" animalType="Perro3" owner_id="1"/> <pet id="4" name="Tafi3" animalType="Perro3" owner_id="1"/>
<pet id="5" name="Tafi7" animalType="Perro6" owner_id="1"/> <pet id="5" name="Tafi4" animalType="Perro4" owner_id="1"/>
<pet id="6" name="Tafi5" animalType="Perro5" owner_id="1"/> <pet id="6" name="Tafi5" animalType="Perro5" owner_id="1"/>
</dataset> </dataset>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment