fix code

hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithDate.java

@@ -18,11 +18,13 @@ package org.dromara.hutool.json.engine;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
+@NoArgsConstructor
 @AllArgsConstructor
 public class BeanWithDate {
 	private Date date1;

hutool-json/src/test/java/org/dromara/hutool/json/engine/BeanWithLocalDate.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Hutool Team and hutool.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.dromara.hutool.json.engine;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+public class BeanWithLocalDate {
+	private LocalDate date;
+}

hutool-json/src/test/java/org/dromara/hutool/json/engine/FastJSONTest.java

@@ -16,9 +16,6 @@
 
 package org.dromara.hutool.json.engine;
 
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.date.TimeUtil;
 import org.dromara.hutool.core.text.StrUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -39,30 +36,4 @@ public class FastJSONTest {
 			"	\"gender\":true\n" +
 			"}", jsonString);
 	}
-
-	@Test
-	void writeDateFormatTest() {
-		final DateTime date = DateUtil.parse("2024-01-01 01:12:21");
-		final BeanWithDate bean = new BeanWithDate(date, TimeUtil.of(date));
-		final JSONEngine engine = JSONEngineFactory.createEngine("fastjson");
-
-		final String jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{\"date1\":1704042741000,\"date2\":1704042741000}", jsonString);
-
-		engine.init(JSONEngineConfig.of().setDateFormat("yyyy-MM-dd HH:mm:ss"));
-		Assertions.assertEquals("{\"date1\":\"2024-01-01 01:12:21\",\"date2\":\"2024-01-01 01:12:21\"}", engine.toJsonString(bean));
-	}
-
-	@Test
-	void writeNullTest() {
-		final BeanWithDate bean = new BeanWithDate(null, null);
-		final JSONEngine engine = JSONEngineFactory.createEngine("fastjson");
-
-		String jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{}", jsonString);
-
-		engine.init(JSONEngineConfig.of().setIgnoreNullValue(false));
-		jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{\"date1\":null,\"date2\":null}", jsonString);
-	}
 }

hutool-json/src/test/java/org/dromara/hutool/json/engine/GsonTest.java

@@ -42,28 +42,16 @@ public class GsonTest {
 	}
 
 	@Test
-	void writeDateFormatTest() {
+	void writeLocalDateFormatTest() {
 		final DateTime date = DateUtil.parse("2024-01-01 01:12:21");
-		final BeanWithDate bean = new BeanWithDate(date, TimeUtil.of(date));
+		final BeanWithLocalDate bean = new BeanWithLocalDate(TimeUtil.of(date).toLocalDate());
 		final JSONEngine engine = JSONEngineFactory.createEngine("gson");
 
 		final String jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{\"date1\":1704042741000,\"date2\":1704042741000}", jsonString);
+		Assertions.assertEquals("{\"date\":1704038400000}", jsonString);
 
 		engine.init(JSONEngineConfig.of().setDateFormat("yyyy-MM-dd HH:mm:ss"));
-		Assertions.assertEquals("{\"date1\":\"2024-01-01 01:12:21\",\"date2\":\"2024-01-01 01:12:21\"}", engine.toJsonString(bean));
+		Assertions.assertEquals("{\"date\":\"2024-01-01 00:00:00\"}", engine.toJsonString(bean));
 	}
 
-	@Test
-	void writeNullTest() {
-		final BeanWithDate bean = new BeanWithDate(null, null);
-		final JSONEngine engine = JSONEngineFactory.createEngine("gson");
-
-		String jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{}", jsonString);
-
-		engine.init(JSONEngineConfig.of().setIgnoreNullValue(false));
-		jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{\"date1\":null,\"date2\":null}", jsonString);
-	}
 }

hutool-json/src/test/java/org/dromara/hutool/json/engine/HutoolJSONTest.java

@@ -16,9 +16,6 @@
 
 package org.dromara.hutool.json.engine;
 
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.date.TimeUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -36,30 +33,4 @@ public class HutoolJSONTest {
 			"  \"gender\": true\n" +
 			"}", jsonString);
 	}
-
-	@Test
-	void writeDateFormatTest() {
-		final DateTime date = DateUtil.parse("2024-01-01 01:12:21");
-		final BeanWithDate bean = new BeanWithDate(date, TimeUtil.of(date));
-		final JSONEngine engine = JSONEngineFactory.createEngine("hutool");
-
-		final String jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{\"date1\":1704042741000,\"date2\":1704042741000}", jsonString);
-
-		engine.init(JSONEngineConfig.of().setDateFormat("yyyy-MM-dd HH:mm:ss"));
-		Assertions.assertEquals("{\"date1\":\"2024-01-01 01:12:21\",\"date2\":\"2024-01-01 01:12:21\"}", engine.toJsonString(bean));
-	}
-
-	@Test
-	void writeNullTest() {
-		final BeanWithDate bean = new BeanWithDate(null, null);
-		final JSONEngine engine = JSONEngineFactory.createEngine("hutool");
-
-		String jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{}", jsonString);
-
-		engine.init(JSONEngineConfig.of().setIgnoreNullValue(false));
-		jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{\"date1\":null,\"date2\":null}", jsonString);
-	}
 }

hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineFactoryTest.java

@@ -20,7 +20,9 @@ import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.dromara.hutool.json.engine.fastjson.FastJSON2Engine;
 import org.dromara.hutool.json.engine.gson.GsonEngine;
+import org.dromara.hutool.json.engine.jackson.JacksonEngine;
 import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;

hutool-json/src/test/java/org/dromara/hutool/json/engine/JSONEngineTest.java

@@ -16,5 +16,66 @@
 
 package org.dromara.hutool.json.engine;
 
+import org.dromara.hutool.core.date.DateTime;
+import org.dromara.hutool.core.date.DateUtil;
+import org.dromara.hutool.core.date.TimeUtil;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
 public class JSONEngineTest {
+
+	private final String[] engineNames = {"jackson", "gson", "fastjson", "hutool"};
+
+	@Test
+	void writeDateFormatTest() {
+		Arrays.stream(engineNames).forEach(this::assertWriteDateFormat);
+	}
+
+	@Test
+	void writeNullTest() {
+		Arrays.stream(engineNames).forEach(this::assertWriteNull);
+	}
+
+	@Test
+	void writeLocalDateFormatTest() {
+		Arrays.stream(engineNames).forEach(this::assertWriteLocalDateFormat);
+	}
+
+	private void assertWriteDateFormat(final String engineName) {
+		final DateTime date = DateUtil.parse("2024-01-01 01:12:21");
+		final BeanWithDate bean = new BeanWithDate(date, TimeUtil.of(date));
+		final JSONEngine engine = JSONEngineFactory.createEngine(engineName);
+
+		final String jsonString = engine.toJsonString(bean);
+		Assertions.assertEquals("{\"date1\":1704042741000,\"date2\":1704042741000}", jsonString);
+
+		engine.init(JSONEngineConfig.of().setDateFormat("yyyy-MM-dd HH:mm:ss"));
+		Assertions.assertEquals("{\"date1\":\"2024-01-01 01:12:21\",\"date2\":\"2024-01-01 01:12:21\"}", engine.toJsonString(bean));
+	}
+
+	void assertWriteLocalDateFormat(final String engineName) {
+		final DateTime date = DateUtil.parse("2024-01-01 01:12:21");
+		final BeanWithLocalDate bean = new BeanWithLocalDate(TimeUtil.of(date).toLocalDate());
+		final JSONEngine engine = JSONEngineFactory.createEngine(engineName);
+
+		final String jsonString = engine.toJsonString(bean);
+		Assertions.assertEquals("{\"date\":1704038400000}", jsonString);
+
+		engine.init(JSONEngineConfig.of().setDateFormat("yyyy-MM-dd HH:mm:ss"));
+		Assertions.assertEquals("{\"date\":\"2024-01-01 00:00:00\"}", engine.toJsonString(bean));
+	}
+
+	private void assertWriteNull(final String engineName) {
+		final BeanWithDate bean = new BeanWithDate(null, null);
+		final JSONEngine engine = JSONEngineFactory.createEngine(engineName);
+
+		String jsonString = engine.toJsonString(bean);
+		Assertions.assertEquals("{}", jsonString);
+
+		engine.init(JSONEngineConfig.of().setIgnoreNullValue(false));
+		jsonString = engine.toJsonString(bean);
+		Assertions.assertEquals("{\"date1\":null,\"date2\":null}", jsonString);
+	}
 }

hutool-json/src/test/java/org/dromara/hutool/json/engine/JacksonTest.java

@@ -16,9 +16,6 @@
 
 package org.dromara.hutool.json.engine;
 
-import org.dromara.hutool.core.date.DateTime;
-import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.date.TimeUtil;
 import org.dromara.hutool.core.text.StrUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -42,31 +39,4 @@ public class JacksonTest {
 			"  \"gender\" : true\n" +
 			"}", jsonString);
 	}
-
-	@Test
-	void writeDateFormatTest() {
-		final DateTime date = DateUtil.parse("2024-01-01 01:12:21");
-		final BeanWithDate bean = new BeanWithDate(date, TimeUtil.of(date));
-		final JSONEngine engine = JSONEngineFactory.createEngine("jackson");
-
-		final String jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{\"date1\":1704042741000,\"date2\":[2024,1,1,1,12,21]}", jsonString);
-
-		//TODO LocalDateTime的格式化未解决
-		engine.init(JSONEngineConfig.of().setDateFormat("yyyy-MM-dd HH:mm:ss"));
-		Assertions.assertEquals("{\"date1\":\"2024-01-01 01:12:21\",\"date2\":\"2024-01-01T01:12:21\"}", engine.toJsonString(bean));
-	}
-
-	@Test
-	void writeNullTest() {
-		final BeanWithDate bean = new BeanWithDate(null, null);
-		final JSONEngine engine = JSONEngineFactory.createEngine("jackson");
-
-		String jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{}", jsonString);
-
-		engine.init(JSONEngineConfig.of().setIgnoreNullValue(false));
-		jsonString = engine.toJsonString(bean);
-		Assertions.assertEquals("{\"date1\":null,\"date2\":null}", jsonString);
-	}
 }