From d9bfa029b0ecf300ae47cf1033db2d5cb323d705 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 19 Feb 2015 18:59:00 +0100 Subject: remove dependency of Location on a File; use more meaningful locations in tests --- test/data/format/accessor.get.md | 2 +- test/data/format/accessor.set.md | 2 +- test/data/format/annotationClass.md | 4 ++-- test/data/format/annotationParams.md | 2 +- test/data/format/annotations.md | 8 ++++---- test/data/format/bracket.html | 2 +- test/data/format/brokenLink.html | 2 +- test/data/format/classWithDefaultObject.html | 8 ++++---- test/data/format/classWithDefaultObject.md | 8 ++++---- test/data/format/codeSpan.html | 2 +- test/data/format/deprecated.class.html | 10 +++++----- test/data/format/deprecated.package.html | 8 ++++---- test/data/format/emptyDescription.md | 2 +- test/data/format/enumClass.md | 6 +++--- test/data/format/enumClass.value.md | 2 +- test/data/format/extensions.class.md | 6 +++--- test/data/format/extensions.package.md | 4 ++-- test/data/format/functionWithDefaultParameter.md | 2 +- test/data/format/htmlEscaping.html | 2 +- test/data/format/overloads.html | 4 ++-- test/data/format/overloadsWithDescription.html | 4 ++-- test/data/format/overloadsWithDifferentDescriptions.html | 2 +- test/data/format/overridingFunction.md | 4 ++-- test/data/format/paramTag.md | 2 +- test/data/format/parenthesis.html | 2 +- test/data/format/propertyVar.md | 2 +- test/data/format/see.html | 10 +++++----- test/data/format/throwsTag.md | 2 +- test/data/format/tripleBackticks.html | 2 +- test/data/format/typeLink.html | 6 +++--- test/data/format/typeParameterBounds.md | 2 +- test/data/format/varargsFunction.md | 2 +- 32 files changed, 63 insertions(+), 63 deletions(-) (limited to 'test/data') diff --git a/test/data/format/accessor.get.md b/test/data/format/accessor.get.md index 2f6ffbeb..67a2f395 100644 --- a/test/data/format/accessor.get.md +++ b/test/data/format/accessor.get.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [C](out.md) / [x](out.md) / [get](out.md) +[test](test/index) / [C](test/-c/index) / [x](test/-c/x/index) / [get](test/-c/x/get) # get diff --git a/test/data/format/accessor.set.md b/test/data/format/accessor.set.md index aadb77da..4350fcd3 100644 --- a/test/data/format/accessor.set.md +++ b/test/data/format/accessor.set.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [C](out.md) / [x](out.md) / [set](out.md) +[test](test/index) / [C](test/-c/index) / [x](test/-c/x/index) / [set](test/-c/x/set) # set diff --git a/test/data/format/annotationClass.md b/test/data/format/annotationClass.md index cefd5212..936217d2 100644 --- a/test/data/format/annotationClass.md +++ b/test/data/format/annotationClass.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [fancy](out.md) +[test](test/index) / [fancy](test/fancy/index) # fancy @@ -10,5 +10,5 @@ ### Constructors -| [<init>](out.md) | `public fancy()` | +| [<init>](test/fancy/-init-) | `public fancy()` | diff --git a/test/data/format/annotationParams.md b/test/data/format/annotationParams.md index 8fd26b94..80fe52cf 100644 --- a/test/data/format/annotationParams.md +++ b/test/data/format/annotationParams.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [f](out.md) +[test](test/index) / [f](test/f) # f diff --git a/test/data/format/annotations.md b/test/data/format/annotations.md index d7435adf..04d16129 100644 --- a/test/data/format/annotations.md +++ b/test/data/format/annotations.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [Foo](out.md) +[test](test/index) / [Foo](test/-foo/index) # Foo @@ -10,17 +10,17 @@ ### Constructors -| [<init>](out.md) | `public Foo()` | +| [<init>](test/-foo/-init-) | `public Foo()` | ### Properties -| [x](out.md) | `inline val x: Int` | +| [x](test/-foo/x) | `inline val x: Int` | ### Functions -| [bar](out.md) | `inline fun bar(noinline notInlined: () -> Unit): Unit` | +| [bar](test/-foo/bar) | `inline fun bar(noinline notInlined: () -> Unit): Unit` | diff --git a/test/data/format/bracket.html b/test/data/format/bracket.html index 24a7aec2..5630073d 100644 --- a/test/data/format/bracket.html +++ b/test/data/format/bracket.html @@ -3,7 +3,7 @@ test / foo -test /  / foo
+test / foo

