From 5e876fb67827341f8166eadbfce59e03aea76060 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Tue, 25 Aug 2015 12:41:17 +0200 Subject: [PATCH] make IG test light and add a case --- .../LocalVariableHidingMemberVariable.java | 12 ++++---- .../expected.xml | 30 ------------------- .../visibility2/DifferentPackageClass.java | 6 ---- ...bleHidingMemberVariableInspectionTest.java | 30 +++++++++++++++---- 4 files changed, 31 insertions(+), 47 deletions(-) delete mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/local_variable_hiding_member_variable/expected.xml delete mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/visibility2/DifferentPackageClass.java diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/local_variable_hiding_member_variable/LocalVariableHidingMemberVariable.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/local_variable_hiding_member_variable/LocalVariableHidingMemberVariable.java index 353e2b79fde8..3012423ac2f1 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/local_variable_hiding_member_variable/LocalVariableHidingMemberVariable.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/local_variable_hiding_member_variable/LocalVariableHidingMemberVariable.java @@ -14,10 +14,10 @@ public class LocalVariableHidingMemberVariable extends DifferentPackageClass m_barangus = barangus; } - public void foo() - { + public void foo() { int fooBar; - final Object m_barangus = new Object(); + int fooBar2; + final Object m_barangus = new Object(); System.out.println("bar" + m_barangus); } @@ -30,19 +30,19 @@ public class LocalVariableHidingMemberVariable extends DifferentPackageClass public void innerContainer() { new Object() { void foo() { - Object m_barangus = new Object(); + Object m_barangus = new Object(); } }; } public void foreach(List list) { - for (String m_barangus : list) { + for (String m_barangus : list) { } } { - final Object m_barangus = new Object(); + final Object m_barangus = new Object(); } static { diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/local_variable_hiding_member_variable/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/local_variable_hiding_member_variable/expected.xml deleted file mode 100644 index 43bea6603064..000000000000 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/local_variable_hiding_member_variable/expected.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - LocalVariableHidingMemberVariable.java - 20 - Local variable hides field - Local variable <code>m_barangus</code> hides field in class 'LocalVariableHidingMemberVariable' #loc - - - - LocalVariableHidingMemberVariable.java - 33 - Local variable hides field - Local variable <code>m_barangus</code> hides field in class 'LocalVariableHidingMemberVariable' #loc - - - - LocalVariableHidingMemberVariable.java - 39 - Local variable hides field - Local variable <code>m_barangus</code> hides field in class 'LocalVariableHidingMemberVariable' #loc - - - - LocalVariableHidingMemberVariable.java - 45 - Local variable hides field - Local variable <code>m_barangus</code> hides field in class 'LocalVariableHidingMemberVariable' #loc - - \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility2/DifferentPackageClass.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility2/DifferentPackageClass.java deleted file mode 100644 index 75c8ef39d64a..000000000000 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility2/DifferentPackageClass.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.siyeh.igtest.visibility2; - -public class DifferentPackageClass -{ - int fooBar; -} diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspectionTest.java index 6de4b976fa76..35a8f50e5f0b 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,13 +15,33 @@ */ package com.siyeh.ig.visibility; -import com.siyeh.ig.IGInspectionTestCase; +import com.intellij.codeInspection.InspectionProfileEntry; +import com.siyeh.ig.LightInspectionTestCase; +import org.jetbrains.annotations.Nullable; -public class LocalVariableHidingMemberVariableInspectionTest extends IGInspectionTestCase { +public class LocalVariableHidingMemberVariableInspectionTest extends LightInspectionTestCase { - public void test() throws Exception { + public void testLocalVariableHidingMemberVariable() { + doTest(); + } + + @Nullable + @Override + protected InspectionProfileEntry getInspection() { final LocalVariableHidingMemberVariableInspection inspection = new LocalVariableHidingMemberVariableInspection(); inspection.m_ignoreStaticMethods = true; - doTest("com/siyeh/igtest/visibility/local_variable_hiding_member_variable", inspection); + return inspection; + } + + @Override + protected String[] getEnvironmentClasses() { + return new String[] { + "package com.siyeh.igtest.visibility2;\n" + + "public class DifferentPackageClass\n" + + "{\n" + + " int fooBar;\n" + + " protected int fooBar2;\n" + + "}\n" + }; } } \ No newline at end of file