azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix KT-13021, KT-13020, Test for already fixed KT-6941

Browse Source 
Fixes on javadoc to kdoc comments convert
This commit is contained in:
Simon Ogorodnik
2016-10-13 12:47:13 +03:00
parent 155cfcb1f8
commit d731f97c7d
9 changed files with 106 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/testData/fileOrElement/docComments/aWithoutHref.java
Vendored
+7
View File
@@ -0,0 +1,7 @@
/**
* <a name="some_important_name">Important</a>
* <a>Just an link without href</a>
*/
public class A {
}
j2k/testData/fileOrElement/docComments/aWithoutHref.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
/**
* <a name="some_important_name">Important</a>
* <a>Just an link without href</a>
*/
class A
j2k/testData/fileOrElement/docComments/escapedCharactersInCodeQuote.java
Vendored
+5
View File
@@ -0,0 +1,5 @@
/**
* {@code A&lt;B}
*/
public class C {
}
j2k/testData/fileOrElement/docComments/escapedCharactersInCodeQuote.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
/**
* `A&lt;B`
*/
class C
j2k/testData/fileOrElement/docComments/preserveUnknownTags.java
Vendored
+9
View File
@@ -0,0 +1,9 @@
/**
* Doc comment.<p>
* <cite>cited</cite> <p>
* <span class="important_class">spanned</span> <p>
* <someSpecialTag>!!!</someSpecialTag>
*/
public class A {
}
j2k/testData/fileOrElement/docComments/preserveUnknownTags.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
/**
* Doc comment.
*
*
* <cite>cited</cite>
*
*
* <span class="important_class">spanned</span>
*
*
* <someSpecialTag>!!!</someSpecialTag>
*/
class A
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
+19
View File
@@ -1719,6 +1719,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class DocComments extends AbstractJavaToKotlinConverterForWebDemoTest {
@TestMetadata("aWithoutHref.java")
public void testAWithoutHref() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/aWithoutHref.java");
doTest(fileName);
}
public void testAllFilesPresentInDocComments() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/docComments"), Pattern.compile("^(.+)\\.java$"), true);
}
@@ -1735,6 +1741,13 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("escapedCharactersInCodeQuote.java")
public void testEscapedCharactersInCodeQuote() throws Exception {
String fileName =
KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/escapedCharactersInCodeQuote.java");
doTest(fileName);
}
@TestMetadata("htmlInDocComment.java")
public void testHtmlInDocComment() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/htmlInDocComment.java");
@@ -1765,6 +1778,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("preserveUnknownTags.java")
public void testPreserveUnknownTags() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/preserveUnknownTags.java");
doTest(fileName);
}
@TestMetadata("quoted.java")
public void testQuoted() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/quoted.java");
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
+19
View File
@@ -1719,6 +1719,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class DocComments extends AbstractJavaToKotlinConverterSingleFileTest {
@TestMetadata("aWithoutHref.java")
public void testAWithoutHref() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/aWithoutHref.java");
doTest(fileName);
}
public void testAllFilesPresentInDocComments() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/docComments"), Pattern.compile("^(.+)\\.java$"), true);
}
@@ -1735,6 +1741,13 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("escapedCharactersInCodeQuote.java")
public void testEscapedCharactersInCodeQuote() throws Exception {
String fileName =
KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/escapedCharactersInCodeQuote.java");
doTest(fileName);
}
@TestMetadata("htmlInDocComment.java")
public void testHtmlInDocComment() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/htmlInDocComment.java");
@@ -1765,6 +1778,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
doTest(fileName);
}
@TestMetadata("preserveUnknownTags.java")
public void testPreserveUnknownTags() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/preserveUnknownTags.java");
doTest(fileName);
}
@TestMetadata("quoted.java")
public void testQuoted() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/quoted.java");