foo

fun foo(): Unit
diff --git a/test/data/format/brokenLink.html b/test/data/format/brokenLink.html index 7c2585b8..32135787 100644 --- a/test/data/format/brokenLink.html +++ b/test/data/format/brokenLink.html @@ -3,7 +3,7 @@ test / f -test /  / f
+test / f

f

fun f(): Unit
diff --git a/test/data/format/classWithDefaultObject.html b/test/data/format/classWithDefaultObject.html index 1fd648ff..ca6f2305 100644 --- a/test/data/format/classWithDefaultObject.html +++ b/test/data/format/classWithDefaultObject.html @@ -3,7 +3,7 @@ test / Klass -test /  / Klass
+test / Klass

Klass

class Klass
@@ -14,7 +14,7 @@ -<init> +<init> public Klass() @@ -25,7 +25,7 @@ -x +x val x: Int @@ -36,7 +36,7 @@ -foo +foo fun foo(): Unit diff --git a/test/data/format/classWithDefaultObject.md b/test/data/format/classWithDefaultObject.md index 030d5a21..d9f6a8fe 100644 --- a/test/data/format/classWithDefaultObject.md +++ b/test/data/format/classWithDefaultObject.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [Klass](out.md) +[test](test/index) / [Klass](test/-klass/index) # Klass @@ -10,17 +10,17 @@ ### Constructors -| [<init>](out.md) | `public Klass()` | +| [<init>](test/-klass/-init-) | `public Klass()` | ### Default Object Properties -| [x](out.md) | `val x: Int` | +| [x](test/-klass/x) | `val x: Int` | ### Default Object Functions -| [foo](out.md) | `fun foo(): Unit` | +| [foo](test/-klass/foo) | `fun foo(): Unit` | diff --git a/test/data/format/codeSpan.html b/test/data/format/codeSpan.html index d2209b83..cc553043 100644 --- a/test/data/format/codeSpan.html +++ b/test/data/format/codeSpan.html @@ -3,7 +3,7 @@ test / foo -test /  / foo
+test / foo

foo

fun foo(): Unit
diff --git a/test/data/format/deprecated.class.html b/test/data/format/deprecated.class.html index 030dd12b..bc44620d 100644 --- a/test/data/format/deprecated.class.html +++ b/test/data/format/deprecated.class.html @@ -2,21 +2,21 @@ -test /  / C
+test / C

C

class C
Deprecated: This class sucks


-test /  / f
+test / f

f

fun f(): Unit
Deprecated: This function sucks


-test /  / p
+test / p

p

val p: Int
@@ -28,7 +28,7 @@ -<init> +<init> public C() @@ -39,7 +39,7 @@ -get +get get(): Int diff --git a/test/data/format/deprecated.package.html b/test/data/format/deprecated.package.html index 000d2015..8e3c2aa9 100644 --- a/test/data/format/deprecated.package.html +++ b/test/data/format/deprecated.package.html @@ -3,7 +3,7 @@ test / root package -test / 
+test

