Añadidos todos los test (Entidad + Rest)

src/test/java/es/uvigo/esei/daa/dataset/PetsDataset.java

+package es.uvigo.esei.daa.dataset;
+
+import java.util.Arrays;
+import java.util.function.Predicate;
+import static java.util.Arrays.binarySearch;
+import static java.util.Arrays.stream;
+
+import es.uvigo.esei.daa.entities.Person;
+import es.uvigo.esei.daa.entities.Pet;
+
+public final class PetsDataset {
+
+	private PetsDataset() {}
+	
+	public static Pet[] pets() {
+		return new Pet[] {
+			new Pet (1, "Brune", PeopleDataset.people()[6]),
+			new Pet (2, "Toby", PeopleDataset.people()[6]),
+			new Pet (3, "Zeus", PeopleDataset.people()[6])
+		};
+	}
+	
+	public static Pet[] petsWithout (int ... ids) {
+		Arrays.sort(ids);
+		
+		final Predicate<Pet> hasValidId = pet -> binarySearch (ids, pet.getId()) < 0;
+		
+		return stream(pets()).filter(hasValidId).toArray(Pet[]::new);
+	}
+	
+	public static Pet pet (int id) {
+		return stream(pets()).filter(pet -> pet.getId() == id).findAny().orElseThrow(IllegalArgumentException::new);
+	}
+	
+	public static int existentId() {
+		return 1;
+	}
+	
+	public static int existentIdOwner() {
+		return 7;
+	}
+	
+	public static int nonExistentIdOwner() {
+		return 7777;
+	}
+	
+	public static int nonExistentId() {
+		return 1234;
+	}
+	
+	public static Pet existentPet () {
+		return pet(existentId());
+	}
+	
+	public static Pet nonExistentPet() {
+		return new Pet (nonExistentId(), "PetDoesntExist", PeopleDataset.existentPerson());
+	}
+	
+	public static String newName() {
+		return "Luna";
+	}
+	
+	public static Person newOwner () {
+		return PeopleDataset.people()[6];
+	}
+	
+	public static String newOwnerID () {
+		return "7";
+	}
+	
+	public static Pet newPet (){
+		return new Pet ( pets().length + 1, newName(), newOwner() );
+	}
+	
+}

src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java

+package es.uvigo.esei.daa.entities;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+
+public class PetUnitTest {
+
+	@Test
+	public void testPetIntStringPerson() {
+		final int idPerson = 1;
+		final String namePerson = "John";
+		final String surnamePerson = "Doe";
+		
+		final Person owner = new Person(1, namePerson, surnamePerson);
+		
+		final int idPet = 1;
+		final String namePet = "Mascota";
+		
+		final Pet pet = new Pet (idPet, namePet, owner);
+		
+		assertThat(pet.getId(), is(equalTo(idPet)));
+		assertThat(pet.getName(), is(equalTo(namePet)));
+		assertThat(pet.getOwner().getId(), is(equalTo(idPerson)));
+		assertThat(pet.getOwner().getName(), is(equalTo(namePerson)));
+		assertThat(pet.getOwner().getSurname(), is(equalTo(surnamePerson)));
+		
+	}
+	
+	@Test(expected = NullPointerException.class)
+	public void testPetNullName() {
+		new Pet(1, null, new Person (1, "John", "Doe") );
+	}
+	
+	@Test(expected = NullPointerException.class)
+	public void testPetNullOwner() {
+		new Pet(1, "Mascota", null);
+	}
+	
+	@Test
+	public void testSetName() {
+		final int id = 1;
+		final Person owner = new Person (1, "John", "Doe");
+		
+		final Pet pet = new Pet(id, "Mascota", owner);
+		pet.setName("Pet");
+		
+		assertThat(pet.getId(), is(equalTo(id)));
+		assertThat(pet.getName(), is(equalTo("Pet")));
+		assertThat(pet.getOwner().getId(), is(equalTo(1)));
+		assertThat(pet.getOwner().getName(), is(equalTo("John")));
+		assertThat(pet.getOwner().getSurname(), is(equalTo("Doe")));
+	}
+
+	@Test(expected = NullPointerException.class)
+	public void testSetNullName() {
+		final int id = 1;
+		final Person owner = new Person (1, "John", "Doe");
+		
+		final Pet pet = new Pet(id, "Mascota", owner);
+		pet.setName(null);
+	}
+
+	@Test
+	public void testSetOwner() {
+		final int id = 1;
+		final Person owner = new Person (1, "John", "Doe");
+		final Person ownerSet = new Person (2, "Antonio", "Perez");
+		
+		final Pet pet = new Pet(id, "Mascota", owner);
+		pet.setOwner(ownerSet);
+		
+		assertThat(pet.getId(), is(equalTo(id)));
+		assertThat(pet.getName(), is(equalTo("Mascota")));
+		assertThat(pet.getOwner().getId(), is(equalTo(2)));
+		assertThat(pet.getOwner().getName(), is(equalTo("Antonio")));
+		assertThat(pet.getOwner().getSurname(), is(equalTo("Perez")));
+	}
+
+	@Test(expected = NullPointerException.class)
+	public void testSetNullSurname() {
+		final int id = 1;
+		final Person owner = new Person (1, "John", "Doe");
+		
+		final Pet pet = new Pet(id, "Mascota", owner);
+		pet.setOwner(null);
+	}
+
+	@Test
+	public void testEqualsObject() {
+		final int id = 1;
+		final Person owner = new Person (1, "John", "Doe");
+		
+		final Pet pet1 = new Pet(id, "Mascota", owner);
+		final Pet pet2 = new Pet(id, "Mascota", owner);
+		
+		assertTrue(pet1.equals(pet2));
+	}
+
+	@Test
+	public void testEqualsHashcode() {
+		EqualsVerifier.forClass(Pet.class)
+			.withIgnoredFields("name", "owner")
+			.suppress(Warning.STRICT_INHERITANCE)
+			.suppress(Warning.NONFINAL_FIELDS)
+		.verify();
+	}
+
+}

