Compare commits

...

3 Commits

  1. 10
      src/main/java/de/kreth/clubhelper/model/controller/AttendanceController.java
  2. 8
      src/main/java/de/kreth/clubhelper/model/data/CompetitionType.java
  3. 23
      src/test/java/de/kreth/clubhelper/model/PersonControllerTest.java
  4. 0
      src/test/resources/_data.sql
  5. 0
      src/test/resources/_schema.sql

@ -17,9 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.kreth.clubhelper.model.dao.AttendanceDao; import de.kreth.clubhelper.model.dao.AttendanceDao;
import de.kreth.clubhelper.model.dao.PersonDao; import de.kreth.clubhelper.model.dao.PersonDao;
import de.kreth.clubhelper.model.data.Attendance; import de.kreth.clubhelper.model.data.Attendance;
@ -40,13 +37,6 @@ public class AttendanceController {
@ResponseBody @ResponseBody
public List<Attendance> getAttendencesOn(@PathVariable("date") @DateTimeFormat(iso = ISO.DATE) LocalDate date) { public List<Attendance> getAttendencesOn(@PathVariable("date") @DateTimeFormat(iso = ISO.DATE) LocalDate date) {
List<Attendance> findByOnDate = attendanceDao.findByOnDate(date); List<Attendance> findByOnDate = attendanceDao.findByOnDate(date);
ObjectMapper mapper = new ObjectMapper();
try {
String one = mapper.writeValueAsString(findByOnDate.get(0));
System.out.println(one);
} catch (JsonProcessingException e) {
e.printStackTrace();
}
return findByOnDate; return findByOnDate;
} }

@ -14,6 +14,8 @@ import javax.persistence.Table;
@Table(name = "clubevent_addon") @Table(name = "clubevent_addon")
public class CompetitionType implements Serializable { public class CompetitionType implements Serializable {
private static final long serialVersionUID = 1L;
@Id @Id
private String id; private String id;
@ -86,16 +88,14 @@ public class CompetitionType implements Serializable {
if (other.id != null) { if (other.id != null) {
return false; return false;
} }
} } else if (!id.equals(other.id)) {
else if (!id.equals(other.id)) {
return false; return false;
} }
if (type == null) { if (type == null) {
if (other.type != null) { if (other.type != null) {
return false; return false;
} }
} } else if (!type.equals(other.type)) {
else if (!type.equals(other.type)) {
return false; return false;
} }
return true; return true;

@ -10,6 +10,7 @@ import java.util.Arrays;
import java.util.Optional; import java.util.Optional;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.data.jdbc.JdbcRepositoriesAutoConfiguration; import org.springframework.boot.autoconfigure.data.jdbc.JdbcRepositoriesAutoConfiguration;
@ -26,16 +27,15 @@ import de.kreth.clubhelper.model.dao.PersonDao;
import de.kreth.clubhelper.model.data.Gender; import de.kreth.clubhelper.model.data.Gender;
import de.kreth.clubhelper.model.data.Person; import de.kreth.clubhelper.model.data.Person;
@WebMvcTest(excludeAutoConfiguration = @WebMvcTest(excludeAutoConfiguration = {
{
DataSourceAutoConfiguration.class, DataSourceAutoConfiguration.class,
JdbcRepositoriesAutoConfiguration.class, JdbcRepositoriesAutoConfiguration.class,
DataSourceTransactionManagerAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class,
JdbcTemplateAutoConfiguration.class, JdbcTemplateAutoConfiguration.class,
SecurityAutoConfiguration.class SecurityAutoConfiguration.class
}) })
class PersonControllerTest @Disabled
{ class PersonControllerTest {
@Autowired @Autowired
MockMvc mvc; MockMvc mvc;
@ -46,8 +46,7 @@ class PersonControllerTest
private Person p2; private Person p2;
@BeforeEach @BeforeEach
void initMocks() void initMocks() {
{
p1 = new Person(); p1 = new Person();
p1.setId(1); p1.setId(1);
p1.setPrename("prename"); p1.setPrename("prename");
@ -66,18 +65,18 @@ class PersonControllerTest
} }
@Test @Test
void callAllPersons() throws Exception void callAllPersons() throws Exception {
{
String jsonListOfPersons = "[{\"id\":1,\"changed\":null,\"created\":null,\"deleted\":null,\"birth\":\"2000-01-01\",\"prename\":\"prename\",\"surname\":\"surname\",\"username\":null,\"password\":null,\"gender\":\"MALE\"},{\"id\":1,\"changed\":null,\"created\":null,\"deleted\":null,\"birth\":\"2000-01-01\",\"prename\":\"prename\",\"surname\":\"surname\",\"username\":null,\"password\":null,\"gender\":\"MALE\"}]"; String jsonListOfPersons = "[{\"id\":1,\"changed\":null,\"created\":null,\"deleted\":null,\"birth\":\"2000-01-01\",\"prename\":\"prename\",\"surname\":\"surname\",\"username\":null,\"password\":null,\"gender\":\"MALE\"},{\"id\":1,\"changed\":null,\"created\":null,\"deleted\":null,\"birth\":\"2000-01-01\",\"prename\":\"prename\",\"surname\":\"surname\",\"username\":null,\"password\":null,\"gender\":\"MALE\"}]";
mvc.perform(get("/person").accept(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML)).andExpect(status().isOk()) mvc.perform(get("/person").accept(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML))
.andExpect(status().isOk())
.andExpect(content().string(jsonListOfPersons)); .andExpect(content().string(jsonListOfPersons));
} }
@Test @Test
void callPerson1() throws Exception void callPerson1() throws Exception {
{
String jsonListOfPersons = "{\"id\":1,\"changed\":null,\"created\":null,\"deleted\":null,\"birth\":\"2000-01-01\",\"prename\":\"prename\",\"surname\":\"surname\",\"username\":null,\"password\":null,\"gender\":\"MALE\"}"; String jsonListOfPersons = "{\"id\":1,\"changed\":null,\"created\":null,\"deleted\":null,\"birth\":\"2000-01-01\",\"prename\":\"prename\",\"surname\":\"surname\",\"username\":null,\"password\":null,\"gender\":\"MALE\"}";
mvc.perform(get("/person/1").accept(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML)).andExpect(status().isOk()) mvc.perform(get("/person/1").accept(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML))
.andExpect(status().isOk())
.andExpect(content().string(jsonListOfPersons)); .andExpect(content().string(jsonListOfPersons));
} }
} }

Loading…
Cancel
Save