package
@@ -14,7 +14,7 @@ -C +C class C @@ -25,7 +25,7 @@ -p +p val p: Int @@ -36,7 +36,7 @@ -f +f fun f(): Unit diff --git a/test/data/format/emptyDescription.md b/test/data/format/emptyDescription.md index 6b2fd2b4..e82e7228 100644 --- a/test/data/format/emptyDescription.md +++ b/test/data/format/emptyDescription.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [fn](out.md) +[test](test/index) / [fn](test/fn) # fn diff --git a/test/data/format/enumClass.md b/test/data/format/enumClass.md index e260c18f..09efc792 100644 --- a/test/data/format/enumClass.md +++ b/test/data/format/enumClass.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [InlineOption](out.md) +[test](test/index) / [InlineOption](test/-inline-option/index) # InlineOption @@ -10,6 +10,6 @@ ### Enum Values -| [LOCAL_CONTINUE_AND_BREAK](out.md) | `` | -| [ONLY_LOCAL_RETURN](out.md) | `` | +| [LOCAL_CONTINUE_AND_BREAK](test/-inline-option/-l-o-c-a-l_-c-o-n-t-i-n-u-e_-a-n-d_-b-r-e-a-k) | `` | +| [ONLY_LOCAL_RETURN](test/-inline-option/-o-n-l-y_-l-o-c-a-l_-r-e-t-u-r-n) | `` | diff --git a/test/data/format/enumClass.value.md b/test/data/format/enumClass.value.md index bec97d80..bcb685d1 100644 --- a/test/data/format/enumClass.value.md +++ b/test/data/format/enumClass.value.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [InlineOption](out.md) / [LOCAL_CONTINUE_AND_BREAK](out.md) +[test](test/index) / [InlineOption](test/-inline-option/index) / [LOCAL_CONTINUE_AND_BREAK](test/-inline-option/-l-o-c-a-l_-c-o-n-t-i-n-u-e_-a-n-d_-b-r-e-a-k) # LOCAL_CONTINUE_AND_BREAK diff --git a/test/data/format/extensions.class.md b/test/data/format/extensions.class.md index a9747756..a4767ace 100644 --- a/test/data/format/extensions.class.md +++ b/test/data/format/extensions.class.md @@ -1,15 +1,15 @@ -[test](out.md) / [foo](out.md) / [String](out.md) +[test](test/index) / [foo](test/foo/index) / [String](test/foo/-string/index) ### Extensions for String -| [fn](out.md) | `fun String.fn(): Unit` +| [fn](test/foo/-string/fn) | `fun String.fn(): Unit` `fun String.fn(x: Int): Unit` Function with receiver | -| [foobar](out.md) | `val String.foobar: Int` +| [foobar](test/foo/-string/foobar/index) | `val String.foobar: Int` Property with receiver. | diff --git a/test/data/format/extensions.package.md b/test/data/format/extensions.package.md index a456e64e..d4ab577e 100644 --- a/test/data/format/extensions.package.md +++ b/test/data/format/extensions.package.md @@ -1,4 +1,4 @@ -[test](out.md) / [foo](out.md) +[test](test/index) / [foo](test/foo/index) # foo @@ -10,5 +10,5 @@ ### Extensions for External Classes -| [String](out.md) | `` | +| [String](test/foo/-string/index) | `` | diff --git a/test/data/format/functionWithDefaultParameter.md b/test/data/format/functionWithDefaultParameter.md index 435fe6d2..43bd8d70 100644 --- a/test/data/format/functionWithDefaultParameter.md +++ b/test/data/format/functionWithDefaultParameter.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [f](out.md) +[test](test/index) / [f](test/f) # f diff --git a/test/data/format/htmlEscaping.html b/test/data/format/htmlEscaping.html index c031447a..29c4bf0e 100644 --- a/test/data/format/htmlEscaping.html +++ b/test/data/format/htmlEscaping.html @@ -3,7 +3,7 @@ test / x -test /  / x
+test / x

x

fun <T> x(): T?
diff --git a/test/data/format/overloads.html b/test/data/format/overloads.html index 7a7bd6cf..9189483d 100644 --- a/test/data/format/overloads.html +++ b/test/data/format/overloads.html @@ -3,7 +3,7 @@ test / root package -test / 
+test

package
@@ -14,7 +14,7 @@ -f +f fun f(x: Int): Unit
fun f(x: String): Unit

Performs an action on x.

diff --git a/test/data/format/overloadsWithDescription.html b/test/data/format/overloadsWithDescription.html index 4d43cb05..b29ca658 100644 --- a/test/data/format/overloadsWithDescription.html +++ b/test/data/format/overloadsWithDescription.html @@ -3,12 +3,12 @@ test / f -test /  / f
+test / f

f

fun f(x: Int): Unit
fun f(x: String): Unit
-

Performs an action on x.

+