src/test/java/es/uvigo/esei/daa/matchers/IsEqualToPet.java

+package es.uvigo.esei.daa.matchers;
+
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+
+import es.uvigo.esei.daa.entities.Pet;
+
+public class IsEqualToPet extends IsEqualToEntity<Pet>{
+
+	public IsEqualToPet(Pet entity) {
+		super(entity);
+	}
+	
+	@Override
+	protected boolean matchesSafely (Pet actual) {
+		
+		this.clearDescribeTo();
+		
+		if (actual == null) {
+			this.addTemplatedDescription("actual", expected.toString());
+			return false;
+		} else {
+			return checkAttribute("id", Pet::getId, actual)
+					&& checkAttribute ("name", Pet::getName, actual)
+					&& checkAttribute ("owner", Pet::getOwner, actual);
+		}
+		
+	}
+	
+	@Factory
+	public static IsEqualToPet equalsToPet (Pet pet) {
+		return new IsEqualToPet(pet);
+	}
+	
+	@Factory
+	public static Matcher<Iterable<? extends Pet>> containsPetsInAnyOrder(Pet ... pets){
+		return containsEntityInAnyOrder(IsEqualToPet::equalsToPet, pets);
+	}
+
+}

src/test/java/es/uvigo/esei/daa/rest/PetsResourceTest.java

