QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-22 15:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increasing some test coverage

Browse Source
This commit is contained in:
darin.kelkhoff
2025-07-21 20:11:52 -05:00
parent d9f5b5ac72
commit bd69a5222e
2 changed files with 199 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/ValueUtils.java
View File

@ -362,6 +362,11 @@ public class ValueUtils
}
else if(value instanceof String s)
{
if(!StringUtils.hasContent(s))
{
return (null);
}
return LocalDateTime.parse(s);
}
else
@ -855,16 +860,22 @@ public class ValueUtils
*******************************************************************************/
public static Instant getStartOfTodayInZoneId(String zoneId)
{
///////////////////////////
// get the instant 'now' //
///////////////////////////
ZoneId zone = ZoneId.of(zoneId);
Instant computerTime = Instant.now();
return (getStartOfDayInZoneId(Instant.now(), zoneId));
}
/*******************************************************************************
**
*******************************************************************************/
public static Instant getStartOfDayInZoneId(Instant when, String zoneId)
{
ZoneId zone = ZoneId.of(zoneId);
//////////////////////////////////////////////////////////////////////////////
// get date time for now in given zone, truncate it and add offset from utc //
//////////////////////////////////////////////////////////////////////////////
LocalDateTime givenZonesNow = LocalDateTime.ofInstant(Instant.now(), zone);
LocalDateTime givenZonesNow = LocalDateTime.ofInstant(when, zone);
LocalDateTime startOfDay = givenZonesNow.truncatedTo(ChronoUnit.DAYS);
return (startOfDay.toInstant(zone.getRules().getOffset(startOfDay)));
}
@ -876,16 +887,22 @@ public class ValueUtils
*******************************************************************************/
public static Instant getStartOfMonthInZoneId(String zoneId)
{
///////////////////////////
// get the instant 'now' //
///////////////////////////
ZoneId zone = ZoneId.of(zoneId);
Instant computerTime = Instant.now();
return (getStartOfMonthInZoneId(Instant.now(), zoneId));
}
/*******************************************************************************
**
*******************************************************************************/
public static Instant getStartOfMonthInZoneId(Instant when, String zoneId)
{
ZoneId zone = ZoneId.of(zoneId);
//////////////////////////////////////////////////////////////////////////////
// get date time for now in given zone, truncate it and add offset from utc //
//////////////////////////////////////////////////////////////////////////////
LocalDateTime givenZonesNow = LocalDateTime.ofInstant(Instant.now(), zone);
LocalDateTime givenZonesNow = LocalDateTime.ofInstant(when, zone);
LocalDateTime startOfMonth = givenZonesNow
.withDayOfMonth(1)
.with(ChronoField.HOUR_OF_DAY, 0)
@ -902,16 +919,21 @@ public class ValueUtils
*******************************************************************************/
public static Instant getStartOfYearInZoneId(String zoneId)
{
///////////////////////////
// get the instant 'now' //
///////////////////////////
ZoneId zone = ZoneId.of(zoneId);
Instant computerTime = Instant.now();
return getStartOfYearInZoneId(Instant.now(), zoneId);
}
/*******************************************************************************
**
*******************************************************************************/
public static Instant getStartOfYearInZoneId(Instant when, String zoneId)
{
ZoneId zone = ZoneId.of(zoneId);
//////////////////////////////////////////////////////////////////////////////
// get date time for now in given zone, truncate it and add offset from utc //
//////////////////////////////////////////////////////////////////////////////
LocalDateTime givenZonesNow = LocalDateTime.ofInstant(Instant.now(), zone);
LocalDateTime givenZonesNow = LocalDateTime.ofInstant(when, zone);
LocalDateTime startOfYear = givenZonesNow
.withDayOfYear(1)
.with(ChronoField.HOUR_OF_DAY, 0)

159
qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/ValueUtilsTest.java
View File

@ -24,6 +24,7 @@ package com.kingsrook.qqq.backend.core.utils;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.MathContext;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
@ -35,6 +36,8 @@ import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Map;
import com.kingsrook.qqq.backend.core.BaseTest;
import com.kingsrook.qqq.backend.core.actions.automation.AutomationStatus;
import com.kingsrook.qqq.backend.core.context.QContext;
@ -81,6 +84,7 @@ class ValueUtilsTest extends BaseTest
/*******************************************************************************
**
*******************************************************************************/
@SuppressWarnings("UnnecessaryBoxing")
@Test
void testGetValueAsBoolean() throws QValueException
{
@ -90,6 +94,11 @@ class ValueUtilsTest extends BaseTest
assertTrue(ValueUtils.getValueAsBoolean("TRUE"));
assertFalse(ValueUtils.getValueAsBoolean("false"));
assertFalse(ValueUtils.getValueAsBoolean(false));
assertTrue(ValueUtils.getValueAsBoolean(true));
assertFalse(ValueUtils.getValueAsBoolean(Boolean.valueOf(false)));
assertTrue(ValueUtils.getValueAsBoolean(Boolean.valueOf(true)));
///////////////////////////////////////////////////////////////////////
// time used to be, that "yes" was false... changing that 2023-10-20 //
///////////////////////////////////////////////////////////////////////
@ -128,6 +137,7 @@ class ValueUtilsTest extends BaseTest
assertEquals(1_000_000, ValueUtils.getValueAsInteger("1,000,000"));
assertEquals(1, ValueUtils.getValueAsInteger(new BigDecimal(1)));
assertEquals(1, ValueUtils.getValueAsInteger(new BigDecimal("1.00")));
assertEquals(1, ValueUtils.getValueAsInteger(new BigInteger("1")));
assertEquals(-1, ValueUtils.getValueAsInteger("-1.00"));
assertEquals(1_000, ValueUtils.getValueAsInteger("1,000.00"));
assertEquals(1_000, ValueUtils.getValueAsInteger(1000L));
@ -146,6 +156,39 @@ class ValueUtilsTest extends BaseTest
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetValueAsLong() throws QValueException
{
assertNull(ValueUtils.getValueAsLong(null));
assertNull(ValueUtils.getValueAsLong(""));
assertNull(ValueUtils.getValueAsLong(" "));
assertEquals(1L, ValueUtils.getValueAsLong(1));
assertEquals(1L, ValueUtils.getValueAsLong("1"));
assertEquals(1_000L, ValueUtils.getValueAsLong("1,000"));
assertEquals(1_000_000L, ValueUtils.getValueAsLong("1,000,000"));
assertEquals(1L, ValueUtils.getValueAsLong(new BigDecimal(1)));
assertEquals(1L, ValueUtils.getValueAsLong(new BigDecimal("1.00")));
assertEquals(1L, ValueUtils.getValueAsLong(new BigInteger("1")));
assertEquals(-1L, ValueUtils.getValueAsLong("-1.00"));
assertEquals(1_000L, ValueUtils.getValueAsLong("1,000.00"));
assertEquals(1_000L, ValueUtils.getValueAsLong(1000L));
assertEquals(1L, ValueUtils.getValueAsLong(1.0F));
assertEquals(1L, ValueUtils.getValueAsLong(1.0D));
assertEquals(AutomationStatus.PENDING_INSERT_AUTOMATIONS.getId().longValue(), ValueUtils.getValueAsLong(AutomationStatus.PENDING_INSERT_AUTOMATIONS));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsLong("a"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsLong("a,b"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsLong(new Object()));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsLong(1.1F));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsLong(1.1D));
}
/*******************************************************************************
**
*******************************************************************************/
@ -258,6 +301,26 @@ class ValueUtilsTest extends BaseTest
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetValueAsLocalDateTime() throws QValueException
{
assertNull(ValueUtils.getValueAsLocalDateTime(null));
assertNull(ValueUtils.getValueAsLocalDateTime(""));
assertNull(ValueUtils.getValueAsLocalDateTime(" "));
assertEquals(LocalDateTime.of(2025, Month.JANUARY, 2, 10, 42), ValueUtils.getValueAsLocalDateTime(LocalDateTime.of(2025, Month.JANUARY, 2, 10, 42)));
assertEquals(LocalDateTime.of(2025, Month.JANUARY, 2, 10, 42), ValueUtils.getValueAsLocalDateTime("2025-01-02T10:42"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsLocalDateTime("a"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsLocalDateTime("a,b"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsLocalDateTime("1980/05/31"));
assertThat(assertThrows(QValueException.class, () -> ValueUtils.getValueAsLocalDateTime(new Object())).getMessage()).contains("Unsupported class");
}
/*******************************************************************************
**
*******************************************************************************/
@ -362,4 +425,100 @@ class ValueUtilsTest extends BaseTest
assertEquals(QFieldType.TIME, ValueUtils.inferQFieldTypeFromValue(LocalTime.now(), null));
}
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetValueAsByteArray()
{
assertNull(ValueUtils.getValueAsByteArray(null));
assertArrayEquals(new byte[] { 0x01, 0x02, 0x03 }, ValueUtils.getValueAsByteArray(new byte[] { 0x01, 0x02, 0x03 }));
assertArrayEquals(new byte[] { 104, 105 }, ValueUtils.getValueAsByteArray("hi"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsByteArray(1));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsByteArray(new Object()));
}
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetValueAsFieldType()
{
assertEquals("Hello", ValueUtils.getValueAsFieldType(QFieldType.STRING, "Hello"));
assertEquals("Hello", ValueUtils.getValueAsFieldType(QFieldType.PASSWORD, "Hello"));
assertEquals("Hello", ValueUtils.getValueAsFieldType(QFieldType.TEXT, "Hello"));
assertEquals("Hello", ValueUtils.getValueAsFieldType(QFieldType.HTML, "Hello"));
assertEquals("1", ValueUtils.getValueAsFieldType(QFieldType.TEXT, 1));
assertEquals(1, ValueUtils.getValueAsFieldType(QFieldType.INTEGER, 1));
assertEquals(1, ValueUtils.getValueAsFieldType(QFieldType.INTEGER, "1"));
assertEquals(BigDecimal.ONE, ValueUtils.getValueAsFieldType(QFieldType.DECIMAL, "1"));
assertEquals(1L, ValueUtils.getValueAsFieldType(QFieldType.LONG, "1"));
assertEquals(false, ValueUtils.getValueAsFieldType(QFieldType.BOOLEAN, "false"));
assertEquals(LocalDate.of(1980, Month.MAY, 31), ValueUtils.getValueAsFieldType(QFieldType.DATE, "1980-05-31"));
assertEquals(Instant.parse("2025-07-21T19:50:00Z"), ValueUtils.getValueAsFieldType(QFieldType.DATE_TIME, "2025-07-21T19:50"));
assertEquals(LocalTime.of(10, 24), ValueUtils.getValueAsFieldType(QFieldType.TIME, "10:24"));
assertArrayEquals(new byte[] { 104, 105 }, (byte[]) ValueUtils.getValueAsFieldType(QFieldType.BLOB, "hi"));
}
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetValueAsMap()
{
assertNull(ValueUtils.getValueAsMap(null));
assertEquals(Map.of("one", 1), ValueUtils.getValueAsMap(new HashMap<>(Map.of("one", 1))));
assertEquals(Map.of("two", 2, "three", 3), ValueUtils.getValueAsMap("""
{"two":2, "three": 3}"""));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsMap("{{}"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsMap("?"));
assertThrows(QValueException.class, () -> ValueUtils.getValueAsMap(1));
}
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetStartOfDayInZoneId()
{
assertEquals(Instant.parse("2025-07-21T00:00:00Z"), ValueUtils.getStartOfDayInZoneId(Instant.parse("2025-07-21T04:30:00Z"), "UTC"));
assertEquals(Instant.parse("2025-07-20T05:00:00Z"), ValueUtils.getStartOfDayInZoneId(Instant.parse("2025-07-21T04:30:00Z"), "US/Central"));
assertEquals(Instant.parse("2025-07-21T05:00:00Z"), ValueUtils.getStartOfDayInZoneId(Instant.parse("2025-07-21T05:30:00Z"), "US/Central"));
}
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetStartOfMonthInZoneId()
{
assertEquals(Instant.parse("2025-07-01T00:00:00Z"), ValueUtils.getStartOfMonthInZoneId(Instant.parse("2025-07-21T04:30:00Z"), "UTC"));
assertEquals(Instant.parse("2025-07-01T05:00:00Z"), ValueUtils.getStartOfMonthInZoneId(Instant.parse("2025-07-21T04:30:00Z"), "US/Central"));
assertEquals(Instant.parse("2025-07-01T05:00:00Z"), ValueUtils.getStartOfMonthInZoneId(Instant.parse("2025-07-21T05:30:00Z"), "US/Central"));
assertEquals(Instant.parse("2025-06-01T05:00:00Z"), ValueUtils.getStartOfMonthInZoneId(Instant.parse("2025-07-01T04:30:00Z"), "US/Central"));
}
/*******************************************************************************
**
*******************************************************************************/
@Test
void testGetStartOfYearInZoneId()
{
assertEquals(Instant.parse("2025-01-01T00:00:00Z"), ValueUtils.getStartOfYearInZoneId(Instant.parse("2025-07-21T04:30:00Z"), "UTC"));
assertEquals(Instant.parse("2025-01-01T06:00:00Z"), ValueUtils.getStartOfYearInZoneId(Instant.parse("2025-07-21T04:30:00Z"), "US/Central"));
assertEquals(Instant.parse("2025-01-01T06:00:00Z"), ValueUtils.getStartOfYearInZoneId(Instant.parse("2025-07-21T05:30:00Z"), "US/Central"));
assertEquals(Instant.parse("2024-01-01T06:00:00Z"), ValueUtils.getStartOfYearInZoneId(Instant.parse("2025-01-01T04:30:00Z"), "US/Central"));
}
}