|
|
|
|
@ -9,10 +9,10 @@ import java.sql.Connection; |
|
|
|
|
import java.sql.ResultSet; |
|
|
|
|
import java.sql.SQLException; |
|
|
|
|
import java.sql.Statement; |
|
|
|
|
import java.time.LocalDate; |
|
|
|
|
import java.time.ZoneId; |
|
|
|
|
import java.time.ZonedDateTime; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Date; |
|
|
|
|
import java.util.HashSet; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Set; |
|
|
|
|
@ -35,7 +35,7 @@ public class ClubEventDataTest extends AbstractDatabaseTest { |
|
|
|
|
Person p = new Person(); |
|
|
|
|
p.setPrename("prename"); |
|
|
|
|
p.setSurname("surname"); |
|
|
|
|
p.setBirth(new Date()); |
|
|
|
|
p.setBirth(LocalDate.now()); |
|
|
|
|
Transaction tx = session.beginTransaction(); |
|
|
|
|
session.save(p); |
|
|
|
|
tx.commit(); |
|
|
|
|
@ -52,7 +52,7 @@ public class ClubEventDataTest extends AbstractDatabaseTest { |
|
|
|
|
Person p = new Person(); |
|
|
|
|
p.setPrename("prename_" + i); |
|
|
|
|
p.setSurname("surname_" + i); |
|
|
|
|
p.setBirth(new Date()); |
|
|
|
|
p.setBirth(LocalDate.now()); |
|
|
|
|
session.save(p); |
|
|
|
|
inserted.add(p); |
|
|
|
|
} |
|
|
|
|
@ -80,8 +80,7 @@ public class ClubEventDataTest extends AbstractDatabaseTest { |
|
|
|
|
session.save(ev); |
|
|
|
|
tx.commit(); |
|
|
|
|
|
|
|
|
|
Query<ClubEvent> query = session.createNamedQuery("ClubEvent.findAll", |
|
|
|
|
ClubEvent.class); |
|
|
|
|
Query<ClubEvent> query = session.createNamedQuery("ClubEvent.findAll", ClubEvent.class); |
|
|
|
|
List<ClubEvent> result = query.list(); |
|
|
|
|
assertEquals(1, result.size()); |
|
|
|
|
} |
|
|
|
|
@ -150,7 +149,7 @@ public class ClubEventDataTest extends AbstractDatabaseTest { |
|
|
|
|
person2.setId(person.getId() + 1); |
|
|
|
|
person2.setPrename(person.getPrename() + "_2"); |
|
|
|
|
person2.setSurname(person.getSurname() + "_2"); |
|
|
|
|
person2.setBirth(new Date()); |
|
|
|
|
person2.setBirth(LocalDate.now()); |
|
|
|
|
|
|
|
|
|
tx = session.beginTransaction(); |
|
|
|
|
session.save(person2); |
|
|
|
|
@ -212,13 +211,10 @@ public class ClubEventDataTest extends AbstractDatabaseTest { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private ClubEvent creteEvent() { |
|
|
|
|
ClubEvent ev = ClubEventBuilder.builder().withId("id").withAllDay(true) |
|
|
|
|
.withCaption("caption").withDescription("description") |
|
|
|
|
.withStart(ZonedDateTime.of(2018, 8, 13, 0, 0, 0, 0, |
|
|
|
|
ZoneId.systemDefault())) |
|
|
|
|
.withEnd(ZonedDateTime.of(2018, 8, 13, 0, 0, 0, 0, |
|
|
|
|
ZoneId.systemDefault())) |
|
|
|
|
.withiCalUID("iCalUID") |
|
|
|
|
ClubEvent ev = ClubEventBuilder.builder().withId("id").withAllDay(true).withCaption("caption") |
|
|
|
|
.withDescription("description") |
|
|
|
|
.withStart(ZonedDateTime.of(2018, 8, 13, 0, 0, 0, 0, ZoneId.systemDefault())) |
|
|
|
|
.withEnd(ZonedDateTime.of(2018, 8, 13, 0, 0, 0, 0, ZoneId.systemDefault())).withiCalUID("iCalUID") |
|
|
|
|
.withOrganizerDisplayName("organizerDisplayName").build(); |
|
|
|
|
return ev; |
|
|
|
|
} |
|
|
|
|
|