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 0a917440ddd47d98dde318886d0e37792074c31e..1a791a318fd7757c0ccd5c298047d7c99ed06910 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 9a75a999a98510f7d6d32992877e71772e8f536c..6ddf78ed6dc74bc900b27b05e5ce1b01ff05cd8e 100644 --- a/src/test/resources/datasets/dataset-add.xml +++ b/src/test/resources/datasets/dataset-add.xml @@ -14,6 +14,11 @@ + + + + + \ 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 e49223db335c0f49f7d78cdcb3f27e80e14d30da..4f595a6fc49fd7d61022fdc637103e46f9d18034 100644 --- a/src/test/resources/datasets/dataset-delete.xml +++ b/src/test/resources/datasets/dataset-delete.xml @@ -12,6 +12,8 @@ + + \ 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 6e2dfc903798c9e26431fbaf42bea176a05fc59c..a83bc2f60b0bd864f48163aefca7216980dc87a8 100644 --- a/src/test/resources/datasets/dataset-modify.xml +++ b/src/test/resources/datasets/dataset-modify.xml @@ -13,6 +13,10 @@ + + + + \ No newline at end of file