From 1ae58f8b6ffaace2812ae6a9ca73c61f6c031ac7 Mon Sep 17 00:00:00 2001 From: Thomas Andraschko Date: Tue, 27 Feb 2024 10:33:42 +0100 Subject: [PATCH] progress on payara-build-managed --- .../data/impl/criteria/CriteriaTest.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java index c2de5a3b4..ec1d8713c 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java @@ -18,19 +18,8 @@ */ package org.apache.deltaspike.data.impl.criteria; -import static org.apache.deltaspike.data.test.util.TestDeployments.initDeployment; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; - import jakarta.inject.Inject; import jakarta.persistence.NonUniqueResultException; - import org.apache.deltaspike.data.test.TransactionalTestCase; import org.apache.deltaspike.data.test.domain.OneToMany; import org.apache.deltaspike.data.test.domain.OneToOne; @@ -45,6 +34,13 @@ import org.junit.Test; import org.junit.experimental.categories.Category; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import static org.apache.deltaspike.data.test.util.TestDeployments.initDeployment; +import static org.junit.Assert.*; + @Category(WebProfileCategory.class) public class CriteriaTest extends TransactionalTestCase { @@ -280,8 +276,8 @@ public void should_create_select_criteria_without_result_type() assertEquals(Integer.valueOf(10), result[0]); assertEquals(Integer.valueOf(99), result[1]); assertTrue(result[2] instanceof java.sql.Date); - assertTrue(result[3] instanceof java.sql.Time); - assertTrue(result[4] instanceof java.sql.Timestamp); + assertTrue(result[3] instanceof java.sql.Time || result[3] instanceof java.time.OffsetTime); + assertTrue(result[4] instanceof java.sql.Timestamp || result[4] instanceof java.time.OffsetDateTime); } @Test