From 3b7c8e2b061ef6c8ed0a95d2aefe26261d59dcae Mon Sep 17 00:00:00 2001
From: Sergey Patrikeev <Sergey.Patrikeev@jetbrains.com>
Date: Wed, 21 Nov 2018 21:09:06 +0300
Subject: [PATCH] Deprecation inspection: update test data.

1) The default constructor is a one not declared in source code. Otherwise this is 'C()'.
2) Make Test class top-level to test ignoreInSameOutermostClass flag properly.
---
 .../expected.xml                               |  2 +-
 .../forRemoval/AnnotationProperty.java         | 18 +++++++++---------
 .../forRemoval/DefaultConstructorInSuper.java  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/java-tests/testData/inspection/deprecation/deprecatedDefaultConstructorInSuper/expected.xml b/java/java-tests/testData/inspection/deprecation/deprecatedDefaultConstructorInSuper/expected.xml
index ae61ea8fa6b1..dd14b20ddb1b 100644
--- a/java/java-tests/testData/inspection/deprecation/deprecatedDefaultConstructorInSuper/expected.xml
+++ b/java/java-tests/testData/inspection/deprecation/deprecatedDefaultConstructorInSuper/expected.xml
@@ -8,7 +8,7 @@
   <problem>
     <file>Test.java</file>
     <line>10</line>
-    <description>Default constructor in C is deprecated</description>
+    <description>'C' is deprecated</description>
   </problem>
 </problems>
 
diff --git a/java/java-tests/testData/inspection/forRemoval/AnnotationProperty.java b/java/java-tests/testData/inspection/forRemoval/AnnotationProperty.java
index be3d97b08ddc..4d0184a35ae4 100644
--- a/java/java-tests/testData/inspection/forRemoval/AnnotationProperty.java
+++ b/java/java-tests/testData/inspection/forRemoval/AnnotationProperty.java
@@ -7,17 +7,17 @@ class Test {
   )
   void method() {
   }
+}
 
-  @interface A {
-    int allowed() default 0;
+@interface A {
+  int allowed() default 0;
 
-    @Deprecated
-    int byAnnotation() default 0;
+  @Deprecated
+  int byAnnotation() default 0;
 
-    /**@deprecated*/
-    int byDocTag() default 0;
+  /**@deprecated*/
+  int byDocTag() default 0;
 
-    @Deprecated(forRemoval = true)
-    int forRemoval() default 0;
-  }
+  @Deprecated(forRemoval = true)
+  int forRemoval() default 0;
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/forRemoval/DefaultConstructorInSuper.java b/java/java-tests/testData/inspection/forRemoval/DefaultConstructorInSuper.java
index e9a0b61f2aa6..d754c7b080f9 100644
--- a/java/java-tests/testData/inspection/forRemoval/DefaultConstructorInSuper.java
+++ b/java/java-tests/testData/inspection/forRemoval/DefaultConstructorInSuper.java
@@ -7,12 +7,12 @@ class <error descr="Default constructor in 'C' is deprecated and marked for remo
 
 class P {
   void normal() {
-    new <error descr="Default constructor in 'C' is deprecated and marked for removal">C</error>(){};
+    new <error descr="'C()' is deprecated and marked for removal">C</error>(){};
   }
 
   @SuppressWarnings("deprecation")
   void suppressDeprecation() {
-    new <error descr="Default constructor in 'C' is deprecated and marked for removal">C</error>(){};
+    new <error descr="'C()' is deprecated and marked for removal">C</error>(){};
   }
 
   @SuppressWarnings("removal")