From 0a9ddf41641c78eb67665261f3add48b423743e1 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Wed, 11 Jul 2018 10:53:35 +0200
Subject: [PATCH] fix testdata

---
 .../src/Test.java => NonNlsEquals.java}       |  4 ++--
 .../i18n/nonNlsEquals/expected.xml            | 22 -------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 rename plugins/java-i18n/testData/inspections/i18n/{nonNlsEquals/src/Test.java => NonNlsEquals.java} (54%)
 delete mode 100644 plugins/java-i18n/testData/inspections/i18n/nonNlsEquals/expected.xml

diff --git a/plugins/java-i18n/testData/inspections/i18n/nonNlsEquals/src/Test.java b/plugins/java-i18n/testData/inspections/i18n/NonNlsEquals.java
similarity index 54%
rename from plugins/java-i18n/testData/inspections/i18n/nonNlsEquals/src/Test.java
rename to plugins/java-i18n/testData/inspections/i18n/NonNlsEquals.java
index 3b3d31fc929d..79cb0f6a5f2d 100644
--- a/plugins/java-i18n/testData/inspections/i18n/nonNlsEquals/src/Test.java
+++ b/plugins/java-i18n/testData/inspections/i18n/NonNlsEquals.java
@@ -1,9 +1,9 @@
 class Foo {
     void test(@org.jetbrains.annotations.NonNls String s, String s1) {
         if (s.equals("bar")) {}
-        if (s1.equals("bar")) {}
+        if (s1.equals(<warning descr="Hard coded string literal: \"bar\"">"bar"</warning>)) {}
         if ("bar".equals(s)) {}
-        if ("bar".equals(s1)) {}
+        if (<warning descr="Hard coded string literal: \"bar\"">"bar"</warning>.equals(s1)) {}
         if (("bar").equals((s))) {}
         if ((s).equals(("bar"))) {}
     }
diff --git a/plugins/java-i18n/testData/inspections/i18n/nonNlsEquals/expected.xml b/plugins/java-i18n/testData/inspections/i18n/nonNlsEquals/expected.xml
deleted file mode 100644
index 98a1b0a67d57..000000000000
--- a/plugins/java-i18n/testData/inspections/i18n/nonNlsEquals/expected.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<problems>
-  <problem>
-    <file>Test.java</file>
-    <line>4</line>
-    <module>testNonNlsEquals</module>
-    <package>&lt;default&gt;</package>
-    <entry_point TYPE="method" FQNAME="Foo void test(java.lang.String s, java.lang.String s1)" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Hard coded strings</problem_class>
-    <description>Hard coded string literal: &quot;bar&quot;</description>
-  </problem>
-  <problem>
-    <file>Test.java</file>
-    <line>6</line>
-    <module>testNonNlsEquals</module>
-    <package>&lt;default&gt;</package>
-    <entry_point TYPE="method" FQNAME="Foo void test(java.lang.String s, java.lang.String s1)" />
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Hard coded strings</problem_class>
-    <description>Hard coded string literal: &quot;bar&quot;</description>
-  </problem>
-</problems>
-