+package es.uvigo.esei.daa.rest;
+
+import static es.uvigo.esei.daa.dataset.PetsDataset.*;
+import static es.uvigo.esei.daa.dataset.UsersDataset.adminLogin;
+import static es.uvigo.esei.daa.dataset.UsersDataset.normalLogin;
+import static es.uvigo.esei.daa.dataset.UsersDataset.userToken;
+import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasBadRequestStatus;
+import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasOkStatus;
+import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasUnauthorized;
+import static es.uvigo.esei.daa.matchers.IsEqualToPet.containsPetsInAnyOrder;
+import static es.uvigo.esei.daa.matchers.IsEqualToPet.equalsToPet;
+import static javax.ws.rs.client.Entity.entity;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.sql.DataSource;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Form;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.test.JerseyTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.github.springtestdbunit.DbUnitTestExecutionListener;
+import com.github.springtestdbunit.annotation.DatabaseSetup;
+import com.github.springtestdbunit.annotation.ExpectedDatabase;
+
+import es.uvigo.esei.daa.DAAExampleTestApplication;
+import es.uvigo.esei.daa.entities.Pet;
+import es.uvigo.esei.daa.listeners.ApplicationContextBinding;
+import es.uvigo.esei.daa.listeners.ApplicationContextJndiBindingTestExecutionListener;
+import es.uvigo.esei.daa.listeners.DbManagement;
+import es.uvigo.esei.daa.listeners.DbManagementTestExecutionListener;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:contexts/mem-context.xml")
+@TestExecutionListeners({
+	DbUnitTestExecutionListener.class,
+	DbManagementTestExecutionListener.class,
+	ApplicationContextJndiBindingTestExecutionListener.class
+})
+
+@ApplicationContextBinding(
+		jndiUrl = "java:/comp/env/jdbc/daaexample",
+		type = DataSource.class
+)
+
+@DbManagement(
+		create = "classpath:db/hsqldb.sql",
+		drop = "classpath:db/hsqldb-drop.sql"
+)
+
+@DatabaseSetup("/datasets/dataset.xml")
+@ExpectedDatabase("/datasets/dataset.xml")
+
+public class PetsResourceTest extends JerseyTest{
+	
+	
+	@Override
+	protected Application configure() {
+		return new DAAExampleTestApplication();
+	}
+	
+	@Override
+	protected void configureClient(ClientConfig config) {
+		super.configureClient(config);
+		
+		// Enables JSON transformation in client
+		config.register(JacksonJsonProvider.class);
+		config.property("com.sun.jersey.api.json.POJOMappingFeature", Boolean.TRUE);
+	}
+	
+	
+	@Test
+	public void testList() throws IOException {
+		
+		final Response response = target("people/" + existentIdOwner() + "/pets").request().header("Authorization", "Basic " + userToken(adminLogin())).get();
+		
+		assertThat(response, hasOkStatus());
+		
+		final List<Pet> pets = response.readEntity(new GenericType<List<Pet>>() {});
+		
+		assertThat(pets, containsPetsInAnyOrder(pets()));
+		
+	}
+	
+	@Test
+	public void testListUnauthorized() throws IOException {
+		
+		final Response response = target("people/" + existentIdOwner() + "/pets").request().header("Authorization", "Basic " + userToken(normalLogin())).get();
+		
+		assertThat(response, hasUnauthorized());
+		
+	}
+	
+	
+	@Test
+	@ExpectedDatabase(value="/datasets/dataset-add.xml", table="pet")
+	public void testAdd() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		
+		final Response response = target("people/" + existentIdOwner() + "/pets")
+				.request(MediaType.APPLICATION_JSON_TYPE)
+				.header("Authorization", "Basic " + userToken(adminLogin()))
+				.post(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasOkStatus());
+		
+		final Pet pet = response.readEntity(Pet.class);
+		
+		assertThat(pet, is(equalsToPet(newPet())));
+		
+	}
+	
+	
+	@Test
+	public void testAddUnauthorized() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		
+		final Response response = target("people/" + existentIdOwner() + "/pets")
+				.request(MediaType.APPLICATION_JSON_TYPE)
+				.header("Authorization", "Basic " + userToken(normalLogin()))
+				.post(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasUnauthorized());
+		
+	}
+	
+	@Test
+	public void testAddMissingName() throws IOException {
+		final Form form = new Form();
+		
+		final Response response = target("people/" + existentIdOwner() + "/pets")
+				.request(MediaType.APPLICATION_JSON_TYPE)
+				.header("Authorization", "Basic " + userToken(adminLogin()))
+				.post(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasBadRequestStatus());
+		
+	}
+	
+	
+	@Test
+	@ExpectedDatabase(value="/datasets/dataset-modify.xml", table="pet")
+	public void testModify() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		
+		final Response response = target("people/" + existentIdOwner() + "/pets/" + existentId())
+				.request(MediaType.APPLICATION_JSON_TYPE)
+				.header("Authorization", "Basic " + userToken(adminLogin()))
+				.put(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasOkStatus());
+		
+		final Pet modifiedPet = response.readEntity(Pet.class);
+		
+		final Pet pet = existentPet();
+		pet.setName(newName());
+		
+		assertThat(modifiedPet, is(equalsToPet(pet)));
+	}
+	
+	@Test
+	public void testModifyUnauthorized() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		
+		final Response response = target("people/" + existentIdOwner() + "/pets/" + existentId())
+				.request(MediaType.APPLICATION_JSON_TYPE)
+				.header("Authorization", "Basic " + userToken(normalLogin()))
+				.put(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasUnauthorized());
+	}
+	
+	@Test
+	public void testModifyInvalidId() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		
+		final Response response = target("people/" + existentIdOwner() + "/pets/" + nonExistentId())
+				.request(MediaType.APPLICATION_JSON_TYPE)
+				.header("Authorization", "Basic " + userToken(adminLogin()))
+				.put(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasBadRequestStatus());
+	}
+	
+	@Test
+	public void testModifyInvalidIdOwner() throws IOException {
+		final Form form = new Form();
+		form.param("name", newName());
+		
+		final Response response = target("people/" + nonExistentIdOwner() + "/pets/" + existentId())
+				.request(MediaType.APPLICATION_JSON_TYPE)
+				.header("Authorization", "Basic " + userToken(adminLogin()))
+				.put(entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE));
+		
+		assertThat(response, hasBadRequestStatus());
+	}
+	
+	@Test
+	@ExpectedDatabase(value="/datasets/dataset-delete.xml", table="pet")
+	public void testDelete () throws IOException {
+		final Response response = target ("people/" + existentIdOwner() + "/pets/" + existentId())
+				.request().header("Authorization", "Basic " + userToken(adminLogin())).delete();
+		
+		assertThat(response, hasOkStatus());
+		
+		final Integer deletedId = response.readEntity(Integer.class);
+		
+		assertThat(deletedId, is(equalTo(existentId())));
+	}
+	
+	@Test
+	public void testDeleteUnauthorized () throws IOException {
+		final Response response = target ("people/" + existentIdOwner() + "/pets/" + existentId())
+				.request().header("Authorization", "Basic " + userToken(normalLogin())).delete();
+		
+		assertThat(response, hasUnauthorized());
+	}
+	
+	@Test
+	public void testDeleteInvalidId () throws IOException {
+		final Response response = target ("people/" + existentIdOwner() + "/pets/" + nonExistentId())
+				.request().header("Authorization", "Basic " + userToken(adminLogin())).delete();
+		
+		assertThat(response, hasBadRequestStatus());
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+}

