From 97783c55445ede68379b2665ee07de6ec653aeb8 Mon Sep 17 00:00:00 2001 From: Miguel Reboiro-Jato Date: Fri, 27 Mar 2020 20:17:34 +0100 Subject: [PATCH] Fixes errors in tests --- src/main/java/es/uvigo/esei/daa/entities/Pet.java | 8 ++++---- src/test/java/es/uvigo/esei/daa/dao/PetsDAOTest.java | 2 +- src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java | 2 +- src/test/resources/datasets/dataset-add.xml | 1 - src/test/resources/datasets/dataset-delete.xml | 1 + src/test/resources/datasets/dataset-modify.xml | 3 +-- 6 files changed, 8 insertions(+), 9 deletions(-) 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 e129d8b..e30a6f9 100644 --- a/src/main/java/es/uvigo/esei/daa/entities/Pet.java +++ b/src/main/java/es/uvigo/esei/daa/entities/Pet.java @@ -12,15 +12,15 @@ import static java.util.Objects.requireNonNull; private int id; private String name; private String animalType; - private int owner_id; + private int ownerId; 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.setName(name); this.setAnimalType(animalType); - this.owner_id = owner_id; + this.ownerId = ownerId; } public int getId() { @@ -44,7 +44,7 @@ import static java.util.Objects.requireNonNull; } public int getOwnerId() { - return owner_id; + return ownerId; } @Override diff --git a/src/test/java/es/uvigo/esei/daa/dao/PetsDAOTest.java b/src/test/java/es/uvigo/esei/daa/dao/PetsDAOTest.java index e791cab..d3a09b8 100644 --- a/src/test/java/es/uvigo/esei/daa/dao/PetsDAOTest.java +++ b/src/test/java/es/uvigo/esei/daa/dao/PetsDAOTest.java @@ -79,7 +79,7 @@ public class PetsDAOTest { } @Test - @ExpectedDatabase("/datasets/dataset-delete.xml") + @ExpectedDatabase("/datasets/dataset-delete-pets.xml") public void testDelete() throws DAOException { this.dao.delete(existentId()); diff --git a/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java index 8c15869..11c808e 100644 --- a/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java +++ b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java @@ -95,7 +95,7 @@ public class PetUnitTest { @Test public void testEqualsHashcode() { EqualsVerifier.forClass(Pet.class) - .withIgnoredFields("name", "animalType", "owner_id") + .withIgnoredFields("name", "animalType", "ownerId") .suppress(Warning.STRICT_INHERITANCE) .suppress(Warning.NONFINAL_FIELDS) .verify(); diff --git a/src/test/resources/datasets/dataset-add.xml b/src/test/resources/datasets/dataset-add.xml index 0344d58..d1a4f5e 100644 --- a/src/test/resources/datasets/dataset-add.xml +++ b/src/test/resources/datasets/dataset-add.xml @@ -23,6 +23,5 @@ - \ No newline at end of file diff --git a/src/test/resources/datasets/dataset-delete.xml b/src/test/resources/datasets/dataset-delete.xml index 7ba238e..3607152 100644 --- a/src/test/resources/datasets/dataset-delete.xml +++ b/src/test/resources/datasets/dataset-delete.xml @@ -19,5 +19,6 @@ + \ No newline at end of file diff --git a/src/test/resources/datasets/dataset-modify.xml b/src/test/resources/datasets/dataset-modify.xml index 0c207dd..7c38f4d 100644 --- a/src/test/resources/datasets/dataset-modify.xml +++ b/src/test/resources/datasets/dataset-modify.xml @@ -20,7 +20,6 @@ - + - \ No newline at end of file -- 2.18.1