From f724ba6fc6cddfe09015b5ee1d66122c158f11ba Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 3 Nov 2015 19:36:48 +0100
Subject: build Kotlin documentation for Java files based on descriptors

---
 test/src/format/HtmlFormatTest.kt     | 10 +++++-----
 test/src/format/MarkdownFormatTest.kt | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'test/src/format')

diff --git a/test/src/format/HtmlFormatTest.kt b/test/src/format/HtmlFormatTest.kt
index 66fd0fee..752e4424 100644
--- a/test/src/format/HtmlFormatTest.kt
+++ b/test/src/format/HtmlFormatTest.kt
@@ -99,31 +99,31 @@ public class HtmlFormatTest {
     }
 
     @Test fun javaSupertypeLink() {
-        verifyOutput("test/data/format/javaSupertype.java", ".html") { model, output ->
+        verifyJavaOutput("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"} )
         }
     }
 
     @Test fun javaLinkTag() {
-        verifyOutput("test/data/format/javaLinkTag.java", ".html", withJdk = true) { model, output ->
+        verifyJavaOutput("test/data/format/javaLinkTag.java", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaLinkTagWithLabel() {
-        verifyOutput("test/data/format/javaLinkTagWithLabel.java", ".html", withJdk = true) { model, output ->
+        verifyJavaOutput("test/data/format/javaLinkTagWithLabel.java", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaSeeTag() {
-        verifyOutput("test/data/format/javaSeeTag.java", ".html", withJdk = true) { model, output ->
+        verifyJavaOutput("test/data/format/javaSeeTag.java", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaDeprecated() {
-        verifyOutput("test/data/format/javaDeprecated.java", ".html") { model, output ->
+        verifyJavaOutput("test/data/format/javaDeprecated.java", ".html") { model, output ->
             htmlService.appendNodes(tempLocation, output, model.members.single().members.single { it.name == "Foo" }.members.filter { it.name == "foo" })
         }
     }
diff --git a/test/src/format/MarkdownFormatTest.kt b/test/src/format/MarkdownFormatTest.kt
index bb61fa1c..1a09ae60 100644
--- a/test/src/format/MarkdownFormatTest.kt
+++ b/test/src/format/MarkdownFormatTest.kt
@@ -121,25 +121,25 @@ public class MarkdownFormatTest {
     }
 
     @Test fun javadocHtml() {
-        verifyOutput("test/data/format/javadocHtml.java", ".md", withJdk = true) { model, output ->
+        verifyJavaOutput("test/data/format/javadocHtml.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaCodeLiteralTags() {
-        verifyOutput("test/data/format/javaCodeLiteralTags.java", ".md", withJdk = true) { model, output ->
+        verifyJavaOutput("test/data/format/javaCodeLiteralTags.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaCodeInParam() {
-        verifyOutput("test/data/format/javaCodeInParam.java", ".md", withJdk = true) { model, output ->
+        verifyJavaOutput("test/data/format/javaCodeInParam.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
 
     @Test fun javaSpaceInAuthor() {
-        verifyOutput("test/data/format/javaSpaceInAuthor.java", ".md", withJdk = true) { model, output ->
+        verifyJavaOutput("test/data/format/javaSpaceInAuthor.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members)
         }
     }
@@ -157,7 +157,7 @@ public class MarkdownFormatTest {
     }
 
     @Test fun javadocOrderedList() {
-        verifyOutput("test/data/format/javadocOrderedList.java", ".md", withJdk = true) { model, output ->
+        verifyJavaOutput("test/data/format/javadocOrderedList.java", ".md") { model, output ->
             markdownService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Bar" })
         }
     }
-- 
cgit