src/test/java/es/uvigo/esei/daa/util/AdditionalConditions.java

+package es.uvigo.esei.daa.util;
+
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+
+/*
+ * Implementation based on https://stackoverflow.com/questions/33348600/selenium-wait-for-ajax-content-to-load-universal-approach
+ */
+public class AdditionalConditions {
+	public static ExpectedCondition<Boolean> jQueryAjaxCallsHaveCompleted() {
+		return driver -> 
+			(Boolean) ((JavascriptExecutor) driver).executeScript("return (window.jQuery !== null) && (jQuery.active === 0)");
+	}
+}

src/test/java/es/uvigo/esei/daa/web/PeopleWebTest.java

+package es.uvigo.esei.daa.web;
+
+import static es.uvigo.esei.daa.dataset.PeopleDataset.existentId;
+import static es.uvigo.esei.daa.dataset.PeopleDataset.existentPerson;
+import static es.uvigo.esei.daa.dataset.PeopleDataset.newName;
+import static es.uvigo.esei.daa.dataset.PeopleDataset.newPerson;
+import static es.uvigo.esei.daa.dataset.PeopleDataset.newSurname;
+import static es.uvigo.esei.daa.dataset.PeopleDataset.people;
+import static es.uvigo.esei.daa.matchers.IsEqualToPerson.containsPeopleInAnyOrder;
+import static es.uvigo.esei.daa.matchers.IsEqualToPerson.equalsToPerson;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.sql.DataSource;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.firefox.FirefoxOptions;
+import org.openqa.selenium.firefox.FirefoxProfile;
+import org.openqa.selenium.html5.LocalStorage;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.github.springtestdbunit.DbUnitTestExecutionListener;
+import com.github.springtestdbunit.annotation.DatabaseSetup;
+import com.github.springtestdbunit.annotation.ExpectedDatabase;
+
+import es.uvigo.esei.daa.entities.Person;
+import es.uvigo.esei.daa.listeners.ApplicationContextBinding;
+import es.uvigo.esei.daa.listeners.ApplicationContextJndiBindingTestExecutionListener;
+import es.uvigo.esei.daa.listeners.DbManagement;
+import es.uvigo.esei.daa.listeners.DbManagementTestExecutionListener;
+import es.uvigo.esei.daa.web.pages.MainPage;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:contexts/hsql-context.xml")
+@TestExecutionListeners({
+	DbUnitTestExecutionListener.class,
+	DbManagementTestExecutionListener.class,
+	ApplicationContextJndiBindingTestExecutionListener.class
+})
+@ApplicationContextBinding(
+	jndiUrl = "java:/comp/env/jdbc/daaexample",
+	type = DataSource.class
+)
+@DbManagement(
+	create = "classpath:db/hsqldb.sql",
+	drop = "classpath:db/hsqldb-drop.sql"
+)
+@DatabaseSetup("/datasets/dataset.xml")
+@ExpectedDatabase("/datasets/dataset.xml")
+public class PeopleWebTest {
+	private static final int DEFAULT_WAIT_TIME = 1;
+	
+	private WebDriver driver;
+	private MainPage mainPage;
+	
+	@Before
+	public void setUp() throws Exception {
+		final String baseUrl = "http://localhost:9080/DAAExample/";
+
+		final FirefoxProfile profile = new FirefoxProfile();
+		profile.setPreference("browser.privatebrowsing.autostart", true);
+		
+		final FirefoxOptions options = new FirefoxOptions(DesiredCapabilities.firefox());
+		options.setProfile(profile);
+		
+		final FirefoxDriver firefoxDriver;
+		driver = firefoxDriver = new FirefoxDriver();
+		driver.get(baseUrl);
+		
+		// Driver will wait DEFAULT_WAIT_TIME if it doesn't find and element.
+		driver.manage().timeouts().implicitlyWait(DEFAULT_WAIT_TIME, TimeUnit.SECONDS);
+		driver.manage().window().maximize();
+
+		// Login as "admin:adminpass"
+		final LocalStorage localStorage = firefoxDriver.getLocalStorage();
+		localStorage.setItem("authorization-token", "YWRtaW46YWRtaW5wYXNz");
+		
+		mainPage = new MainPage(driver, baseUrl);
+		mainPage.navigateTo();
+	}
+	
+	@After
+	public void tearDown() throws Exception {
+		driver.quit();
+		driver = null;
+		mainPage = null;
+	}
+
+	@Test
+	public void testList() throws Exception {
+		assertThat(mainPage.listPeople(), containsPeopleInAnyOrder(people()));
+	}
+
+	@Test
+	@ExpectedDatabase("/datasets/dataset-add.xml")
+	public void testAdd() throws Exception {
+		final Person newPerson = mainPage.addPerson(newName(), newSurname());
+		
+		assertThat(newPerson, is(equalsToPerson(newPerson())));
+	}
+
+	@Test
+	@ExpectedDatabase("/datasets/dataset-modify.xml")
+	public void testEdit() throws Exception {
+		final Person person = existentPerson();
+		person.setName(newName());
+		person.setSurname(newSurname());
+
+		mainPage.editPerson(person);
+		
+		final Person webPerson = mainPage.getPerson(person.getId());
+		
+		assertThat(webPerson, is(equalsToPerson(person)));
+	}
+
+	@Test
+	@ExpectedDatabase("/datasets/dataset-delete.xml")
+	public void testDelete() throws Exception {
+		mainPage.deletePerson(existentId());
+		
+		assertFalse(mainPage.hasPerson(existentId()));
+	}
+}

