From be08e334637e18ab1f1637703384b07132516830 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 30 Oct 2014 17:46:45 +0300 Subject: [PATCH] Minor, change annotation in test data To fix this case in an upcoming test which adds retention(runtime) to all annotations (which resulted in duplicate annotation here) --- .../loadJava/compiledJava/annotations/EnumInParam.java | 6 ++++-- .../loadJava/compiledJava/annotations/EnumInParam.txt | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java index 243484a1aad..c24a4e80b8e 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java @@ -1,11 +1,13 @@ package test; -import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; public interface EnumInParam { + public @interface MyRetention { + RetentionPolicy value(); + } - @Retention(RetentionPolicy.RUNTIME) + @MyRetention(RetentionPolicy.RUNTIME) public @interface RetentionAnnotation { String value(); } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt index ccc5c28fe0c..db37cd9dc4d 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt @@ -2,7 +2,12 @@ package test public trait EnumInParam { - java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : kotlin.Annotation { + public final annotation class MyRetention : kotlin.Annotation { + public constructor MyRetention(/*0*/ value: java.lang.annotation.RetentionPolicy) + public abstract fun value(): java.lang.annotation.RetentionPolicy + } + + test.EnumInParam.MyRetention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : kotlin.Annotation { public constructor RetentionAnnotation(/*0*/ value: kotlin.String) public abstract fun value(): kotlin.String }