diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-06-26 15:26:14 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-06-26 15:26:14 +0300 |
| commit | 6805bae192908c287ffd0fcad9ece50541db0e46 (patch) | |
| tree | 8e6c91bb3c81ead3e4258a0b221b5bf50e843133 | |
| parent | 4810d07256c86825b85807dd93448279bde5b3b9 (diff) | |
| download | dokka-6805bae192908c287ffd0fcad9ece50541db0e46.tar.gz dokka-6805bae192908c287ffd0fcad9ece50541db0e46.tar.bz2 dokka-6805bae192908c287ffd0fcad9ece50541db0e46.zip | |
Workaround top-level java class name not match filename
| -rw-r--r-- | core/src/test/kotlin/format/HtmlFormatTest.kt | 4 | ||||
| -rw-r--r-- | core/src/test/kotlin/model/JavaTest.kt | 4 | ||||
| -rw-r--r-- | core/testdata/format/JavaSupertype.html | 36 | ||||
| -rw-r--r-- | core/testdata/format/JavaSupertype.java (renamed from core/testdata/format/javaSupertype.java) | 2 | ||||
| -rw-r--r-- | core/testdata/format/javaSupertype.html | 36 | ||||
| -rw-r--r-- | core/testdata/java/InheritorLinks.java (renamed from core/testdata/java/inheritorLinks.java) | 2 | ||||
| -rw-r--r-- | core/testdata/java/InnerClass.java (renamed from core/testdata/java/innerClass.java) | 2 |
7 files changed, 43 insertions, 43 deletions
diff --git a/core/src/test/kotlin/format/HtmlFormatTest.kt b/core/src/test/kotlin/format/HtmlFormatTest.kt index cbea3209..4fe4f6ab 100644 --- a/core/src/test/kotlin/format/HtmlFormatTest.kt +++ b/core/src/test/kotlin/format/HtmlFormatTest.kt @@ -71,8 +71,8 @@ class HtmlFormatTest { } @Test fun javaSupertypeLink() { - verifyJavaHtmlNodes("javaSupertype") { model -> - model.members.single().members.single { it.name == "C" }.members.filter { it.name == "Bar" } + verifyJavaHtmlNodes("JavaSupertype") { model -> + model.members.single().members.single { it.name == "JavaSupertype" }.members.filter { it.name == "Bar" } } } diff --git a/core/src/test/kotlin/model/JavaTest.kt b/core/src/test/kotlin/model/JavaTest.kt index c0e68304..e6c22ee4 100644 --- a/core/src/test/kotlin/model/JavaTest.kt +++ b/core/src/test/kotlin/model/JavaTest.kt @@ -110,7 +110,7 @@ public class JavaTest { } @Test fun innerClass() { - verifyJavaPackageMember("testdata/java/innerClass.java") { cls -> + verifyJavaPackageMember("testdata/java/InnerClass.java") { cls -> val innerClass = cls.members(NodeKind.Class).single() assertEquals("D", innerClass.name) } @@ -199,7 +199,7 @@ public class JavaTest { } @Test fun inheritorLinks() { - verifyJavaPackageMember("testdata/java/inheritorLinks.java") { cls -> + verifyJavaPackageMember("testdata/java/InheritorLinks.java") { cls -> val fooClass = cls.members.single { it.name == "Foo" } val inheritors = fooClass.references(RefKind.Inheritor) assertEquals(1, inheritors.size) diff --git a/core/testdata/format/JavaSupertype.html b/core/testdata/format/JavaSupertype.html new file mode 100644 index 00000000..3e5e273a --- /dev/null +++ b/core/testdata/format/JavaSupertype.html @@ -0,0 +1,36 @@ +<HTML> +<HEAD> +<meta charset="UTF-8"> +<title>JavaSupertype.Bar - test</title> +</HEAD> +<BODY> +<a href="test/index">test</a> / <a href="test/-java-supertype/index">JavaSupertype</a> / <a href="test/-java-supertype/-bar/index">Bar</a><br/> +<br/> +<h1>Bar</h1> +<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Bar</span> <span class="symbol">:</span> <a href="test/-java-supertype/-foo/index"><span class="identifier">Foo</span></a></code> +<h3>Constructors</h3> +<table> +<tbody> +<tr> +<td> +<p><a href="test/-java-supertype/-bar/-init-"><init></a></p> +</td> +<td> +<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td> +</tr> +</tbody> +</table> +<h3>Functions</h3> +<table> +<tbody> +<tr> +<td> +<p><a href="test/-java-supertype/-bar/return-foo">returnFoo</a></p> +</td> +<td> +<code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">returnFoo</span><span class="symbol">(</span><span class="identifier" id="JavaSupertype.Bar$returnFoo(JavaSupertype.Foo)/foo">foo</span><span class="symbol">:</span> <a href="test/-java-supertype/-foo/index"><span class="identifier">Foo</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="test/-java-supertype/-foo/index"><span class="identifier">Foo</span></a></code></td> +</tr> +</tbody> +</table> +</BODY> +</HTML> diff --git a/core/testdata/format/javaSupertype.java b/core/testdata/format/JavaSupertype.java index b3142ff6..2045573c 100644 --- a/core/testdata/format/javaSupertype.java +++ b/core/testdata/format/JavaSupertype.java @@ -1,4 +1,4 @@ -class C { +public class JavaSupertype { public static class Foo { } diff --git a/core/testdata/format/javaSupertype.html b/core/testdata/format/javaSupertype.html deleted file mode 100644 index b46c8e54..00000000 --- a/core/testdata/format/javaSupertype.html +++ /dev/null @@ -1,36 +0,0 @@ -<HTML> -<HEAD> -<meta charset="UTF-8"> -<title>C.Bar - test</title> -</HEAD> -<BODY> -<a href="test/index">test</a> / <a href="test/-c/index">C</a> / <a href="test/-c/-bar/index">Bar</a><br/> -<br/> -<h1>Bar</h1> -<code><span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Bar</span> <span class="symbol">:</span> <a href="test/-c/-foo/index"><span class="identifier">Foo</span></a></code> -<h3>Constructors</h3> -<table> -<tbody> -<tr> -<td> -<p><a href="test/-c/-bar/-init-"><init></a></p> -</td> -<td> -<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td> -</tr> -</tbody> -</table> -<h3>Functions</h3> -<table> -<tbody> -<tr> -<td> -<p><a href="test/-c/-bar/return-foo">returnFoo</a></p> -</td> -<td> -<code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">returnFoo</span><span class="symbol">(</span><span class="identifier" id="C.Bar$returnFoo(C.Foo)/foo">foo</span><span class="symbol">:</span> <a href="test/-c/-foo/index"><span class="identifier">Foo</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="test/-c/-foo/index"><span class="identifier">Foo</span></a></code></td> -</tr> -</tbody> -</table> -</BODY> -</HTML> diff --git a/core/testdata/java/inheritorLinks.java b/core/testdata/java/InheritorLinks.java index 2378f5c6..31658265 100644 --- a/core/testdata/java/inheritorLinks.java +++ b/core/testdata/java/InheritorLinks.java @@ -1,4 +1,4 @@ -class C { +public class InheritorLinks { public static class Foo { } diff --git a/core/testdata/java/innerClass.java b/core/testdata/java/InnerClass.java index 0f1be948..0302da9d 100644 --- a/core/testdata/java/innerClass.java +++ b/core/testdata/java/InnerClass.java @@ -1,4 +1,4 @@ -class Test { +class InnerClass { public class D { } } |