aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-02-20 18:02:00 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-02-20 18:02:00 +0100
commitfdd2d9a25661b0faba687a168855138dc8ee30fa (patch)
tree28eaafe798e94c0dee18c3a1b2db36f4270b9908 /test
parent6620764c5f18c87933369131602b24bd2fa490e8 (diff)
downloaddokka-fdd2d9a25661b0faba687a168855138dc8ee30fa.tar.gz
dokka-fdd2d9a25661b0faba687a168855138dc8ee30fa.tar.bz2
dokka-fdd2d9a25661b0faba687a168855138dc8ee30fa.zip
links to supertypes in Java
Diffstat (limited to 'test')
-rw-r--r--test/data/format/javaSupertype.html13
-rw-r--r--test/data/format/javaSupertype.java9
-rw-r--r--test/src/TestAPI.kt2
-rw-r--r--test/src/format/HtmlFormatTest.kt6
4 files changed, 29 insertions, 1 deletions
diff --git a/test/data/format/javaSupertype.html b/test/data/format/javaSupertype.html
new file mode 100644
index 00000000..bf56936c
--- /dev/null
+++ b/test/data/format/javaSupertype.html
@@ -0,0 +1,13 @@
+<HTML>
+<HEAD>
+<title>test / test.C.Bar</title>
+</HEAD>
+<BODY>
+<a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/test/index">test</a>&nbsp;/&nbsp;<a href="test/test/-c/index">C</a>&nbsp;/&nbsp;<a href="test/test/-c/-bar">Bar</a><br/>
+<br/>
+<h1>Bar</h1>
+<code><span class="keyword">public</span> <span class="keyword">open</span> <span class="keyword">class </span><span class="identifier">Bar</span><span class="symbol"> : </span><a href="test/test/-c/-foo"><span class="identifier">Foo</span></a></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
diff --git a/test/data/format/javaSupertype.java b/test/data/format/javaSupertype.java
new file mode 100644
index 00000000..96caeb1d
--- /dev/null
+++ b/test/data/format/javaSupertype.java
@@ -0,0 +1,9 @@
+package test;
+
+class C {
+ public static class Foo {
+ }
+
+ public static class Bar extends Foo {
+ }
+}
diff --git a/test/src/TestAPI.kt b/test/src/TestAPI.kt
index 33688053..7c6a2e73 100644
--- a/test/src/TestAPI.kt
+++ b/test/src/TestAPI.kt
@@ -48,7 +48,7 @@ public fun verifyOutput(path: String, outputExtension: String, outputGenerator:
verifyModel(path) {
val output = StringBuilder()
outputGenerator(it, output)
- val expectedOutput = File(path.replace(".kt", outputExtension)).readText()
+ val expectedOutput = File(path.replace(".kt", outputExtension).replace(".java", outputExtension)).readText()
assertEqualsIgnoringSeparators(expectedOutput, output.toString())
}
}
diff --git a/test/src/format/HtmlFormatTest.kt b/test/src/format/HtmlFormatTest.kt
index 9d4d30da..f6e0a2f3 100644
--- a/test/src/format/HtmlFormatTest.kt
+++ b/test/src/format/HtmlFormatTest.kt
@@ -93,4 +93,10 @@ public class HtmlFormatTest {
htmlService.appendNodes(tempLocation, output, model.members.single().members)
}
}
+
+ Test fun javaSupertypeLink() {
+ verifyOutput("test/data/format/javaSupertype.java", ".html") { model, output ->
+ htmlService.appendNodes(tempLocation, output, model.members.single().members.single { it.name == "C"}.members.filter { it.name == "Bar"} )
+ }
+ }
}