src/test/java/es/uvigo/esei/daa/web/pages/MainPage.java

+package es.uvigo.esei.daa.web.pages;
+
+import static es.uvigo.esei.daa.util.AdditionalConditions.jQueryAjaxCallsHaveCompleted;
+import static java.util.stream.Collectors.toList;
+import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
+import static org.openqa.selenium.support.ui.ExpectedConditions.textToBePresentInElement;
+
+import java.util.List;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+import es.uvigo.esei.daa.entities.Person;
+
+public class MainPage {
+	private static final String TABLE_ID = "people-list";
+	private static final String FORM_ID = "people-form";
+	
+	private static final String ID_PREFIX = "person-";
+	
+	private final WebDriver driver;
+	
+	private final WebDriverWait wait;
+	
+	private final String baseUrl;
+	
+	public MainPage(WebDriver driver, String baseUrl) {
+		this.driver = driver;
+		this.baseUrl = baseUrl;
+		
+		this.wait = new WebDriverWait(driver, 1);
+	}
+
+	public void navigateTo() {
+		this.driver.get(this.baseUrl + "main.html");
+		
+	    this.wait.until(presenceOfElementLocated(By.id("people-list")));
+	}
+	
+	public int countPeople() {
+		return new PeopleTable(this.driver).countPeople();
+	}
+	
+	public List<Person> listPeople() {
+		return new PeopleTable(this.driver).listPeople();
+	}
+	
+	public Person getLastPerson() {
+		return new PeopleTable(this.driver).getPersonInLastRow();
+	}
+	
+	public Person getPerson(int id) {
+		return new PeopleTable(this.driver).getPersonById(id);
+	}
+	
+	public boolean hasPerson(int id) {
+		return new PeopleTable(this.driver).hasPerson(id);
+	}
+	
+	public Person addPerson(String name, String surname) {
+		final PersonForm form = new PersonForm(this.driver);
+		
+		form.clear();
+		form.setName(name);
+		form.setSurname(surname);
+		form.submit();
+		
+		final PeopleTable table = new PeopleTable(driver);
+		return table.getPerson(name, surname);
+	}
+	
+	public void editPerson(Person person) {
+		final PeopleTable table = new PeopleTable(this.driver);
+		table.editPerson(person.getId());
+
+		final PersonForm form = new PersonForm(this.driver);
+		form.setName(person.getName());
+		form.setSurname(person.getSurname());
+		form.submit();
+	}
+	
+	public void deletePerson(int id) {
+		final PeopleTable table = new PeopleTable(this.driver);
+		
+		table.deletePerson(id);
+		
+		wait.until(jQueryAjaxCallsHaveCompleted());
+	}
+	
+	private final static class PeopleTable {
+		private final WebDriver driver;
+		
+		private final WebElement table;
+
+		public PeopleTable(WebDriver driver) {
+			this.driver = driver;
+			
+			this.table = this.driver.findElement(By.id(TABLE_ID));
+		}
+		
+		public boolean hasPerson(int id) {
+			try {
+				return this.getPersonRow(id) != null;
+			} catch (NoSuchElementException nsee) {
+				return false;
+			}
+		}
+		
+		public void editPerson(int id) {
+			final WebElement personRow = this.getPersonRow(id);
+			
+			personRow.findElement(By.className("edit")).click();
+		}
+		
+		public void deletePerson(int id) {
+			final WebElement personRow = this.getPersonRow(id);
+			
+			personRow.findElement(By.className("delete")).click();
+			
+			this.acceptDialog();
+		}
+		
+		public Person getPersonById(int id) {
+			return rowToPerson(getPersonRow(id));
+		}
+		
+		public Person getPerson(String name, String surname) {
+			return rowToPerson(getPersonRow(name, surname));
+		}
+		
+		public Person getPersonInLastRow() {
+			final WebElement row = this.table.findElement(By.cssSelector("tbody > tr:last-child"));
+			
+			return rowToPerson(row);
+		}
+		
+		private WebElement getPersonRow(int id) {
+			return this.table.findElement(By.id(ID_PREFIX + id));
+		}
+		
+		public WebElement getPersonRow(String name, String surname) {
+			final List<WebElement> rows = table.findElements(By.cssSelector("tbody > tr"));
+			
+			for (WebElement row : rows) {
+				final String rowName = row.findElement(By.className("name")).getText();
+				final String rowSurname = row.findElement(By.className("surname")).getText();
+				
+				if (rowName.equals(name) && rowSurname.equals(surname)) {
+					return row;
+				}
+			}
+			
+			throw new IllegalArgumentException(String.format("No row found with name '%s' and surname '%s'", name, surname));
+		}
+		
+		public int countPeople() {
+			return getRows().size();
+		}
+		
+		public List<Person> listPeople() {
+			return getRows().stream()
+				.map(this::rowToPerson)
+			.collect(toList());
+		}
+		
+		private List<WebElement> getRows() {
+			final String xpathQuery = "//tbody/tr[starts-with(@id, '" + ID_PREFIX + "')]";
+			
+			return this.table.findElements(By.xpath(xpathQuery));
+		}
+		
+		private Person rowToPerson(WebElement row) {
+			return new Person(
+				Integer.parseInt(row.getAttribute("id").substring(ID_PREFIX.length())),
+				row.findElement(By.className("name")).getText(),
+				row.findElement(By.className("surname")).getText()
+			);
+		}
+		
+		private void acceptDialog() {
+			driver.switchTo().alert().accept();
+		}
+	}
+	
+	public final static class PersonForm {
+		private final WebDriverWait wait;
+		
+		private final WebElement fieldName;
+		private final WebElement fieldSurname;
+		private final WebElement buttonClear;
+		private final WebElement buttonSubmit;
+
+		public PersonForm(WebDriver driver) {
+			this.wait = new WebDriverWait(driver, 1);
+			
+			final WebElement form = driver.findElement(By.id(FORM_ID));
+			
+			this.fieldName = form.findElement(By.name("name"));
+			this.fieldSurname = form.findElement(By.name("surname"));
+			this.buttonClear = form.findElement(By.id("btnClear"));
+			this.buttonSubmit = form.findElement(By.id("btnSubmit"));
+		}
+		
+		public void submit() {
+			this.buttonSubmit.click();
+			
+		    this.waitForCleanFields();
+		}
+		
+		public void clear() {
+			this.buttonClear.click();
+			
+			this.waitForCleanFields();
+		}
+		
+		public void setName(String name) {
+			this.fieldName.clear();
+			this.fieldName.sendKeys(name);
+		}
+		
+		public void setSurname(String surname) {
+			this.fieldSurname.clear();
+			this.fieldSurname.sendKeys(surname);
+		}
+		
+		public String getName() {
+			return this.fieldName.getText();
+		}
+		
+		public String getSurname() {
+			return this.fieldSurname.getText();
+		}
+		
+		private void waitForCleanFields() {
+			wait.until(textToBePresentInElement(fieldName, ""));
+			wait.until(textToBePresentInElement(fieldSurname, ""));
+		}
+	}
+}

