From fe170f383a4526e06a29c585571aeb0195da0b49 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 15 Jan 2013 20:28:12 +0400 Subject: [PATCH] Tests fixed for [deprecated] --- compiler/testData/asJava/lightClasses/Declared.kt | 6 ++++-- .../jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java | 2 +- .../org/jetbrains/jet/asJava/KotlinLightClassTest.java | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/compiler/testData/asJava/lightClasses/Declared.kt b/compiler/testData/asJava/lightClasses/Declared.kt index 0b972197680..ecc0c15c979 100644 --- a/compiler/testData/asJava/lightClasses/Declared.kt +++ b/compiler/testData/asJava/lightClasses/Declared.kt @@ -24,8 +24,10 @@ enum class Enum trait Trait // Deprecation -deprecated class Deprecated -[deprecated] class DeprecatedWithBrackets +deprecated("") class Deprecated +jet.deprecated("") class DeprecatedFQN +[deprecated("")] class DeprecatedWithBrackets +[jet.deprecated("")] class DeprecatedWithBracketsFQN // Generic class Generic1 diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java index 5f30157ad07..62c3b0425c0 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java +++ b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java @@ -176,7 +176,7 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase { doTest(); } - public void testDeprectaed() throws Exception { + public void testDeprecated() throws Exception { doTest(); } diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java index 4c811a0c6b8..3bd136651a2 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java +++ b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java @@ -84,7 +84,9 @@ public abstract class KotlinLightClassTest extends KotlinAsJavaTestBase { public void testDeprecation() { checkModifiers("test.Deprecated", PUBLIC, FINAL, DEPRECATED); + checkModifiers("test.DeprecatedFQN", PUBLIC, FINAL, DEPRECATED); checkModifiers("test.DeprecatedWithBrackets", PUBLIC, FINAL, DEPRECATED); + checkModifiers("test.DeprecatedWithBracketsFQN", PUBLIC, FINAL, DEPRECATED); } public void testGenericity() {