Snapshot of commit 329607d9ebcedf2bb0ad81265354366db7dc3f9c

from branch master of git://git.jetbrains.org/idea/community.git

Change-Id: I3b27d82897504da1b66169b67c7771e0f551c973

7 files changed, 56 insertions, 6 deletions

diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/classlayout/noop_method_in_abstract_class/NoopMethodInAbstractClass.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/classlayout/noop_method_in_abstract_class/NoopMethodInAbstractClass.java
new file mode 100644
index 000000000000..214152da741d
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/classlayout/noop_method_in_abstract_class/NoopMethodInAbstractClass.java
@@ -0,0 +1,8 @@
+package com.siyeh.igtest.classlayout.noop_method_in_abstract_class;
+
+abstract class NoopMethodInAbstractClass {
+
+  void foo() {}
+
+  native int bar();
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/classlayout/noop_method_in_abstract_class/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/classlayout/noop_method_in_abstract_class/expected.xml
new file mode 100644
index 000000000000..79ebd7255099
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/classlayout/noop_method_in_abstract_class/expected.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<problems>
+  <problem>
+    <file>NoopMethodInAbstractClass.java</file>
+    <line>5</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">No-op method in abstract class</problem_class>
+    <description>No-op Method &lt;code&gt;foo()&lt;/code&gt; should be made abstract #loc</description>
+  </problem>
+</problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/ReturnOfDateFieldInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/return_of_date_field/ReturnOfDateField.java
index 723bbf7a1183..158bda583544 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/ReturnOfDateFieldInspection.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/return_of_date_field/ReturnOfDateField.java
@@ -1,8 +1,8 @@
-package com.siyeh.igtest.encapsulation;
+package com.siyeh.igtest.encapsulation.return_of_date_field;
 
 import java.util.*;
 
-public class ReturnOfDateFieldInspection
+public class ReturnOfDateField
 {
     private Date m_foo;
  //   private List<String> m_fooBar;
@@ -10,10 +10,10 @@ public class ReturnOfDateFieldInspection
 
     public static void main(String[] args)
     {
-        new ReturnOfDateFieldInspection(new Date());
+        new ReturnOfDateField(new Date());
     }
 
-    public ReturnOfDateFieldInspection(Date foo)
+    public ReturnOfDateField(Date foo)
     {
         m_foo = new Date(foo.getTime());
     }
@@ -35,5 +35,7 @@ public class ReturnOfDateFieldInspection
         return m_bar;
     }
 
-
+    private Date hidden() {
+        return m_foo;
+    }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/return_of_date_field/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/return_of_date_field/expected.xml
new file mode 100644
index 000000000000..37d4ca193837
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/return_of_date_field/expected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<problems>
+  <problem>
+    <file>ReturnOfDateField.java</file>
+    <line>35</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Return of Date or Calendar field</problem_class>
+    <description>Return of 'java.util.Calendar' field &lt;code&gt;m_bar&lt;/code&gt; #loc</description>
+  </problem>
+
+  <problem>
+    <file>ReturnOfDateField.java</file>
+    <line>23</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Return of Date or Calendar field</problem_class>
+    <description>Return of 'java.util.Date' field &lt;code&gt;m_foo&lt;/code&gt; #loc</description>
+  </problem>
+</problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/unnecessary_explicit_numeric_cast/UnnecessaryExplicitNumericCast.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/unnecessary_explicit_numeric_cast/UnnecessaryExplicitNumericCast.java
index f266165e25ea..60d67f02003f 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/unnecessary_explicit_numeric_cast/UnnecessaryExplicitNumericCast.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/unnecessary_explicit_numeric_cast/UnnecessaryExplicitNumericCast.java
@@ -40,4 +40,12 @@ public class UnnecessaryExplicitNumericCast {
     void c(int cols, int no) {
       int rows = (int) Math.ceil((double) no / cols);
     }
+
+    void source() {
+      target((int)'a');
+      target2((int)'b');
+    }
+    void target(int c) {}
+    void target(char c) {}
+    void target2(int d) {}
 }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/unnecessary_explicit_numeric_cast/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/unnecessary_explicit_numeric_cast/expected.xml
index adf186ebad97..19f2cadeff52 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/unnecessary_explicit_numeric_cast/expected.xml
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/unnecessary_explicit_numeric_cast/expected.xml
@@ -93,4 +93,11 @@
     <line>34</line>    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary explicit numeric cast</problem_class>
     <description>'b' unnecessarily cast to &lt;code&gt;long&lt;/code&gt;</description>
   </problem>
+
+  <problem>
+    <file>UnnecessaryExplicitNumericCast.java</file>
+    <line>46</line>
+    <problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unnecessary explicit numeric cast</problem_class>
+    <description>''b'' unnecessarily cast to &lt;code&gt;int&lt;/code&gt; #loc</description>
+  </problem>
 </problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/method_may_be_static/A.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/method_may_be_static/A.java
index 22b9874fa45e..94bb4a36e7d2 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/method_may_be_static/A.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/method_may_be_static/A.java
@@ -24,7 +24,7 @@ public class A implements Serializable {
     Object readResolve() throws ObjectStreamException {
         return null;
     }
-
+    native void f();
     void g() {
         System.out.println("boo!");
     }