From 6b8c7b496bf8fac06b2440d7772f75bff95ad57f Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Thu, 6 Sep 2018 14:03:03 +0700
Subject: [PATCH] AssertWithSideEffects: tests fixed (HashSet/TreeSet are
 absent in mockJDK7, so locality-based tests were not testing anything
 actually)

---
 .../assert_with_side_effects/AssertWithSideEffects.java  | 8 --------
 .../igtest/bugs/assert_with_side_effects/expected.xml    | 7 -------
 .../assert_with_side_effects8/AssertWithSideEffects.java | 9 +++++++++
 .../igtest/bugs/assert_with_side_effects8/expected.xml   | 8 +++++++-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects/AssertWithSideEffects.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects/AssertWithSideEffects.java
index 4b3e71f94833..57fba33b43df 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects/AssertWithSideEffects.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects/AssertWithSideEffects.java
@@ -30,12 +30,4 @@ public class AssertWithSideEffects {
     void jdbc(ResultSet rs) throws SQLException {
       assert rs.last();
     }
-
-    void assertMutation(Set<String> set) {
-        assert set.add("foo");
-
-        assert new HashSet<>().add("bar");
-
-        assert (set.isEmpty() ? new TreeSet<>() : new HashSet<>()).add("baz");
-    }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects/expected.xml
index b518c936f5ae..93d780851750 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects/expected.xml
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects/expected.xml
@@ -20,11 +20,4 @@
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'assert' statement with side effects</problem_class>
     <description>&lt;code&gt;assert&lt;/code&gt; has side effects #loc</description>
   </problem>
-
-  <problem>
-    <file>AssertWithSideEffects.java</file>
-    <line>35</line>
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'assert' statement with side effects</problem_class>
-    <description>&lt;code&gt;assert&lt;/code&gt; has side effects #loc</description>
-  </problem>
 </problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects8/AssertWithSideEffects.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects8/AssertWithSideEffects.java
index 800615b5abf8..d50c08eb95bf 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects8/AssertWithSideEffects.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects8/AssertWithSideEffects.java
@@ -1,5 +1,6 @@
 package com.siyeh.igtest.bugs.assert_with_side_effects;
 import java.util.regex.*;
+import java.util.*;
 public class AssertWithSideEffects {
     void assertMutation() {
         Matcher m = Pattern.compile("foobar").matcher("foo");
@@ -7,4 +8,12 @@ public class AssertWithSideEffects {
 
         assert Pattern.compile("foobar").matcher("foo").matches();
     }
+
+    void assertMutation(Set<String> set) {
+        assert set.add("foo");
+
+        assert new HashSet<>().add("bar");
+
+        assert (set.isEmpty() ? new TreeSet<>() : new HashSet<>()).add("baz");
+    }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects8/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects8/expected.xml
index 739f5ee0feaf..009fbe70bd77 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects8/expected.xml
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/assert_with_side_effects8/expected.xml
@@ -2,7 +2,13 @@
 <problems>
   <problem>
     <file>AssertWithSideEffects.java</file>
-    <line>6</line>
+    <line>7</line>
+    <problem_class>'assert' statement with side effects</problem_class>
+    <description>&lt;code&gt;assert&lt;/code&gt; has side effects #loc</description>
+  </problem>
+  <problem>
+    <file>AssertWithSideEffects.java</file>
+    <line>13</line>
     <problem_class>'assert' statement with side effects</problem_class>
     <description>&lt;code&gt;assert&lt;/code&gt; has side effects #loc</description>
   </problem>