From 6805bae192908c287ffd0fcad9ece50541db0e46 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 26 Jun 2017 15:26:14 +0300 Subject: Workaround top-level java class name not match filename --- core/src/test/kotlin/format/HtmlFormatTest.kt | 4 +-- core/src/test/kotlin/model/JavaTest.kt | 4 +-- core/testdata/format/JavaSupertype.html | 36 +++++++++++++++++++++++++++ core/testdata/format/JavaSupertype.java | 8 ++++++ core/testdata/format/javaSupertype.html | 36 --------------------------- core/testdata/format/javaSupertype.java | 8 ------ core/testdata/java/InheritorLinks.java | 7 ++++++ core/testdata/java/InnerClass.java | 4 +++ core/testdata/java/inheritorLinks.java | 7 ------ core/testdata/java/innerClass.java | 4 --- 10 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 core/testdata/format/JavaSupertype.html create mode 100644 core/testdata/format/JavaSupertype.java delete mode 100644 core/testdata/format/javaSupertype.html delete mode 100644 core/testdata/format/javaSupertype.java create mode 100644 core/testdata/java/InheritorLinks.java create mode 100644 core/testdata/java/InnerClass.java delete mode 100644 core/testdata/java/inheritorLinks.java delete mode 100644 core/testdata/java/innerClass.java 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 @@ + + + +JavaSupertype.Bar - test + + +test / JavaSupertype / Bar
+
+

Bar

+open class Bar : Foo +

Constructors

+ + + + + + + +

<init>

+Bar()

Functions

+ + + + + + + +

returnFoo

+open fun returnFoo(foo: Foo): Foo

+ + diff --git a/core/testdata/format/JavaSupertype.java b/core/testdata/format/JavaSupertype.java new file mode 100644 index 00000000..2045573c --- /dev/null +++ b/core/testdata/format/JavaSupertype.java @@ -0,0 +1,8 @@ +public class JavaSupertype { + public static class Foo { + } + + public static class Bar extends Foo { + public Foo returnFoo(Foo foo) { return 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 @@ - - - -C.Bar - test - - -test / C / Bar
-
-

Bar

-open class Bar : Foo -

Constructors

- - - - - - - -

<init>

-Bar()

Functions

- - - - - - - -

returnFoo

-open fun returnFoo(foo: Foo): Foo

- - diff --git a/core/testdata/format/javaSupertype.java b/core/testdata/format/javaSupertype.java deleted file mode 100644 index b3142ff6..00000000 --- a/core/testdata/format/javaSupertype.java +++ /dev/null @@ -1,8 +0,0 @@ -class C { - public static class Foo { - } - - public static class Bar extends Foo { - public Foo returnFoo(Foo foo) { return foo; } - } -} diff --git a/core/testdata/java/InheritorLinks.java b/core/testdata/java/InheritorLinks.java new file mode 100644 index 00000000..31658265 --- /dev/null +++ b/core/testdata/java/InheritorLinks.java @@ -0,0 +1,7 @@ +public class InheritorLinks { + public static class Foo { + } + + public static class Bar extends Foo { + } +} diff --git a/core/testdata/java/InnerClass.java b/core/testdata/java/InnerClass.java new file mode 100644 index 00000000..0302da9d --- /dev/null +++ b/core/testdata/java/InnerClass.java @@ -0,0 +1,4 @@ +class InnerClass { + public class D { + } +} diff --git a/core/testdata/java/inheritorLinks.java b/core/testdata/java/inheritorLinks.java deleted file mode 100644 index 2378f5c6..00000000 --- a/core/testdata/java/inheritorLinks.java +++ /dev/null @@ -1,7 +0,0 @@ -class C { - public static class Foo { - } - - public static class Bar extends Foo { - } -} diff --git a/core/testdata/java/innerClass.java b/core/testdata/java/innerClass.java deleted file mode 100644 index 0f1be948..00000000 --- a/core/testdata/java/innerClass.java +++ /dev/null @@ -1,4 +0,0 @@ -class Test { - public class D { - } -} -- cgit