From eae2d5a067aec0f08cf75777c9320225abc1c3a5 Mon Sep 17 00:00:00 2001
From: Miguel Reboiro Jato <mrjato@uvigo.es>
Date: Sun, 4 Oct 2020 18:05:15 +0200
Subject: [PATCH] Fixes an error with the tests

The change of the pets list in the owner to a Set makes it not
possible to use the pet's ids in the tests. Therefore, this commit
removes id comparisons for pets.
---
 .../uvigo/esei/xcs/domain/entities/IsEqualToPet.java |  3 +--
 .../main/resources/datasets/owners-create-pet.xml    |  2 +-
 .../resources/datasets/owners-create-with-pets.xml   |  6 +++---
 .../main/resources/datasets/owners-remove-pet.xml    | 10 +++++-----
 .../resources/datasets/owners-remove-with-pets.xml   |  8 ++++----
 .../datasets/owners-remove-without-pets.xml          | 12 ++++++------
 .../resources/datasets/owners-update-password.xml    | 12 ++++++------
 .../main/resources/datasets/owners-update-pet.xml    | 12 ++++++------
 tests/src/main/resources/datasets/owners.xml         | 12 ++++++------
 9 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/tests/src/main/java/es/uvigo/esei/xcs/domain/entities/IsEqualToPet.java b/tests/src/main/java/es/uvigo/esei/xcs/domain/entities/IsEqualToPet.java