Performs an action on x.

Description

This is a long description.


diff --git a/test/data/format/overloadsWithDifferentDescriptions.html b/test/data/format/overloadsWithDifferentDescriptions.html index 6d174529..66f8e9a6 100644 --- a/test/data/format/overloadsWithDifferentDescriptions.html +++ b/test/data/format/overloadsWithDifferentDescriptions.html @@ -3,7 +3,7 @@ test / f -test /  / f
+test / f

f

fun f(x: Int): Unit
diff --git a/test/data/format/overridingFunction.md b/test/data/format/overridingFunction.md index 6670ca00..2c898b9c 100644 --- a/test/data/format/overridingFunction.md +++ b/test/data/format/overridingFunction.md @@ -1,9 +1,9 @@ -[test](out.md) / [](out.md) / [D](out.md) / [f](out.md) +[test](test/index) / [D](test/-d/index) / [f](test/-d/f) # f `fun f(): Unit` -Overrides [C.f](out.md) +Overrides [C.f](test/-c/f) diff --git a/test/data/format/paramTag.md b/test/data/format/paramTag.md index 5f324699..aacda66f 100644 --- a/test/data/format/paramTag.md +++ b/test/data/format/paramTag.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [f](out.md) +[test](test/index) / [f](test/f) # f diff --git a/test/data/format/parenthesis.html b/test/data/format/parenthesis.html index f3328d90..c36b311b 100644 --- a/test/data/format/parenthesis.html +++ b/test/data/format/parenthesis.html @@ -3,7 +3,7 @@ test / foo -test /  / foo
+test / foo

foo

fun foo(): Unit
diff --git a/test/data/format/propertyVar.md b/test/data/format/propertyVar.md index 45a77a62..f2110992 100644 --- a/test/data/format/propertyVar.md +++ b/test/data/format/propertyVar.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [x](out.md) +[test](test/index) / [x](test/x) # x diff --git a/test/data/format/see.html b/test/data/format/see.html index 42e20e35..b3ffb74b 100644 --- a/test/data/format/see.html +++ b/test/data/format/see.html @@ -2,23 +2,23 @@ -test /  / quux
+test / quux

quux

fun quux(): Unit
See Also
-

foo

-

bar

+

foo

+

bar




-test /  / foo
+test / foo

foo

fun foo(): Unit


-test /  / bar
+test / bar

bar

fun bar(): Unit
diff --git a/test/data/format/throwsTag.md b/test/data/format/throwsTag.md index 9f8b75c3..d0a4e610 100644 --- a/test/data/format/throwsTag.md +++ b/test/data/format/throwsTag.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [f](out.md) +[test](test/index) / [f](test/f) # f diff --git a/test/data/format/tripleBackticks.html b/test/data/format/tripleBackticks.html index 8cd378f0..25302b04 100644 --- a/test/data/format/tripleBackticks.html +++ b/test/data/format/tripleBackticks.html @@ -3,7 +3,7 @@ test / f -test /  / f
+test / f

f

fun f(): Unit
diff --git a/test/data/format/typeLink.html b/test/data/format/typeLink.html index 3f83dbda..06c31454 100644 --- a/test/data/format/typeLink.html +++ b/test/data/format/typeLink.html @@ -3,10 +3,10 @@ test / Bar -test /  / Bar
+test / Bar

Bar

-class Bar : Foo
+class Bar : Foo


Constructors

@@ -14,7 +14,7 @@ -<init> +<init> public Bar() diff --git a/test/data/format/typeParameterBounds.md b/test/data/format/typeParameterBounds.md index 1c779537..91fd456a 100644 --- a/test/data/format/typeParameterBounds.md +++ b/test/data/format/typeParameterBounds.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [generic](out.md) +[test](test/index) / [generic](test/generic) # generic diff --git a/test/data/format/varargsFunction.md b/test/data/format/varargsFunction.md index 04bb3d39..7a087428 100644 --- a/test/data/format/varargsFunction.md +++ b/test/data/format/varargsFunction.md @@ -1,4 +1,4 @@ -[test](out.md) / [](out.md) / [f](out.md) +[test](test/index) / [f](test/f) # f -- cgit