fix all test

This commit is contained in:
Looly 2024-09-24 12:48:52 +08:00
parent 702253aaf6
commit 68a6994858
3 changed files with 11 additions and 5 deletions

View File

@ -65,7 +65,6 @@ public class JSONPrimitiveTypeAdapter implements MatcherJSONSerializer<Object>,
public Object deserialize(final JSON json, final Type deserializeType) {
final Object value = json.asJSONPrimitive().getValue();
if (null != value && TypeUtil.getClass(deserializeType).isAssignableFrom(value.getClass())) {
return value;
}

View File

@ -16,7 +16,6 @@
package org.dromara.hutool.json;
import org.dromara.hutool.core.bean.BeanUtil;
import lombok.Data;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@ -28,7 +27,7 @@ public class IssueI3EGJPTest {
final JSONObject paramJson = new JSONObject();
paramJson.set("is_booleana", "1");
paramJson.set("is_booleanb", true);
final ConvertDO convertDO = BeanUtil.toBean(paramJson, ConvertDO.class);
final ConvertDO convertDO = paramJson.toBean(ConvertDO.class);
Assertions.assertTrue(convertDO.isBooleana());
Assertions.assertTrue(convertDO.getIsBooleanb());

View File

@ -19,6 +19,8 @@ package org.dromara.hutool.json.jwt;
import lombok.Data;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.date.format.GlobalCustomFormat;
import org.dromara.hutool.json.JSONConfig;
import org.dromara.hutool.json.JSONObject;
import org.dromara.hutool.json.JSONUtil;
import org.junit.jupiter.api.Assertions;
@ -38,7 +40,10 @@ public class IssueI6IS5BTest {
final LocalDateTime iat = TimeUtil.of(DateUtil.parse("2023-03-03"));
final JwtToken jwtToken = new JwtToken();
jwtToken.setIat(iat);
final String token = JWTUtil.createToken(JSONUtil.parseObj(jwtToken), "123".getBytes(StandardCharsets.UTF_8));
final JSONObject payloadsData = JSONUtil.parseObj(jwtToken, JSONConfig.of().setDateFormat(GlobalCustomFormat.FORMAT_SECONDS));
final String token = JWTUtil.createToken(payloadsData, "123".getBytes(StandardCharsets.UTF_8));
Assertions.assertEquals("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2Nzc3NzI4MDB9.SXU_mm1wT5lNoK-Dq5Y8f3BItv_44zuAlyeWLqajpXg", token);
final JSONObject payloads = JWTUtil.parseToken(token).getPayloads();
Assertions.assertEquals("{\"iat\":1677772800}", payloads.toString());
@ -56,7 +61,10 @@ public class IssueI6IS5BTest {
final Date iat = DateUtil.parse("2023-03-03");
final JwtToken2 jwtToken = new JwtToken2();
jwtToken.setIat(iat);
final String token = JWTUtil.createToken(JSONUtil.parseObj(jwtToken), "123".getBytes(StandardCharsets.UTF_8));
final JSONObject payloadsData = JSONUtil.parseObj(jwtToken, JSONConfig.of().setDateFormat(GlobalCustomFormat.FORMAT_SECONDS));
final String token = JWTUtil.createToken(payloadsData, "123".getBytes(StandardCharsets.UTF_8));
Assertions.assertEquals("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2Nzc3NzI4MDB9.SXU_mm1wT5lNoK-Dq5Y8f3BItv_44zuAlyeWLqajpXg", token);
final JSONObject payloads = JWTUtil.parseToken(token).getPayloads();
Assertions.assertEquals("{\"iat\":1677772800}", payloads.toString());