From 31db2cf9599d9058709c1536588164d88d358850 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 12 Jul 2022 14:21:32 +0000 Subject: [PATCH 1/3] fix: Use new regex to capture java class name --- .../src/main/java/com/microsoft/util/YamlUtil.java | 2 +- .../src/test/java/com/microsoft/util/YamlUtilTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/util/YamlUtil.java b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/util/YamlUtil.java index 8e866475..7f0a1f97 100644 --- a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/util/YamlUtil.java +++ b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/util/YamlUtil.java @@ -35,6 +35,6 @@ public static String cleanupHtml(String text) { .replaceAll("\\{@link *\"([^\\{]+)\" *\\}", "$1") .replaceAll("\\[([^]]+)]\\[([^]]+)\\]", "$1") .replaceAll("\\{@link *([^\\{\"]+) *\\}", "$1") - .replaceAll("==+([^=]+)==+", "

$1

"); + .replaceAll("=======================([^=]+)=======================", "

$1

"); } } diff --git a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java index c1fad783..6cc87946 100644 --- a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java +++ b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java @@ -127,7 +127,11 @@ public void cleanupHtmlEqualTitlesTest() { assertEquals(expectedResult, YamlUtil.cleanupHtml(expectedActual)); assertEquals(random + expectedResult + random, YamlUtil.cleanupHtml(random + expectedActual + random)); assertEquals(expectedResult + random + expectedResult, YamlUtil.cleanupHtml(expectedActual + random + expectedActual)); + assertEquals("= text =", YamlUtil.cleanupHtml("= text =")); + assertEquals("==testing==", YamlUtil.cleanupHtml("==testing==")); + assertEquals("======= test1234 ===== sfs === d =", YamlUtil.cleanupHtml("======= test1234 ===== sfs === d =")); + assertEquals("====== Markdown H1 Test ======", YamlUtil.cleanupHtml("====== Markdown H1 Test ======")); } @Test From ee27a983940c4e9217aebec24b75e7af48534197 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 19 Jul 2022 14:58:34 +0000 Subject: [PATCH 2/3] feat: Add tests --- .../src/test/java/com/microsoft/util/YamlUtilTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java index 6cc87946..744138d4 100644 --- a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java +++ b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java @@ -130,7 +130,8 @@ public void cleanupHtmlEqualTitlesTest() { assertEquals("= text =", YamlUtil.cleanupHtml("= text =")); assertEquals("==testing==", YamlUtil.cleanupHtml("==testing==")); - assertEquals("======= test1234 ===== sfs === d =", YamlUtil.cleanupHtml("======= test1234 ===== sfs === d =")); + assertEquals("=======================SpeechClient=======================", "=======================SpeechClient======================="); + assertEquals("======= test1234 ===== 1234test === 1234test1234 == test =", YamlUtil.cleanupHtml("======= test1234 ===== 1234test === 1234test1234 == test =")); assertEquals("====== Markdown H1 Test ======", YamlUtil.cleanupHtml("====== Markdown H1 Test ======")); } From 538576408093e3ef9e757072f49e03a735c3c572 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 19 Jul 2022 17:17:46 +0000 Subject: [PATCH 3/3] fix: Add orchestration-airflow failed test case --- .../src/test/java/com/microsoft/util/YamlUtilTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java index 744138d4..605a3b7c 100644 --- a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java +++ b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/util/YamlUtilTest.java @@ -131,6 +131,7 @@ public void cleanupHtmlEqualTitlesTest() { assertEquals("= text =", YamlUtil.cleanupHtml("= text =")); assertEquals("==testing==", YamlUtil.cleanupHtml("==testing==")); assertEquals("=======================SpeechClient=======================", "=======================SpeechClient======================="); + assertEquals("\"scikit-learn\":\"==0.19.0\"TextTextText\"botocore\":\"==1.7.14\"", "\"scikit-learn\":\"==0.19.0\"TextTextText\"botocore\":\"==1.7.14\""); assertEquals("======= test1234 ===== 1234test === 1234test1234 == test =", YamlUtil.cleanupHtml("======= test1234 ===== 1234test === 1234test1234 == test =")); assertEquals("====== Markdown H1 Test ======", YamlUtil.cleanupHtml("====== Markdown H1 Test ======")); }