From 52d66bf707d03a7d728d4d2dd22076c6c5da70f0 Mon Sep 17 00:00:00 2001
From: Santi <santii810@hotmail.com>
Date: Fri, 8 Mar 2019 01:01:52 +0100
Subject: [PATCH] Modified datasets to add, delete and modify

---
 .../uvigo/esei/daa/dataset/PetsDataset.java   | 58 +++++++++++--------
 src/test/resources/datasets/dataset-add.xml   |  5 ++
 .../resources/datasets/dataset-delete.xml     |  2 +
 .../resources/datasets/dataset-modify.xml     |  4 ++
 4 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/src/test/java/es/uvigo/esei/daa/dataset/PetsDataset.java b/src/test/java/es/uvigo/esei/daa/dataset/PetsDataset.java
index 0a91744..1a791a3 100644
--- a/src/test/java/es/uvigo/esei/daa/dataset/PetsDataset.java
+++ b/src/test/java/es/uvigo/esei/daa/dataset/PetsDataset.java
@@ -5,28 +5,40 @@ import es.uvigo.esei.daa.entities.Pet;
 import static java.util.Arrays.stream;
 
 public final class PetsDataset {
-	private PetsDataset() {}
-	
-	public static Pet[] pets() {
-		return new Pet[] {
-			new Pet(1, 1, "Tom"),
-			new Pet(2, 1, "Jerry")
-		};
-	}
-
-
-	public static Pet pet(int id) {
-		return stream(pets())
-				.filter(p -> p.getId() == id)
-				.findAny()
-				.orElseThrow(IllegalArgumentException::new);
-	}
-	public static int existentId() {
-		return 1;
-	}
-
-	public static Pet existentPet() {
-		return pet(existentId());
-	}
+    private PetsDataset() {
+    }
+
+    public static Pet[] pets() {
+        return new Pet[]{
+                new Pet(1, 1, "Tom"),
+                new Pet(2, 1, "Jerry")
+        };
+    }
+
+
+    public static Pet pet(int id) {
+        return stream(pets())
+                .filter(p -> p.getId() == id)
+                .findAny()
+                .orElseThrow(IllegalArgumentException::new);
+    }
+
+    public static int existentId() {
+        return 1;
+    }
+
+    public static Pet existentPet() {
+        return pet(existentId());
+    }
+
+
+    public static String newName() { return "Nibbles";}
+    public static int newOwner() {
+        return 2;
+    }
+
+    public static Pet newPet() {
+        return new Pet(pets().length + 1, newOwner(), newName());
+    }
 
 }
diff --git a/src/test/resources/datasets/dataset-add.xml b/src/test/resources/datasets/dataset-add.xml
index 9a75a99..6ddf78e 100644
--- a/src/test/resources/datasets/dataset-add.xml
+++ b/src/test/resources/datasets/dataset-add.xml
@@ -14,6 +14,11 @@
 	<people id="10" name="Juan" surname="Jiménez" />
 	<people id="11" name="John" surname="Doe" />
 
+	<pets id="1" owner="1" name="Tom"/>
+	<pets id="2" owner="1" name="Jerry"/>
+    <pets id="3" owner="2" name="Nibbles"/>
+
+
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
 </dataset>
\ 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 e49223d..4f595a6 100644
--- a/src/test/resources/datasets/dataset-delete.xml
+++ b/src/test/resources/datasets/dataset-delete.xml
@@ -12,6 +12,8 @@
 	<people id="9" name="Julia" surname="Justa" />
 	<people id="10" name="Juan" surname="Jiménez" />
 
+	<pets id="2" owner="1" name="Jerry"/>
+
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
 </dataset>
\ 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 6e2dfc9..a83bc2f 100644
--- a/src/test/resources/datasets/dataset-modify.xml
+++ b/src/test/resources/datasets/dataset-modify.xml
@@ -13,6 +13,10 @@
 	<people id="9" name="Julia" surname="Justa" />
 	<people id="10" name="Juan" surname="Jiménez" />
 
+
+	<pets id="1" owner="2" name="Nibbles"/>
+	<pets id="2" owner="1" name="Jerry"/>
+
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
 </dataset>
\ No newline at end of file
-- 
2.18.1