projects
/
jpa-converters
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d2eb7d
)
Prepared JpaConverterTest for test-cases with other entity-classes
author
Kai Moritz
<kai@juplo.de>
Wed, 16 Aug 2017 09:08:19 +0000
(11:08 +0200)
committer
Kai Moritz
<kai@juplo.de>
Wed, 16 Aug 2017 11:36:33 +0000
(13:36 +0200)
src/test/java/de/juplo/jpa/converters/JPAConverterTest.java
patch
|
blob
|
history
diff --git
a/src/test/java/de/juplo/jpa/converters/JPAConverterTest.java
b/src/test/java/de/juplo/jpa/converters/JPAConverterTest.java
index
c9f87cf
..
130aa7a
100644
(file)
--- a/
src/test/java/de/juplo/jpa/converters/JPAConverterTest.java
+++ b/
src/test/java/de/juplo/jpa/converters/JPAConverterTest.java
@@
-53,20
+53,19
@@
public class JPAConverterTest
public void testOffsetDateTime()
{
EierlegendeWollmilchSau ews;
public void testOffsetDateTime()
{
EierlegendeWollmilchSau ews;
- Long id;
TimeConversions.setZoneOffsetStrategy(new FixedZoneOffsetStrategy(defaultOffset));
ews = new EierlegendeWollmilchSau();
ews.odt = odt;
TimeConversions.setZoneOffsetStrategy(new FixedZoneOffsetStrategy(defaultOffset));
ews = new EierlegendeWollmilchSau();
ews.odt = odt;
-
id =
persist(ews);
- ews = retrieve(id);
+ persist(ews);
+ ews = retrieve(
EierlegendeWollmilchSau.class, ews.
id);
assertEquals(odt, ews.odt);
TimeConversions.setZoneOffsetStrategy(new FixedZoneOffsetStrategy(otherOffset));
ews = new EierlegendeWollmilchSau();
ews.odt = odt;
assertEquals(odt, ews.odt);
TimeConversions.setZoneOffsetStrategy(new FixedZoneOffsetStrategy(otherOffset));
ews = new EierlegendeWollmilchSau();
ews.odt = odt;
-
id =
persist(ews);
- ews = retrieve(id);
+ persist(ews);
+ ews = retrieve(
EierlegendeWollmilchSau.class, ews.
id);
assertEquals(odt.toInstant(), ews.odt.toInstant());
}
assertEquals(odt.toInstant(), ews.odt.toInstant());
}
@@
-88,43
+87,45
@@
public class JPAConverterTest
public void testZonedDateTime()
{
EierlegendeWollmilchSau ews;
public void testZonedDateTime()
{
EierlegendeWollmilchSau ews;
- Long id;
TimeConversions.setZoneIdStrategy(new FixedZoneIdStrategy(defaultZone));
ews = new EierlegendeWollmilchSau();
ews.zdt = zdt;
TimeConversions.setZoneIdStrategy(new FixedZoneIdStrategy(defaultZone));
ews = new EierlegendeWollmilchSau();
ews.zdt = zdt;
-
id =
persist(ews);
- ews = retrieve(id);
+ persist(ews);
+ ews = retrieve(
EierlegendeWollmilchSau.class, ews.
id);
assertEquals(zdt, ews.zdt);
TimeConversions.setZoneIdStrategy(new FixedZoneIdStrategy(otherZone));
ews = new EierlegendeWollmilchSau();
ews.zdt = zdt;
assertEquals(zdt, ews.zdt);
TimeConversions.setZoneIdStrategy(new FixedZoneIdStrategy(otherZone));
ews = new EierlegendeWollmilchSau();
ews.zdt = zdt;
-
id =
persist(ews);
- ews = retrieve(id);
+ persist(ews);
+ ews = retrieve(
EierlegendeWollmilchSau.class, ews.
id);
assertEquals(zdt.toInstant(), ews.zdt.toInstant());
}
assertEquals(zdt.toInstant(), ews.zdt.toInstant());
}
- private
Long persist(EierlegendeWollmilchSau ews
)
+ private
void persist(Object entity
)
{
EntityTransaction tx = em.getTransaction();
tx.begin();
{
EntityTransaction tx = em.getTransaction();
tx.begin();
- em.persist(e
ws
);
- log.info("persisting {}", e
ws
);
+ em.persist(e
ntity
);
+ log.info("persisting {}", e
ntity
);
tx.commit();
em.clear();
tx.commit();
em.clear();
- return ews.id;
}
}
- private
EierlegendeWollmilchSau retrieve(Long
id)
+ private
<T> T retrieve(Class<T> entityClass, Object
id)
{
{
- EierlegendeWollmilchSau ews;
EntityTransaction tx = em.getTransaction();
tx.begin();
EntityTransaction tx = em.getTransaction();
tx.begin();
- ews = em.find(EierlegendeWollmilchSau.class, id);
- tx.rollback();
- log.info("retrieved {}", ews);
- return ews;
+ try
+ {
+ log.info("retrieving {} of class {}", id, entityClass);
+ return em.find(entityClass, id);
+ }
+ finally
+ {
+ tx.rollback();
+ }
}
}
}
}