diff --git a/comparing_references_inspection/build.gradle b/comparing_references_inspection/build.gradle new file mode 100644 index 000000000..8f2649e1a --- /dev/null +++ b/comparing_references_inspection/build.gradle @@ -0,0 +1,40 @@ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + +plugins { + id 'java' + id 'org.jetbrains.intellij' version '0.4.16' +} + +group 'org.intellij.sdk' +version '2.0.0' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +test { + // Set idea.home.path to the absolute path to the intellij-community source + // on your local machine. + systemProperty "idea.home.path", "/Users/jhake/Documents/source/comm" +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version '2019.3.2' + type 'IC' + plugins 'java' + updateSinceUntilBuild = false +} + +patchPluginXml { + version = project.version +} + +// Force javadoc rebuild before jar is built +jar.dependsOn javadoc \ No newline at end of file diff --git a/comparing_references_inspection/comparing_references_inspection.iml b/comparing_references_inspection/comparing_references_inspection.iml deleted file mode 100644 index 5d66bce80..000000000 --- a/comparing_references_inspection/comparing_references_inspection.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/comparing_references_inspection/gradle/wrapper/gradle-wrapper.jar b/comparing_references_inspection/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..94336fcae Binary files /dev/null and b/comparing_references_inspection/gradle/wrapper/gradle-wrapper.jar differ diff --git a/comparing_references_inspection/gradle/wrapper/gradle-wrapper.properties b/comparing_references_inspection/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..91f72d8e0 --- /dev/null +++ b/comparing_references_inspection/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Jun 13 15:15:25 PDT 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip diff --git a/comparing_references_inspection/gradlew b/comparing_references_inspection/gradlew new file mode 100755 index 000000000..cccdd3d51 --- /dev/null +++ b/comparing_references_inspection/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/comparing_references_inspection/gradlew.bat b/comparing_references_inspection/gradlew.bat new file mode 100644 index 000000000..f9553162f --- /dev/null +++ b/comparing_references_inspection/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/comparing_references_inspection/settings.gradle b/comparing_references_inspection/settings.gradle new file mode 100644 index 000000000..bf67834bd --- /dev/null +++ b/comparing_references_inspection/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'comparing_references_inspection' + diff --git a/comparing_references_inspection/src/main/java/org/intellij/sdk/codeInspection/ComparingReferencesInspection.java b/comparing_references_inspection/src/main/java/org/intellij/sdk/codeInspection/ComparingReferencesInspection.java new file mode 100644 index 000000000..8ff934e0c --- /dev/null +++ b/comparing_references_inspection/src/main/java/org/intellij/sdk/codeInspection/ComparingReferencesInspection.java @@ -0,0 +1,200 @@ +package org.intellij.sdk.codeInspection; + +import com.intellij.codeInspection.*; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.project.Project; +import com.intellij.psi.*; +import com.intellij.psi.tree.IElementType; +import com.intellij.ui.DocumentAdapter; +import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; +import javax.swing.event.DocumentEvent; +import java.awt.*; +import java.util.StringTokenizer; + +import static com.siyeh.ig.psiutils.ExpressionUtils.isNullLiteral; + +/** + * @author max + * @author jhake + */ +public class ComparingReferencesInspection extends AbstractBaseJavaLocalInspectionTool { + private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ComparingReferencesInspection"); + private final CriQuickFix myQuickFix = new CriQuickFix(); + + // Defines the text of the quick fix intention + public static final String QUICK_FIX_NAME = "SDK: " + InspectionsBundle.message("inspection.comparing.references.use.quickfix"); + + // This string holds a list of classes relevant to this inspection. + @SuppressWarnings({"WeakerAccess"}) + @NonNls + public String CHECKED_CLASSES = "java.lang.String;java.util.Date"; + + /** + * This method is called to get the panel describing the inspection. + * It is called every time the user selects the inspection in preferences. + * The user has the option to edit the list of CHECKED_CLASSES. + * Adds a document listener to see if + * + * @return panel to display inspection information. + */ + @Override + public JComponent createOptionsPanel() { + JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT)); + final JTextField checkedClasses = new JTextField(CHECKED_CLASSES); + checkedClasses.getDocument().addDocumentListener(new DocumentAdapter() { + public void textChanged(DocumentEvent event) { + CHECKED_CLASSES = checkedClasses.getText(); + } + }); + panel.add(checkedClasses); + return panel; + } + + /** + * This method is overridden to provide a custom visitor + * that inspects expressions with relational operators '==' and '!=' + * The visitor must not be recursive and must be thread-safe. + * + * @param holder object for visitor to register problems found. + * @param isOnTheFly true if inspection was run in non-batch mode + * @return non-null visitor for this inspection. + * @see JavaElementVisitor + */ + @NotNull + @Override + public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) { + return new JavaElementVisitor() { + + /** + * This string defines the short message shown to a user signaling the inspection + * found a problem. It reuses a string from the inspections bundle. + */ + @NonNls + private final String DESCRIPTION_TEMPLATE = "SDK " + InspectionsBundle.message("inspection.comparing.references.problem.descriptor"); + + /** + * Avoid defining visitors for both Reference and Binary expressions. + * + * @param psiReferenceExpression The expression to be evaluated. + */ + @Override + public void visitReferenceExpression(PsiReferenceExpression psiReferenceExpression) { + } + + /** + * Evaluate binary psi expressions to see if they contain + * relational operators '==' and '!=', AND they contain + * classes contained in CHECKED_CLASSES. The evaluation + * ignores expressions comparing an object to null. + * IF this criteria is met, add the expression to the + * problems list. + * + * @param expression The binary expression to be evaluated. + */ + @Override + public void visitBinaryExpression(PsiBinaryExpression expression) { + super.visitBinaryExpression(expression); + IElementType opSign = expression.getOperationTokenType(); + if (opSign == JavaTokenType.EQEQ || opSign == JavaTokenType.NE) { + // The binary expression is the correct type for this inspection + PsiExpression lOperand = expression.getLOperand(); + PsiExpression rOperand = expression.getROperand(); + if (rOperand == null || isNullLiteral(lOperand) || isNullLiteral(rOperand)) + return; + // Nothing is compared to null, now check the types being compared + PsiType lType = lOperand.getType(); + PsiType rType = rOperand.getType(); + if (isCheckedType(lType) || isCheckedType(rType)) { + // Identified an expression with potential problems, add to list with fix object. + holder.registerProblem(expression, + DESCRIPTION_TEMPLATE, myQuickFix); + } + } + } + + /** + * Verifies the input is the correct {@code PsiType} for this inspection. + * + * @param type The {@code PsiType} to be examined for a match + * @return {@code true} if input is {@code PsiClassType} and matches + * one of the classes in the CHECKED_CLASSES list. + */ + private boolean isCheckedType(PsiType type) { + if (!(type instanceof PsiClassType)) + return false; + StringTokenizer tokenizer = new StringTokenizer(CHECKED_CLASSES, ";"); + while (tokenizer.hasMoreTokens()) { + String className = tokenizer.nextToken(); + if (type.equalsToText(className)) + return true; + } + return false; + } + + }; + } + + /** + * This class provides a solution to inspection problem expressions by manipulating + * the PSI tree to use a.equals(b) instead of '==' or '!=' + */ + private static class CriQuickFix implements LocalQuickFix { + + /** + * Returns a partially localized string for the quick fix intention. + * Used by the test code for this plugin. + * + * @return Quick fix short name. + */ + @NotNull + @Override + public String getName() { + return QUICK_FIX_NAME; + } + + /** + * This method manipulates the PSI tree to replace 'a==b' with 'a.equals(b) + * or 'a!=b' with '!a.equals(b)' + * + * @param project The project that contains the file being edited. + * @param descriptor A problem found by this inspection. + */ + public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { + try { + PsiBinaryExpression binaryExpression = (PsiBinaryExpression) descriptor.getPsiElement(); + IElementType opSign = binaryExpression.getOperationTokenType(); + PsiExpression lExpr = binaryExpression.getLOperand(); + PsiExpression rExpr = binaryExpression.getROperand(); + if (rExpr == null) + return; + + PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory(); + PsiMethodCallExpression equalsCall = + (PsiMethodCallExpression) factory.createExpressionFromText("a.equals(b)", null); + + equalsCall.getMethodExpression().getQualifierExpression().replace(lExpr); + equalsCall.getArgumentList().getExpressions()[0].replace(rExpr); + + PsiExpression result = (PsiExpression) binaryExpression.replace(equalsCall); + + if (opSign == JavaTokenType.NE) { + PsiPrefixExpression negation = (PsiPrefixExpression) factory.createExpressionFromText("!a", null); + negation.getOperand().replace(result); + result.replace(negation); + } + } catch (IncorrectOperationException e) { + LOG.error(e); + } + } + + @NotNull + public String getFamilyName() { + return getName(); + } + } + +} diff --git a/comparing_references_inspection/src/main/resources/META-INF/plugin.xml b/comparing_references_inspection/src/main/resources/META-INF/plugin.xml new file mode 100644 index 000000000..d0119b6ef --- /dev/null +++ b/comparing_references_inspection/src/main/resources/META-INF/plugin.xml @@ -0,0 +1,74 @@ + + + + + org.intelliJ.sdk.codeInspection + + + SDK: Comparing References Inspection Sample + + + 2.0.0 + + + + + + com.intellij.modules.java + + + + Adds entries to Preferences | Editor | Inspections | Java | Probable Bugs. + ]]> + + + +
  • 2.0.0 Convert to Gradle-based plugin.
    • +
  • 1.1.0 Refactor resources, register this inspection.
    • +
  • 1.0.0 Release 2018.3 and earlier.
    • + + ]]> +     + + + IntelliJ Platform SDK + + + + + + + + +     diff --git a/comparing_references_inspection/src/main/resources/META-INF/pluginIcon.svg b/comparing_references_inspection/src/main/resources/META-INF/pluginIcon.svg new file mode 100644 index 000000000..613290897 --- /dev/null +++ b/comparing_references_inspection/src/main/resources/META-INF/pluginIcon.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/comparing_references_inspection/src/main/resources/inspectionDescriptions/ComparingReferences.html b/comparing_references_inspection/src/main/resources/inspectionDescriptions/ComparingReferences.html new file mode 100644 index 000000000..e6eb316ea --- /dev/null +++ b/comparing_references_inspection/src/main/resources/inspectionDescriptions/ComparingReferences.html @@ -0,0 +1,7 @@ + + +SDK: This inspection reports when the '==' or '!=' operator was used between expressions of +reference types.
    +Classes to be inspected are controlled by a semi-colon separated Options list in the preferences panel for this inspection. + + diff --git a/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/CompRefInspTest.java b/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/CompRefInspTest.java new file mode 100644 index 000000000..c1267d083 --- /dev/null +++ b/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/CompRefInspTest.java @@ -0,0 +1,62 @@ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + +package org.intellij.sdk.codeInspection; + +import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.testFramework.LightProjectDescriptor; +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; +import org.jetbrains.annotations.NotNull; +import org.junit.After; +import org.junit.Before; + +/** + * -ea -Xbootclasspath/p:../out/classes/production/boot -XX:+HeapDumpOnOutOfMemoryError -Xmx512m -XX:MaxPermSize=320m + * -Didea.system.path=../test-system -Didea.home.path=../ -Didea.config.path=../test-config -Didea.test.group=ALL_EXCLUDE_DEFINED + */ +public class CompRefInspTest extends LightJavaCodeInsightFixtureTestCase { + + /** + * Returns path to the test data relative to "idea.home.path" defined in build.gradle. + */ + @Override + protected String getBasePath() { + return "sdk/code_samples/comparing_references_inspection/src/test/testData"; + } + + /** + * Specifies the requirements for this project needed in this test, + * such as the module type, the configured SDK, facets, libraries, etc. + * @return + */ + @NotNull + protected LightProjectDescriptor getProjectDescriptor() { + return LightJavaCodeInsightFixtureTestCase.JAVA_8_ANNOTATED; + } + + /** + * Test the "==" case + * Note the hint must match CriQuickFix#getName + * + */ + public void testRelationalEq() { + myFixture.configureByFiles("before.java"); + final IntentionAction action = myFixture.findSingleIntention(ComparingReferencesInspection.QUICK_FIX_NAME); + assertNotNull(action); + myFixture.launchAction(action); + myFixture.checkResultByFile("before.after.java"); + } + + /** + * Test the "!=" case + * Note the hint must match CriQuickFix#getName + * + */ + public void testRelationalNeq() { + myFixture.configureByFiles("before1.java"); + final IntentionAction action = myFixture.findSingleIntention(ComparingReferencesInspection.QUICK_FIX_NAME); + assertNotNull(action); + myFixture.launchAction(action); + myFixture.checkResultByFile("before1.after.java"); + } + +} diff --git a/comparing_references_inspection/testData/before.after.java b/comparing_references_inspection/src/test/testData/before.after.java similarity index 100% rename from comparing_references_inspection/testData/before.after.java rename to comparing_references_inspection/src/test/testData/before.after.java diff --git a/comparing_references_inspection/testData/before.java b/comparing_references_inspection/src/test/testData/before.java similarity index 100% rename from comparing_references_inspection/testData/before.java rename to comparing_references_inspection/src/test/testData/before.java diff --git a/comparing_references_inspection/testData/before1.after.java b/comparing_references_inspection/src/test/testData/before1.after.java similarity index 100% rename from comparing_references_inspection/testData/before1.after.java rename to comparing_references_inspection/src/test/testData/before1.after.java diff --git a/comparing_references_inspection/testData/before1.java b/comparing_references_inspection/src/test/testData/before1.java similarity index 100% rename from comparing_references_inspection/testData/before1.java rename to comparing_references_inspection/src/test/testData/before1.java diff --git a/comparing_references_inspection/testSource/testPlugin/TestThisPlugin.java b/comparing_references_inspection/testSource/testPlugin/TestThisPlugin.java deleted file mode 100644 index 4a1092467..000000000 --- a/comparing_references_inspection/testSource/testPlugin/TestThisPlugin.java +++ /dev/null @@ -1,87 +0,0 @@ -package testPlugin; - - -import com.intellij.codeInsight.daemon.impl.HighlightInfo; -import com.intellij.codeInsight.intention.IntentionAction; -import com.intellij.codeInspection.ComparingReferencesInspection; -import com.intellij.openapi.application.PathManager; -import com.intellij.testFramework.UsefulTestCase; -import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; -import com.intellij.testFramework.fixtures.*; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.util.List; - -/** - * @see JavaCodeInsightFixtureTestCase - * @see LightCodeInsightFixtureTestCase - */ -public class TestThisPlugin extends UsefulTestCase { - - protected CodeInsightTestFixture myFixture; - - - // Specify the path to the test data directory - final String dataPath = PathManager.getResourceRoot(TestThisPlugin.class, "/testPlugin/TestThisPlugin.class"); - - @Before - public void setUp() throws Exception { - - final IdeaTestFixtureFactory fixtureFactory = IdeaTestFixtureFactory.getFixtureFactory(); - final TestFixtureBuilder testFixtureBuilder = - fixtureFactory.createFixtureBuilder(getName()); - myFixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(testFixtureBuilder.getFixture()); - myFixture.setTestDataPath(dataPath); - final JavaModuleFixtureBuilder builder = testFixtureBuilder.addModule(JavaModuleFixtureBuilder.class); - - builder.addContentRoot(myFixture.getTempDirPath()).addSourceRoot(""); - builder.setMockJdkLevel(JavaModuleFixtureBuilder.MockJdkLevel.jdk15); - myFixture.setUp(); - } - - @After - public void tearDown() throws Exception { - myFixture.tearDown(); - myFixture = null; - } - - protected void doTest(String testName, String hint) throws Throwable { - myFixture.configureByFile(testName + ".java"); - - myFixture.enableInspections(ComparingReferencesInspection.class); - List highlightInfos = myFixture.doHighlighting(); - Assert.assertTrue(!highlightInfos.isEmpty()); - - final IntentionAction action = myFixture.findSingleIntention(hint); - - Assert.assertNotNull(action); - myFixture.launchAction(action); - myFixture.checkResultByFile(testName + ".after.java"); - } - - /** - * Test the "==" case - * Note the hint must match CriQuickFix#getName - * - * @throws Throwable - */ - @Test - public void test() throws Throwable { -// doTest("before", "Use equals()"); - doTest("before", ComparingReferencesInspection.QUICK_FIX_NAME); - } - - /** - * Test the "!=" case - * Note the hint must match CriQuickFix#getName - * @throws Throwable - */ - @Test - public void test1() throws Throwable { - doTest("before1", ComparingReferencesInspection.QUICK_FIX_NAME); - } - -}