Skip to content

B
bspastoriza19-esi-solutions
Commit eae2d5a0 authored by Administrator's avatar Administrator
Browse files
Options

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.
parent cfd823e8
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 39 deletions
tests/src/main/java/es/uvigo/esei/xcs/domain/entities/IsEqualToPet.java
View file @ eae2d5a0
......@@ -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));
......
tests/src/main/resources/datasets/owners-create-pet.xml
View file @ eae2d5a0
<?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
tests/src/main/resources/datasets/owners-create-with-pets.xml
View file @ eae2d5a0
......@@ -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
tests/src/main/resources/datasets/owners-remove-pet.xml
View file @ eae2d5a0
......@@ -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
tests/src/main/resources/datasets/owners-remove-with-pets.xml
View file @ eae2d5a0
......@@ -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
tests/src/main/resources/datasets/owners-remove-without-pets.xml
View file @ eae2d5a0
......@@ -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
tests/src/main/resources/datasets/owners-update-password.xml
View file @ eae2d5a0
......@@ -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
tests/src/main/resources/datasets/owners-update-pet.xml
View file @ eae2d5a0
......@@ -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
tests/src/main/resources/datasets/owners.xml
View file @ eae2d5a0
......@@ -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
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