From d64f01d0d50c822ced1e802a81cdea234dda8a19 Mon Sep 17 00:00:00 2001 From: John Niang Date: Mon, 19 May 2025 18:04:02 +0800 Subject: [PATCH] Fix unit test due to dependency update --- .../infra/utils/FileTypeDetectUtilsTest.java | 2 +- ...tTemplateHeadProcessorIntegrationTest.java | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/application/src/test/java/run/halo/app/infra/utils/FileTypeDetectUtilsTest.java b/application/src/test/java/run/halo/app/infra/utils/FileTypeDetectUtilsTest.java index 8cf0b4fe0..4e1b58fcc 100644 --- a/application/src/test/java/run/halo/app/infra/utils/FileTypeDetectUtilsTest.java +++ b/application/src/test/java/run/halo/app/infra/utils/FileTypeDetectUtilsTest.java @@ -36,7 +36,7 @@ class FileTypeDetectUtilsTest { void detectMimeTypeWithNameTest() throws IOException { var stream = getFileInputStream("classpath:file-type-detect/index.js"); String mimeType = FileTypeDetectUtils.detectMimeType(stream, "index.js"); - assertThat(mimeType).isEqualTo("application/javascript"); + assertThat(mimeType).isEqualTo("text/javascript"); stream = getFileInputStream("classpath:file-type-detect/index.html"); mimeType = diff --git a/application/src/test/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessorIntegrationTest.java b/application/src/test/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessorIntegrationTest.java index 2ab16d454..4f4330acc 100644 --- a/application/src/test/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessorIntegrationTest.java +++ b/application/src/test/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessorIntegrationTest.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -106,11 +107,11 @@ class ContentTemplateHeadProcessorIntegrationTest { .thenReturn(Mono.empty()); lenient().when(applicationContext.getBeanProvider(ExtensionGetter.class)) - .thenAnswer(invocation -> { - var objectProvider = mock(ObjectProvider.class); - when(objectProvider.getIfUnique()).thenReturn(extensionGetter); - return objectProvider; - }); + .thenAnswer(invocation -> { + var objectProvider = mock(ObjectProvider.class); + when(objectProvider.getIfUnique()).thenReturn(extensionGetter); + return objectProvider; + }); lenient().when(extensionGetter.getExtensions(TemplateHeadProcessor.class)).thenReturn( Flux.fromIterable(map.values()).sort(AnnotationAwareOrderComparator.INSTANCE) ); @@ -145,7 +146,9 @@ class ContentTemplateHeadProcessorIntegrationTest { 2. global head meta is overridden by content head meta 3. but global head meta is not overridden by global seo meta */ - assertThat(Jsoup.parse(result).html()).isEqualTo(""" + var outputSettings = new Document.OutputSettings().prettyPrint(true); + var actual = Jsoup.parse(result).outputSettings(outputSettings).html(); + var expected = Jsoup.parse(""" @@ -155,10 +158,10 @@ class ContentTemplateHeadProcessorIntegrationTest { - - this is body - - """); + this is body + """ + ).outputSettings(outputSettings).html(); + assertThat(actual).isEqualTo(expected); } Map mutableMetaMap(String nameValue, String contentValue) {