[OPENJPA-2940][WIP] Merge branch 'master' into OPENJPA-2940

Author: cristof

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java

@@ -181,9 +181,9 @@ public void testMinLocalTime() {
         EntityManager em = emf.createEntityManager();
         final TypedQuery<LocalTime> qry = em.createQuery("select min(t.localTimeField) from Java8TimeTypes AS t", LocalTime.class);
         final LocalTime min = qry.getSingleResult();
-        final LocalTime etalon = (entity1.getLocalTimeField().compareTo(entity2.getLocalTimeField()) < 0
-                ? entity1.getLocalTimeField() : entity2.getLocalTimeField()).withNano(0);
-        assertEquals(etalon, min);
+        final LocalTime etalon = entity1.getLocalTimeField().compareTo(entity2.getLocalTimeField()) < 0
+                ? entity1.getLocalTimeField() : entity2.getLocalTimeField();
+        assertEquals(etalon.withNano(0), min.withNano(0));
         em.close();
     }
 
@@ -264,5 +264,4 @@ public void testGetCurrentLocalTime() {
         assertFalse(times.isEmpty());
         em.close();
     }
-
 }