src/test/resources/datasets/dataset-add.xml

@@ -16,4 +16,10 @@
 
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
+	
+	<pet id="1" name="Brune" owner="7"/>
+	<pet id="2" name="Toby" owner="7"/>
+	<pet id="3" name="Zeus" owner="7"/>
+	<pet id="4" name="Luna" owner="7"/>
+	
 </dataset>
\ No newline at end of file

src/test/resources/datasets/dataset-delete.xml

@@ -14,4 +14,9 @@
 
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
+	
+	
+	<pet id="2" name="Toby" owner="7"/>
+	<pet id="3" name="Zeus" owner="7"/>
+	
 </dataset>
\ No newline at end of file

src/test/resources/datasets/dataset-modify.xml

@@ -15,4 +15,9 @@
 
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
+	
+	<pet id="1" name="Luna" owner="7"/>
+	<pet id="2" name="Toby" owner="7"/>
+	<pet id="3" name="Zeus" owner="7"/>
+	
 </dataset>
\ No newline at end of file

src/test/resources/datasets/dataset.dtd

 <?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT dataset (people*, users*)>
+<!ELEMENT dataset (people*, users*, pet*)>
 <!ELEMENT people EMPTY>
 <!ELEMENT users EMPTY>
+<!ELEMENT pet EMPTY>
 <!ATTLIST people
     id CDATA #IMPLIED
     name CDATA #IMPLIED
