diff --git a/db/mysql-with-inserts.sql b/db/mysql-with-inserts.sql index 9ce53af5d807f1389678307c1b2e89d3d32afa83..201521d7d45421af19f6c1a479f23cd2257ead8e 100644 --- a/db/mysql-with-inserts.sql +++ b/db/mysql-with-inserts.sql @@ -19,7 +19,7 @@ CREATE TABLE `daaexample`.`pets` ( `name` varchar(50) NOT NULL, `peopleID` int NOT NULL, PRIMARY KEY (`id`), - FOREIGN KEY (`peopleID`) REFERENCES people(id) + CONSTRAINT FK_PeoplePet FOREIGN KEY (`peopleID`) REFERENCES people(id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; GRANT ALL ON `daaexample`.* TO 'daa'@'localhost' IDENTIFIED BY 'daa'; diff --git a/db/mysql.sql b/db/mysql.sql index 420a55b0864d163187d5c0ee1ea13e55bdc4e483..fccfc567551cea3804c018138c4a80f63c14c7a0 100644 --- a/db/mysql.sql +++ b/db/mysql.sql @@ -19,7 +19,7 @@ CREATE TABLE `daaexample`.`pets` ( `name` varchar(50) NOT NULL, `peopleID` int NOT NULL, PRIMARY KEY (`id`), - FOREIGN KEY (`peopleID`) REFERENCES people(id) + CONSTRAINT FK_PeoplePet FOREIGN KEY (`peopleID`) REFERENCES people(id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; GRANT ALL ON `daaexample`.* TO 'daa'@'localhost' IDENTIFIED BY 'daa'; diff --git a/src/main/java/es/uvigo/esei/daa/entities/Pet.java b/src/main/java/es/uvigo/esei/daa/entities/Pet.java index 2a1c3d13c319c4b7664f104b03c3a3690d7d0a94..59431ef95cbefd15920a8492b8ec35e9824a526e 100644 --- a/src/main/java/es/uvigo/esei/daa/entities/Pet.java +++ b/src/main/java/es/uvigo/esei/daa/entities/Pet.java @@ -25,10 +25,6 @@ public class Pet { return id; } - public void setId(int id) { - this.id = id; - } - public String getName() { return name; } @@ -44,4 +40,26 @@ public class Pet { public void setPeopleID(int peopleID) { this.peopleID = requireNonNull(peopleID, "PeopleID can't be null"); } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + id; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof Pet)) + return false; + Pet other = (Pet) obj; + if (id != other.id) + return false; + return true; + } } diff --git a/src/test/java/es/uvigo/esei/daa/dataset/PetsDataset.java b/src/test/java/es/uvigo/esei/daa/dataset/PetsDataset.java new file mode 100644 index 0000000000000000000000000000000000000000..d78b54478cbd2f7b3b626094035943d4c789e707 --- /dev/null +++ b/src/test/java/es/uvigo/esei/daa/dataset/PetsDataset.java @@ -0,0 +1,66 @@ +package es.uvigo.esei.daa.dataset; + +import static java.util.Arrays.binarySearch; +import static java.util.Arrays.stream; + +import java.util.Arrays; +import java.util.function.Predicate; + +import es.uvigo.esei.daa.entities.Pet; + +public final class PetsDataset { + + private PetsDataset() {} + + public static Pet[] pets() { + return new Pet[] { + new Pet(1, "Test", 1), + new Pet(2, "Toby", 1), + new Pet(3, "Nala", 2), + new Pet(4, "Name", 4) + }; + } + + public static Pet[] petWithout(int ... ids) { + Arrays.sort(ids); + + final Predicate 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 2; + } + + public static int nonExistentId() { + return 132; + } + + public static Pet existentPet() { + return pet(existentId()); + } + + public static Pet nonExistentPet() { + return new Pet(nonExistentId(), "Toby", 1); + } + + public static String newName() { + return "Test"; + } + + public static int newPeopleID() { + return 3; + } + + public static Pet newPet() { + return new Pet(pets().length + 1, newName(), newPeopleID()); + } +} diff --git a/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java new file mode 100644 index 0000000000000000000000000000000000000000..e27a40e15240d3ea72be20b1550679cdf4e54995 --- /dev/null +++ b/src/test/java/es/uvigo/esei/daa/entities/PetUnitTest.java @@ -0,0 +1,82 @@ +package es.uvigo.esei.daa.entities; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; + +public class PetUnitTest { + + @Test + public void testPetIntStringInt() { + final int id = 1; + final String name = "Test"; + final int peopleID = 1; + + final Pet pet = new Pet(id, name, peopleID); + + assertThat(pet.getId(), is(equalTo(id))); + assertThat(pet.getName(), is(equalTo(name))); + assertThat(pet.getPeopleID(), is(equalTo(peopleID))); + } + + @Test(expected = NullPointerException.class) + public void testPetNullName() { + new Pet(1, null, 1); + } + + @Test + public void testSetName() { + final int id = 1; + final int peopleID = 1; + + final Pet pet = new Pet(id, "Test", peopleID); + pet.setName("Another Name"); + + assertThat(pet.getId(), is(equalTo(id))); + assertThat(pet.getName(), is(equalTo("Another Name"))); + assertThat(pet.getPeopleID(), is(equalTo(peopleID))); + } + + @Test(expected = NullPointerException.class) + public void testSetNullName() { + final Pet pet = new Pet(1, "Test", 1); + + pet.setName(null); + } + + @Test + public void testSetPeopleID() { + final int id = 1; + final String name = "Test"; + + final Pet pet = new Pet(id, name, 2); + pet.setPeopleID(1); + + assertThat(pet.getId(), is(equalTo(id))); + assertThat(pet.getName(), is(equalTo(name))); + assertThat(pet.getPeopleID(), is(equalTo(1))); + } + + @Test + public void testEqualsObject() { + final Pet pet1 = new Pet(1, "Test 1", 1); + final Pet pet2 = new Pet(1, "Test 2", 2); + + assertTrue(pet1.equals(pet2)); + } + + @Test + public void testEqualsHashcode() { + EqualsVerifier.forClass(Pet.class) + .withIgnoredFields("name", "peopleID") + .suppress(Warning.STRICT_INHERITANCE) + .suppress(Warning.NONFINAL_FIELDS) + .verify(); + } +} diff --git a/src/test/java/es/uvigo/esei/daa/matchers/IsEqualToPet.java b/src/test/java/es/uvigo/esei/daa/matchers/IsEqualToPet.java new file mode 100644 index 0000000000000000000000000000000000000000..67db2796c16498796b98f25d5df1922446f9c2ce --- /dev/null +++ b/src/test/java/es/uvigo/esei/daa/matchers/IsEqualToPet.java @@ -0,0 +1,56 @@ +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 { + + public IsEqualToPet(Pet entity) { + super(entity); + } + + @Override + protected boolean matchesSafely(Pet item) { + this.clearDescribeTo(); + + if(item == null) { + this.addTemplatedDescription("item", expected.toString()); + return false; + } else { + return checkAttribute("id", Pet::getId, item) + && checkAttribute("name", Pet::getName, item) + && checkAttribute("surname", Pet::getPeopleID, item); + } + } + + /** + * Factory method that creates a new {@link IsEqualToEntity} matcher with + * the provided {@link Pet} as the expected value. + * + * @param pet the expected pet. + * @return a new {@link IsEqualToEntity} matcher with the provided + * {@link Pet} as the expected value. + */ + @Factory + public static IsEqualToPet equalsToPet(Pet pet) { + return new IsEqualToPet(pet); + } + + /** + * Factory method that returns a new {@link Matcher} that includes several + * {@link IsEqualToPet} matchers, each one using an {@link Pet} of the + * provided ones as the expected value. + * + * @param pets the pets to be used as the expected values. + * @return a new {@link Matcher} that includes several + * {@link IsEqualToPet} matchers, each one using an {@link Pet} of the + * provided ones as the expected value. + * @see IsEqualToEntity#containsEntityInAnyOrder(java.util.function.Function, Object...) + */ + @Factory + public static Matcher> containsPetsInAnyOrder(Pet ... pets) { + return containsEntityInAnyOrder(IsEqualToPet::equalsToPet, pets); + } +} diff --git a/src/test/java/es/uvigo/esei/daa/rest/PetResourceTest.java b/src/test/java/es/uvigo/esei/daa/rest/PetResourceTest.java new file mode 100644 index 0000000000000000000000000000000000000000..1d2b406856d8cc2e5eeac47e4796a1502fa0ffae --- /dev/null +++ b/src/test/java/es/uvigo/esei/daa/rest/PetResourceTest.java @@ -0,0 +1,170 @@ +package es.uvigo.esei.daa.rest; + +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 org.junit.Assert.assertThat; +import static es.uvigo.esei.daa.dataset.PetsDataset.*; +import static es.uvigo.esei.daa.matchers.IsEqualToPet.*; +import static javax.ws.rs.client.Entity.entity; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.equalTo; + +import java.io.IOException; +import java.util.List; + +import javax.sql.DataSource; +import javax.ws.rs.core.Application; +import javax.ws.rs.core.Form; +import javax.ws.rs.core.GenericType; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +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 PetResourceTest 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 testListAll() throws IOException { + final Response response = target("pets").request() + .header("Authorization", "Basic " + userToken(adminLogin())) + .get(); + assertThat(response, hasOkStatus()); + + final List pets = response.readEntity(new GenericType>(){}); + assertThat(pets, containsPetsInAnyOrder(pets())); + } + + @Test + public void testListAllUnauthorized() throws IOException { + final Response response = target("pets").request() + .header("Authorization", "Basic " + userToken(normalLogin())) + .get(); + assertThat(response, hasUnauthorized()); + } + + @Test + public void testGet() throws IOException { + final Response response = target("pets/" + existentId()).request() + .header("Authorization", "Basic " + userToken(adminLogin())) + .get(); + assertThat(response, hasOkStatus()); + + final Pet pet = response.readEntity(Pet.class); + + assertThat(pet, is(equalsToPet(existentPet()))); + } + + @Test + public void testGetUnauthorized() throws IOException { + final Response response = target("pets/" + existentId()).request() + .header("Authorization", "Basic " + userToken(normalLogin())) + .get(); + assertThat(response, hasUnauthorized()); + } + + @Test + public void testGetInvalidId() throws IOException { + final Response response = target("pets/" + nonExistentId()).request() + .header("Authorization", "Basic " + userToken(adminLogin())) + .get(); + + assertThat(response, hasBadRequestStatus()); + } + + @Test + public void testModifyName() throws IOException { + final Form form = new Form(); + form.param("name", newName()); + + final Response response = target("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("/datasets/dataset-delete.xml") + public void testDelete() throws IOException { + final Response response = target("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("pets/" + existentId()).request() + .header("Authorization", "Basic " + userToken(normalLogin())) + .delete(); + + assertThat(response, hasUnauthorized()); + } + + @Test + public void testDeleteInvalidId() throws IOException { + final Response response = target("pets/" + nonExistentId()).request() + .header("Authorization", "Basic " + userToken(adminLogin())) + .delete(); + + assertThat(response, hasBadRequestStatus()); + } +} diff --git a/src/test/resources/datasets/dataset-add.xml b/src/test/resources/datasets/dataset-add.xml index 9a75a999a98510f7d6d32992877e71772e8f536c..86382db6b02228e4840805d023a439b8a303f454 100644 --- a/src/test/resources/datasets/dataset-add.xml +++ b/src/test/resources/datasets/dataset-add.xml @@ -16,4 +16,10 @@ + + + + + + \ 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..2f5732fac55ac9f9896aa78af63d31076b237103 100644 --- a/src/test/resources/datasets/dataset-delete.xml +++ b/src/test/resources/datasets/dataset-delete.xml @@ -14,4 +14,9 @@ + + + + + \ 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..1eddcc07c6b7d032032a7b44d1b3c1bcec5b8cb6 100644 --- a/src/test/resources/datasets/dataset-modify.xml +++ b/src/test/resources/datasets/dataset-modify.xml @@ -15,4 +15,9 @@ + + + + + \ No newline at end of file diff --git a/src/test/resources/datasets/dataset.dtd b/src/test/resources/datasets/dataset.dtd index e64500f9760310832c4352657d6b41454a653582..e827ccae2d22229e7a9dd43f7f87578db23462c8 100644 --- a/src/test/resources/datasets/dataset.dtd +++ b/src/test/resources/datasets/dataset.dtd @@ -1,7 +1,8 @@ - + + + diff --git a/src/test/resources/datasets/dataset.xml b/src/test/resources/datasets/dataset.xml index 3f48cc9b6888070b9fb5b4c42bee31f8eae267b6..58ce03643cde25328cd4b573d71866fb22e2f688 100644 --- a/src/test/resources/datasets/dataset.xml +++ b/src/test/resources/datasets/dataset.xml @@ -15,4 +15,9 @@ + + + + + \ No newline at end of file diff --git a/src/test/resources/db/hsqldb-drop.sql b/src/test/resources/db/hsqldb-drop.sql index 31f86431b16948308e44087e73b488fc3043628a..867d38704d2214a0740cb0555e1c6714cb22dde9 100644 --- a/src/test/resources/db/hsqldb-drop.sql +++ b/src/test/resources/db/hsqldb-drop.sql @@ -1,2 +1,3 @@ +DROP TABLE Pets IF EXISTS; DROP TABLE People IF EXISTS; DROP TABLE Users IF EXISTS; diff --git a/src/test/resources/db/hsqldb.sql b/src/test/resources/db/hsqldb.sql index a62944149d65c732b38a85ca9455f804265fd185..5fd9bf9b93b1e1e6ab6410000d65e5095539af71 100644 --- a/src/test/resources/db/hsqldb.sql +++ b/src/test/resources/db/hsqldb.sql @@ -10,4 +10,12 @@ CREATE TABLE users ( password VARCHAR(64) NOT NULL, role VARCHAR(5) NOT NULL, PRIMARY KEY (login) +); + +CREATE TABLE pets ( + id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1) NOT NULL, + name varchar(50) NOT NULL, + peopleID int NOT NULL, + PRIMARY KEY (id), + CONSTRAINT FK_PeoplePet FOREIGN KEY (peopleID) REFERENCES people(id) ); \ No newline at end of file