Skip to content

Commit

Permalink
Added the scenarios/features and the implmeentation of them
Browse files Browse the repository at this point in the history
  • Loading branch information
angelbn01 committed Apr 4, 2024
1 parent d9f898b commit 5b1486c
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 26 deletions.
4 changes: 1 addition & 3 deletions src/main/java/cat/udl/eps/softarch/demo/domain/Location.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@EqualsAndHashCode(callSuper = false)
public class Location {
@OneToOne
@NotNull
/*@NotNull*/
@JsonIdentityReference(alwaysAsId = true)
private Shelter shelter;

Expand All @@ -24,10 +24,8 @@ public class Location {
@NotBlank
private String address;

@NotNull
private Float latitude;

@NotNull
private Float longitude;

@NotBlank
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@
import cat.udl.eps.softarch.demo.domain.User;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.data.rest.core.annotation.RepositoryRestResource;

import java.util.List;
import java.util.Optional;

@RepositoryRestResource
public interface LocationRepository extends CrudRepository<Location, Long>, PagingAndSortingRepository<Location, Long> {
Location findLocationByAddressAndProvinceAndCityAndPostalCode(@Param("address") String address, @Param("province") String province, @Param("city") String city, @Param("postalCode") Integer postalCode);


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,25 @@
import io.cucumber.java.en.When;
import org.junit.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;

import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;


public class CreateLocationStepsDefs {

@Autowired
Expand All @@ -24,32 +35,68 @@ public class CreateLocationStepsDefs {

public static String newResourceUri;

@When("I create a new Location with the following details:$")
public void iCreateANewSeedWithScientificNameAndCommonName(Map<String, String> locationDetails) throws Throwable {
@When("There is already a Location with the following details:$")
public void thereIsAlreadyALocationWithTheFollowingDetails(Map<String, String> locationDetails) throws Throwable{
Location location = new Location();
location.setAddress(locationDetails.get("address"));
location.setLatitude(Float.parseFloat(locationDetails.get("latitude")));
location.setLongitude(Float.parseFloat(locationDetails.get("longitude")));
location.setProvince(locationDetails.get("province"));
location.setCity(locationDetails.get("city"));
location.setPostalCode(Integer.parseInt(locationDetails.get("postalCode")));
locationRepository.save(location);
}
@When("I create a new Location with the following details:$")
public void iCreateANewLocationWithTheFollowingDetails(Map<String, String> locationDetails) throws Throwable {
Location existingLocation = locationRepository.findLocationByAddressAndProvinceAndCityAndPostalCode(
locationDetails.get("address"),
locationDetails.get("province"),
locationDetails.get("city"),
Integer.parseInt(locationDetails.get("postalCode"))
);

if (existingLocation == null) {

Location location = new Location();
location.setAddress(locationDetails.get("address"));
location.setProvince(locationDetails.get("province"));
location.setCity(locationDetails.get("city"));
location.setPostalCode(Integer.parseInt(locationDetails.get("postalCode")));

// Verify and assign latitude and longitude if exists
if (locationDetails.containsKey("longitude") && locationDetails.get("longitude") != null) {
location.setLongitude(Float.parseFloat(locationDetails.get("longitude")));
}

stepDefs.result = stepDefs.mockMvc.perform(
post("/locations")
.contentType(MediaType.APPLICATION_JSON)
.content(stepDefs.mapper.writeValueAsString(location))
.characterEncoding(StandardCharsets.UTF_8)
.accept(MediaType.APPLICATION_JSON)
.with(AuthenticationStepDefs.authenticate()))
.andDo(print());
newResourceUri = stepDefs.result.andReturn().getResponse().getHeader("Location");

if (locationDetails.containsKey("latitude") && locationDetails.get("latitude") != null) {
location.setLatitude(Float.parseFloat(locationDetails.get("latitude")));
}

stepDefs.result = stepDefs.mockMvc.perform(
post("/locations")
.contentType(MediaType.APPLICATION_JSON)
.content(stepDefs.mapper.writeValueAsString(location))
.characterEncoding(StandardCharsets.UTF_8)
.accept(MediaType.APPLICATION_JSON)
.with(AuthenticationStepDefs.authenticate()))
.andDo(print());
newResourceUri = stepDefs.result.andReturn().getResponse().getHeader("Location");

} else {
assertThat(existingLocation).isNotNull();
}
}



@And("There is (\\d+) Location created$")
public void thereIsLocationCreated(int locationCreatedNum) {
Assert.assertEquals(locationCreatedNum, locationRepository.count());
}

@And("There is only (\\d+) Location with the details:$")
public void thereIsOnlyLocationWithTheDeatils(int locationCreatedNum, Map<String, String> locationDetails) {
Assert.assertEquals(locationCreatedNum, locationRepository.count());
}


}
29 changes: 21 additions & 8 deletions src/test/resources/features/CreateLocation.feature
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,45 @@ Feature: Create Location
Scenario: Create a Location with an existing address, city, province, and postal code
Given I can login with username "username" and password "password"
And There is already a Location with the following details:
| address | Major Street 3 |
| city | Seròs |
| province | Lleida |
| postalCode | 25183 |
When I attempt to create a new Location with the following details:
| address | Major Street 3 |
| province | Lleida |
| city | Seròs |
| postalCode | 25183 |
When I create a new Location with the following details:
| address | Major Street 3 |
| latitude | 41.6167 |
| longitude | 0.6222 |
| province | Lleida |
| city | Seròs |
| postalCode | 25183 |
Then The response code is 409
And There is 0 Location created
Then The response code is 200
And There is only 1 Location with the details:
| address | Major Street 3 |
| province | Lleida |
| city | Seròs |
| postalCode | 25183 |

Scenario: Attempt to create a Location with address blank and latitude null
Given I can login with username "username" and password "password"
When I create a new Location with the following details:
| address | |
| latitude | null |
| longitude | -74.0060 |
| province | Lleida |
| city | Seròs |
| postalCode | 25183 |
Then The response code is 400
And There is 0 Location created

Scenario: Attempt to create a Location with longitude null and latitude null
Given I can login with username "username" and password "password"
When I create a new Location with the following details:
| address | Major Street 3 |
| province | Lleida |
| city | Seròs |
| postalCode | 25183 |
Then The response code is 201
And There is 1 Location created

Scenario: Attempt to create a Location without being logged in
Given I'm not logged in
When I create a new Location with the following details:
Expand Down

0 comments on commit 5b1486c

Please sign in to comment.