This commit is contained in:
Looly
2022-12-01 00:11:37 +08:00
parent 75d536839c
commit fd9f97a9c3
12 changed files with 182 additions and 202 deletions

View File

@@ -1,6 +1,8 @@
package cn.hutool.http;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.http.html.HtmlUtil;
import cn.hutool.http.meta.ContentTypeUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -182,4 +184,19 @@ public class HtmlUtilTest {
final String result = HtmlUtil.removeAllHtmlAttr(html, "div");
Assert.assertEquals("<div></div>", result);
}
@Test
public void getCharsetTest() {
String charsetName = ReUtil.get(ContentTypeUtil.CHARSET_PATTERN, "Charset=UTF-8;fq=0.9", 1);
Assert.assertEquals("UTF-8", charsetName);
charsetName = ReUtil.get(HtmlUtil.META_CHARSET_PATTERN, "<meta charset=utf-8", 1);
Assert.assertEquals("utf-8", charsetName);
charsetName = ReUtil.get(HtmlUtil.META_CHARSET_PATTERN, "<meta charset='utf-8'", 1);
Assert.assertEquals("utf-8", charsetName);
charsetName = ReUtil.get(HtmlUtil.META_CHARSET_PATTERN, "<meta charset=\"utf-8\"", 1);
Assert.assertEquals("utf-8", charsetName);
charsetName = ReUtil.get(HtmlUtil.META_CHARSET_PATTERN, "<meta charset = \"utf-8\"", 1);
Assert.assertEquals("utf-8", charsetName);
}
}

View File

@@ -136,27 +136,6 @@ public class HttpUtilTest {
urlWithForm);
}
@Test
public void getCharsetTest() {
String charsetName = ReUtil.get(HttpUtil.CHARSET_PATTERN, "Charset=UTF-8;fq=0.9", 1);
Assert.assertEquals("UTF-8", charsetName);
charsetName = ReUtil.get(HttpUtil.META_CHARSET_PATTERN, "<meta charset=utf-8", 1);
Assert.assertEquals("utf-8", charsetName);
charsetName = ReUtil.get(HttpUtil.META_CHARSET_PATTERN, "<meta charset='utf-8'", 1);
Assert.assertEquals("utf-8", charsetName);
charsetName = ReUtil.get(HttpUtil.META_CHARSET_PATTERN, "<meta charset=\"utf-8\"", 1);
Assert.assertEquals("utf-8", charsetName);
charsetName = ReUtil.get(HttpUtil.META_CHARSET_PATTERN, "<meta charset = \"utf-8\"", 1);
Assert.assertEquals("utf-8", charsetName);
}
@Test
public void getMimeTypeTest() {
final String mimeType = HttpUtil.getMimeType("aaa.aaa");
Assert.assertNull(mimeType);
}
@Test
@Ignore
public void getWeixinTest(){