From 674a15daa10b9bf8b60bd8e5cf4f3b64882378fb Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 15 Dec 2015 14:58:17 +0300 Subject: [PATCH] Disable test until KT-10405 not fixed --- .../compiledKotlin/fromLoadJava/classObjectAnnotation.kt | 4 +++- .../compiledKotlin/fromLoadJava/classObjectAnnotation.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt index 9f342519e09..6631df8bc91 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt @@ -1,7 +1,9 @@ package test class Some { - @TestAnnotation companion object { + // TODO uncomment after KT-10405 will be fixed + // @Companion.TestAnnotation + companion object { annotation class TestAnnotation } } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt index f02742eaa6b..7c0e0f84d58 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt @@ -3,7 +3,7 @@ package test public final class Some { /*primary*/ public constructor Some() - @test.Some.Companion.TestAnnotation() public companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() public final annotation class TestAnnotation : kotlin.Annotation {