index 769fc66..554034c 100644
--- a/tests/src/main/java/es/uvigo/esei/xcs/domain/entities/IsEqualToPet.java
+++ b/tests/src/main/java/es/uvigo/esei/xcs/domain/entities/IsEqualToPet.java
@@ -19,8 +19,7 @@ public class IsEqualToPet extends IsEqualToEntity<Pet> {
 			this.addTemplatedDescription("actual", expected.toString());
 			return false;
 		} else {
-			return checkAttribute("id", Pet::getId, actual)
-				&& checkAttribute("name", Pet::getName, actual)
+			return checkAttribute("name", Pet::getName, actual)
 				&& checkAttribute("animal", Pet::getAnimal, actual)
 				&& checkAttribute("birth", Pet::getBirth, actual)
 				&& (!this.checkRelations || checkAttribute("owner", Pet::getOwner, actual, IsEqualToOwner::equalToOwnerWithoutRelations));
diff --git a/tests/src/main/resources/datasets/owners-create-pet.xml b/tests/src/main/resources/datasets/owners-create-pet.xml
index 44f301e..8943c44 100644
--- a/tests/src/main/resources/datasets/owners-create-pet.xml
+++ b/tests/src/main/resources/datasets/owners-create-pet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <dataset>
-    <Pet id="7" name="Lorenacat" animal="CAT" birth="2000-01-01 01:01:01" owner="lorena"/>
+    <Pet name="Lorenacat" animal="CAT" birth="2000-01-01 01:01:01" owner="lorena"/>
 </dataset>
\ No newline at end of file
diff --git a/tests/src/main/resources/datasets/owners-create-with-pets.xml b/tests/src/main/resources/datasets/owners-create-with-pets.xml
index f581406..62031a2 100644
--- a/tests/src/main/resources/datasets/owners-create-with-pets.xml
+++ b/tests/src/main/resources/datasets/owners-create-with-pets.xml
@@ -3,7 +3,7 @@
 <dataset>
     <User login="jacinto" password="69ED0B54C2B179E20F784370EAE8CB46" role="OWNER" />
     
-    <Pet id="7" name="Jacintocat" animal="CAT" birth="2000-01-01 01:01:01" owner="jacinto"/>
-    <Pet id="8" name="Jacintodo" animal="DOG" birth="2000-01-01 01:01:01" owner="jacinto"/>
-    <Pet id="9" name="Jacintobird" animal="BIRD" birth="2000-01-01 01:01:01" owner="jacinto"/>
+    <Pet name="Jacintocat" animal="CAT" birth="2000-01-01 01:01:01" owner="jacinto"/>
+    <Pet name="Jacintodo" animal="DOG" birth="2000-01-01 01:01:01" owner="jacinto"/>
+    <Pet name="Jacintobird" animal="BIRD" birth="2000-01-01 01:01:01" owner="jacinto"/>
 </dataset>
\ No newline at end of file
diff --git a/tests/src/main/resources/datasets/owners-remove-pet.xml b/tests/src/main/resources/datasets/owners-remove-pet.xml
index 959cb6e..30480f4 100644
--- a/tests/src/main/resources/datasets/owners-remove-pet.xml
+++ b/tests/src/main/resources/datasets/owners-remove-pet.xml
@@ -7,9 +7,9 @@
     <User login="ana" password="22BEEAE33E9B2657F9610621502CD7A4" role="OWNER"/>
     <User login="lorena" password="05009E420932C21E5A68F5EF1AADD530" role="OWNER"/>
     
-    <Pet id="1" name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
-    <Pet id="3" name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
-    <Pet id="4" name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="5" name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="6" name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
+    <Pet name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
+    <Pet name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
 </dataset>
\ No newline at end of file
diff --git a/tests/src/main/resources/datasets/owners-remove-with-pets.xml b/tests/src/main/resources/datasets/owners-remove-with-pets.xml
index 6b5fa24..f15fe38 100644
--- a/tests/src/main/resources/datasets/owners-remove-with-pets.xml
+++ b/tests/src/main/resources/datasets/owners-remove-with-pets.xml
@@ -6,8 +6,8 @@
     <User login="ana" password="22BEEAE33E9B2657F9610621502CD7A4" role="OWNER"/>
     <User login="lorena" password="05009E420932C21E5A68F5EF1AADD530" role="OWNER"/>
     
-    <Pet id="1" name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
-    <Pet id="4" name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="5" name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="6" name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
+    <Pet name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
 </dataset>
\ No newline at end of file
diff --git a/tests/src/main/resources/datasets/owners-remove-without-pets.xml b/tests/src/main/resources/datasets/owners-remove-without-pets.xml
index 4498c9e..1730a74 100644
--- a/tests/src/main/resources/datasets/owners-remove-without-pets.xml
+++ b/tests/src/main/resources/datasets/owners-remove-without-pets.xml
@@ -6,10 +6,10 @@
     <User login="juan" password="B4FBB95580592697DC71488A1F19277E" role="OWNER"/>
     <User login="ana" password="22BEEAE33E9B2657F9610621502CD7A4" role="OWNER"/>
     
-    <Pet id="1" name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
-    <Pet id="2" name="Max" animal="CAT" birth="2000-01-01 01:01:01" owner="juan"/>
-    <Pet id="3" name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
-    <Pet id="4" name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="5" name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="6" name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
+    <Pet name="Max" animal="CAT" birth="2000-01-01 01:01:01" owner="juan"/>
+    <Pet name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
+    <Pet name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
 </dataset>
\ No newline at end of file
diff --git a/tests/src/main/resources/datasets/owners-update-password.xml b/tests/src/main/resources/datasets/owners-update-password.xml
index e3ba3dd..d087296 100644
--- a/tests/src/main/resources/datasets/owners-update-password.xml
+++ b/tests/src/main/resources/datasets/owners-update-password.xml
@@ -7,10 +7,10 @@
     <User login="ana" password="22BEEAE33E9B2657F9610621502CD7A4" role="OWNER"/>
     <User login="lorena" password="05009E420932C21E5A68F5EF1AADD530" role="OWNER"/>
     
-    <Pet id="1" name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
-    <Pet id="2" name="Max" animal="CAT" birth="2000-01-01 01:01:01" owner="juan"/>
-    <Pet id="3" name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
-    <Pet id="4" name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="5" name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="6" name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
+    <Pet name="Max" animal="CAT" birth="2000-01-01 01:01:01" owner="juan"/>
+    <Pet name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
+    <Pet name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
 </dataset>
\ No newline at end of file
diff --git a/tests/src/main/resources/datasets/owners-update-pet.xml b/tests/src/main/resources/datasets/owners-update-pet.xml
index b703c8b..689f965 100644
--- a/tests/src/main/resources/datasets/owners-update-pet.xml
+++ b/tests/src/main/resources/datasets/owners-update-pet.xml
@@ -7,10 +7,10 @@
     <User login="ana" password="22BEEAE33E9B2657F9610621502CD7A4" role="OWNER"/>
     <User login="lorena" password="05009E420932C21E5A68F5EF1AADD530" role="OWNER"/>
     
-    <Pet id="1" name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
-    <Pet id="2" name="UpdateName" animal="BIRD" birth="2000-01-02 01:01:01" owner="juan"/>
-    <Pet id="3" name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
-    <Pet id="4" name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="5" name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="6" name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
+    <Pet name="UpdateName" animal="BIRD" birth="2000-01-02 01:01:01" owner="juan"/>
+    <Pet name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
+    <Pet name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
 </dataset>
\ No newline at end of file
diff --git a/tests/src/main/resources/datasets/owners.xml b/tests/src/main/resources/datasets/owners.xml
index 9d770d3..03dce88 100644
--- a/tests/src/main/resources/datasets/owners.xml
+++ b/tests/src/main/resources/datasets/owners.xml
@@ -7,10 +7,10 @@
     <User login="ana" password="22BEEAE33E9B2657F9610621502CD7A4" role="OWNER"/>
     <User login="lorena" password="05009E420932C21E5A68F5EF1AADD530" role="OWNER"/>
     
-    <Pet id="1" name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
-    <Pet id="2" name="Max" animal="CAT" birth="2000-01-01 01:01:01" owner="juan"/>
-    <Pet id="3" name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
-    <Pet id="4" name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="5" name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
-    <Pet id="6" name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Pepecat" animal="CAT" birth="2000-01-01 01:01:01" owner="pepe"/>
+    <Pet name="Max" animal="CAT" birth="2000-01-01 01:01:01" owner="juan"/>
+    <Pet name="Juandog" animal="DOG" birth="2000-01-01 01:01:01" owner="juan"/>
+    <Pet name="Anacat" animal="CAT" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Max" animal="DOG" birth="2000-01-01 01:01:01" owner="ana"/>
+    <Pet name="Anabird" animal="BIRD" birth="2000-01-01 01:01:01" owner="ana"/>
 </dataset>
\ No newline at end of file
-- 
2.18.1