@@ -12,3 +13,8 @@
     password CDATA #IMPLIED
     role CDATA #IMPLIED
 >
+<!ATTLIST pet
+    id CDATA #IMPLIED
+    name CDATA #IMPLIED
+    owner CDATA #IMPLIED
+>

src/test/resources/datasets/dataset.xml

@@ -15,4 +15,9 @@
 
 	<users login="admin" password="713bfda78870bf9d1b261f565286f85e97ee614efe5f0faf7c34e7ca4f65baca" role="ADMIN"/>
 	<users login="normal" password="7bf24d6ca2242430343ab7e3efb89559a47784eea1123be989c1b2fb2ef66e83" role="USER" />
+	
+	<pet id="1" name="Brune" owner="7"/>
+	<pet id="2" name="Toby" owner="7"/>
+	<pet id="3" name="Zeus" owner="7"/>
+	
 </dataset>
\ No newline at end of file

src/test/resources/db/hsqldb-drop.sql

 DROP TABLE People IF EXISTS;
 DROP TABLE Users IF EXISTS;
+DROP TABLE Pet IF EXISTS;

src/test/resources/db/hsqldb.sql

@@ -10,4 +10,11 @@ CREATE TABLE users (
 	password VARCHAR(64) NOT NULL,
 	role VARCHAR(5) NOT NULL,
 	PRIMARY KEY (login)
-);
\ No newline at end of file
+);
+
+CREATE TABLE pet (
+	id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1) NOT NULL,
+	name varchar(50) NOT NULL,
+	owner int NOT NULL,
+	PRIMARY KEY (id)
+)
\ No newline at end of file