diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/RemoveSillyAssignmentFixTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/RemoveSillyAssignmentFixTest.java index 6cc97eee995d..d34340ea50a6 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/RemoveSillyAssignmentFixTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/RemoveSillyAssignmentFixTest.java @@ -48,7 +48,7 @@ public class RemoveSillyAssignmentFixTest extends LightJavaCodeInsightFixtureTes myFixture.enableInspections(SillyAssignmentInspection.class); final String quickfixName = JavaBundle.message("assignment.to.itself.quickfix.name"); myFixture.configureByFile(getTestName(false) + ".java"); - assertEmpty("Quickfix \'" + quickfixName + "\' is available unexpectedly", myFixture.filterAvailableIntentions(quickfixName)); + assertEmpty("Quickfix '" + quickfixName + "' is available unexpectedly", myFixture.filterAvailableIntentions(quickfixName)); } @Override diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/SameParameterValueSlashesTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/SameParameterValueSlashesTest.java index 1270dbfd582b..fc16f681fe0b 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/SameParameterValueSlashesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/SameParameterValueSlashesTest.java @@ -42,7 +42,7 @@ public class SameParameterValueSlashesTest extends LightJavaCodeInsightFixtureTe @Parameterized.Parameters(name = "\\{0}") public static Object[] data() { - return new Object[] { "n", "r", "b", "t", "f", "\"", "\'", "\\", "1"}; + return new Object[] { "n", "r", "b", "t", "f", "\"", "'", "\\", "1"}; } @Parameterized.Parameter diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/TextBlockBackwardMigrationInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/TextBlockBackwardMigrationInspectionTest.java index 994868ac4b11..ef418d019f21 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/TextBlockBackwardMigrationInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/TextBlockBackwardMigrationInspectionTest.java @@ -14,6 +14,7 @@ import org.jetbrains.annotations.NotNull; public class TextBlockBackwardMigrationInspectionTest extends LightQuickFixParameterizedTestCase { public void testTrailingWhitespace() { + //noinspection UnnecessaryStringEscape configureFromFileText("TrailingWhitespace.java", "class TextBlockMigration {\n" + "\n" + " String multipleLiterals() {\n" + diff --git a/platform/platform-tests/testSrc/com/intellij/application/options/codeInsight/editor/quotes/SelectionQuotingTypedHandlerTest.java b/platform/platform-tests/testSrc/com/intellij/application/options/codeInsight/editor/quotes/SelectionQuotingTypedHandlerTest.java index d3060642c0b0..625973637599 100644 --- a/platform/platform-tests/testSrc/com/intellij/application/options/codeInsight/editor/quotes/SelectionQuotingTypedHandlerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/application/options/codeInsight/editor/quotes/SelectionQuotingTypedHandlerTest.java @@ -63,7 +63,7 @@ public class SelectionQuotingTypedHandlerTest extends BasePlatformTestCase { } public void testChangeQuotes() { - doTest("\'", "\"aaa\"\nbbb\n\n", "'aaa'\nbbb\n\n"); + doTest("'", "\"aaa\"\nbbb\n\n", "'aaa'\nbbb\n\n"); } public void testChangeBrackets() { diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/editorActions/CustomFileTypeEditorTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/editorActions/CustomFileTypeEditorTest.java index 9e7995605037..6f5c66907f14 100644 --- a/platform/platform-tests/testSrc/com/intellij/codeInsight/editorActions/CustomFileTypeEditorTest.java +++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/editorActions/CustomFileTypeEditorTest.java @@ -160,15 +160,15 @@ public class CustomFileTypeEditorTest extends BasePlatformTestCase { boolean oldValuePairQuote = settings.AUTOINSERT_PAIR_QUOTE; settings.AUTOINSERT_PAIR_QUOTE = false; try { - checkTyping("a.cs", "\"a\"", '\'', "\'a\""); - checkTyping("a.cs", "\"a\'", '\'', "\'a\'"); - checkTyping("a.cs", "\"a\"", '\'', "\"a\'"); - checkTyping("a.cs", "\'a\"", '\'', "\'a\'"); + checkTyping("a.cs", "\"a\"", '\'', "'a\""); + checkTyping("a.cs", "\"a'", '\'', "'a'"); + checkTyping("a.cs", "\"a\"", '\'', "\"a'"); + checkTyping("a.cs", "'a\"", '\'', "'a'"); - checkTyping("a.cs", "\'a\"", '\"', "\"a\""); - checkTyping("a.cs", "\'a\'", '\"', "\"a\'"); - checkTyping("a.cs", "\"a\'", '\"', "\"a\""); - checkTyping("a.cs", "\'a\'", '\"', "\'a\""); + checkTyping("a.cs", "'a\"", '\"', "\"a\""); + checkTyping("a.cs", "'a'", '\"', "\"a'"); + checkTyping("a.cs", "\"a'", '\"', "\"a\""); + checkTyping("a.cs", "'a'", '\"', "'a\""); } finally { settings.SURROUND_SELECTION_ON_QUOTE_TYPED = oldValue; @@ -181,14 +181,14 @@ public class CustomFileTypeEditorTest extends BasePlatformTestCase { boolean oldValue = settings.AUTOINSERT_PAIR_QUOTE; settings.AUTOINSERT_PAIR_QUOTE = false; try { - checkTyping("a.cs", "\"a\"", '\'', "\'\"\'a\""); - checkTyping("a.cs", "\"a\'", '\'', "\'\"\'a\'"); - checkTyping("a.cs", "\"a\"", '\'', "\"a\'\"\'"); - checkTyping("a.cs", "\'a\"", '\'', "\'a\'\"\'"); - checkTyping("a.cs", "\'a\"", '\"', "\"\'\"a\""); - checkTyping("a.cs", "\'a\'", '\"', "\"\'\"a\'"); - checkTyping("a.cs", "\"a\'", '\"', "\"a\"\'\""); - checkTyping("a.cs", "\'a\'", '\"', "\'a\"\'\""); + checkTyping("a.cs", "\"a\"", '\'', "'\"'a\""); + checkTyping("a.cs", "\"a'", '\'', "'\"'a'"); + checkTyping("a.cs", "\"a\"", '\'', "\"a'\"'"); + checkTyping("a.cs", "'a\"", '\'', "'a'\"'"); + checkTyping("a.cs", "'a\"", '\"', "\"'\"a\""); + checkTyping("a.cs", "'a'", '\"', "\"'\"a'"); + checkTyping("a.cs", "\"a'", '\"', "\"a\"'\""); + checkTyping("a.cs", "'a'", '\"', "'a\"'\""); } finally { settings.AUTOINSERT_PAIR_QUOTE = oldValue; @@ -197,13 +197,13 @@ public class CustomFileTypeEditorTest extends BasePlatformTestCase { public void testReplaceQuote() { checkTyping("a.cs", "\"a\"", '\'', "'a'"); - checkTyping("a.cs", "\"a\'", '\'', "\'\"\'a\'"); + checkTyping("a.cs", "\"a'", '\'', "'\"'a'"); checkTyping("a.cs", "\"a\"", '\'', "'a'"); - checkTyping("a.cs", "\'a\"", '\'', "\'a\'\"\'"); - checkTyping("a.cs", "\'a\"", '\"', "\"\'\"a\""); - checkTyping("a.cs", "\'a\'", '\"', "\"a\""); - checkTyping("a.cs", "\"a\'", '\"', "\"a\"\'\""); - checkTyping("a.cs", "\'a\'", '\"', "\"a\""); + checkTyping("a.cs", "'a\"", '\'', "'a'\"'"); + checkTyping("a.cs", "'a\"", '\"', "\"'\"a\""); + checkTyping("a.cs", "'a'", '\"', "\"a\""); + checkTyping("a.cs", "\"a'", '\"', "\"a\"'\""); + checkTyping("a.cs", "'a'", '\"', "\"a\""); } public void testReplacePairBrace() { diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/SoftWrapTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/SoftWrapTest.java index 3569396bd160..dc889f7d3c71 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/SoftWrapTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/SoftWrapTest.java @@ -44,7 +44,7 @@ public class SoftWrapTest extends AbstractEditorTest { doTestSoftWraps(10, "starttext with spaceend"); } - private static final String TAGS_PATTERN = "()|()|"; + private static final String TAGS_PATTERN = "()|()|"; private void doTestSoftWraps(int wrapWidth, String text) { List foldRegions = new ArrayList<>(); diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/IGQuickFixesTestCase.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/IGQuickFixesTestCase.java index bf45a6c4bb7c..01e1a91e216e 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/IGQuickFixesTestCase.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/IGQuickFixesTestCase.java @@ -59,14 +59,14 @@ public abstract class IGQuickFixesTestCase extends JavaCodeInsightFixtureTestCas protected void assertQuickfixNotAvailable(final String quickfixName) { final String testName = getTestName(false); myFixture.configureByFile(getRelativePath() + "/" + testName + ".java"); - assertEmpty("Quickfix \'" + quickfixName + "\' is available but should not", + assertEmpty("Quickfix '" + quickfixName + "' is available but should not", myFixture.filterAvailableIntentions(quickfixName)); } protected void assertQuickfixNotAvailable(String quickfixName, @Language("JAVA") @NotNull String text) { text = text.replace("/**/", ""); myFixture.configureByText(JavaFileType.INSTANCE, text); - assertEmpty("Quickfix \'" + quickfixName + "\' is available but should not", + assertEmpty("Quickfix '" + quickfixName + "' is available but should not", myFixture.filterAvailableIntentions(quickfixName)); } diff --git a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/IPPTestCase.java b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/IPPTestCase.java index 1a398cd02a20..45dcb630ac97 100644 --- a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/IPPTestCase.java +++ b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/IPPTestCase.java @@ -68,7 +68,7 @@ public abstract class IPPTestCase extends LightJavaCodeInsightFixtureTestCase { myFixture.configureByText("a.java", matcher.replaceFirst("")); final String group = matcher.group(1); final String intentionName = group.isEmpty() ? getIntentionName() : group; - assertEmpty("Intention \'" + intentionName + "\' is available but should not", myFixture.filterAvailableIntentions(intentionName)); + assertEmpty("Intention '" + intentionName + "' is available but should not", myFixture.filterAvailableIntentions(intentionName)); } protected void assertIntentionNotAvailable() { @@ -78,7 +78,7 @@ public abstract class IPPTestCase extends LightJavaCodeInsightFixtureTestCase { protected void assertIntentionNotAvailable(@NotNull final String intentionName) { final String testName = getTestName(false); myFixture.configureByFile(testName + ".java"); - assertEmpty("Intention \'" + intentionName + "\' is available but should not", myFixture.filterAvailableIntentions(intentionName)); + assertEmpty("Intention '" + intentionName + "' is available but should not", myFixture.filterAvailableIntentions(intentionName)); } protected void assertIntentionNotAvailable(Class intentionClass) { @@ -89,7 +89,7 @@ public abstract class IPPTestCase extends LightJavaCodeInsightFixtureTestCase { result.add(intention); } } - assertEmpty("Intention of class \'" + intentionClass + "\' is available but should not", result); + assertEmpty("Intention of class '" + intentionClass + "' is available but should not", result); } protected String getIntentionName() { diff --git a/plugins/git4idea/tests/git4idea/test/GitScenarios.java b/plugins/git4idea/tests/git4idea/test/GitScenarios.java index 157475ce5b33..a2b189244f19 100644 --- a/plugins/git4idea/tests/git4idea/test/GitScenarios.java +++ b/plugins/git4idea/tests/git4idea/test/GitScenarios.java @@ -84,7 +84,7 @@ public class GitScenarios { * Branch must not exist at this point. */ public static String conflict(GitRepository repository, String branch, String file) { - assert !branchExists(repository, branch) : "Branch [" + branch + "] shouldn\'t exist for this scenario"; + assert !branchExists(repository, branch) : "Branch [" + branch + "] shouldn't exist for this scenario"; cd(repository); diff --git a/plugins/hg4idea/testSrc/hg4idea/test/mq/MqPatchTest.java b/plugins/hg4idea/testSrc/hg4idea/test/mq/MqPatchTest.java index 97c0899d25c0..52e2690c6cce 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/mq/MqPatchTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/mq/MqPatchTest.java @@ -65,7 +65,7 @@ public class MqPatchTest extends HgPlatformTest { touch(FILENAME, "f1"); myRepository.refresh(false, true); hg("add " + FILENAME); - hg("commit -m \'" + MESSAGE + "\'"); + hg("commit -m '" + MESSAGE + "'"); HgTestUtil.updateDirectoryMappings(myProject, myRepository); myHgRepository = HgUtil.getRepositoryManager(myProject).getRepositoryForRoot(myRepository); assert myHgRepository != null; diff --git a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownQuoteHandlerTest.java b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownQuoteHandlerTest.java index 83a940930d1a..b756b13b101f 100644 --- a/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownQuoteHandlerTest.java +++ b/plugins/markdown/test/src/org/intellij/plugins/markdown/editor/MarkdownQuoteHandlerTest.java @@ -43,7 +43,7 @@ public class MarkdownQuoteHandlerTest extends BasePlatformTestCase { } public void testSingleQuoteAsApostrophe() { - doTest("Hello dear world", '\'', "Hello dear\' world"); + doTest("Hello dear world", '\'', "Hello dear' world"); } public void testBacktickAsAccent() { diff --git a/python/testSrc/com/jetbrains/python/PyEvaluatorTest.java b/python/testSrc/com/jetbrains/python/PyEvaluatorTest.java index a66ca7e26b18..869b1baface1 100644 --- a/python/testSrc/com/jetbrains/python/PyEvaluatorTest.java +++ b/python/testSrc/com/jetbrains/python/PyEvaluatorTest.java @@ -268,8 +268,8 @@ public class PyEvaluatorTest extends PyTestCase { assertTrue(PyEvaluator.evaluateAsBoolean(parseExpression("True"))); assertFalse(PyEvaluator.evaluateAsBoolean(parseExpression("False"))); - assertTrue(PyEvaluator.evaluateAsBoolean(parseExpression("\'a\'"))); - assertFalse(PyEvaluator.evaluateAsBoolean(parseExpression("\'\'"))); + assertTrue(PyEvaluator.evaluateAsBoolean(parseExpression("'a'"))); + assertFalse(PyEvaluator.evaluateAsBoolean(parseExpression("''"))); assertTrue(PyEvaluator.evaluateAsBoolean(parseExpression("1"))); assertFalse(PyEvaluator.evaluateAsBoolean(parseExpression("0"))); @@ -285,8 +285,8 @@ public class PyEvaluatorTest extends PyTestCase { assertTrue(PyEvaluator.evaluateAsBooleanNoResolve(parseExpression("True"))); assertFalse(PyEvaluator.evaluateAsBooleanNoResolve(parseExpression("False"))); - assertTrue(PyEvaluator.evaluateAsBooleanNoResolve(parseExpression("\'a\'"))); - assertFalse(PyEvaluator.evaluateAsBooleanNoResolve(parseExpression("\'\'"))); + assertTrue(PyEvaluator.evaluateAsBooleanNoResolve(parseExpression("'a'"))); + assertFalse(PyEvaluator.evaluateAsBooleanNoResolve(parseExpression("''"))); assertTrue(PyEvaluator.evaluateAsBooleanNoResolve(parseExpression("1"))); assertFalse(PyEvaluator.evaluateAsBooleanNoResolve(parseExpression("0"))); @@ -300,8 +300,8 @@ public class PyEvaluatorTest extends PyTestCase { assertNull(PyEvaluator.evaluateAsBooleanNoResolve(parseText("a = True\nexpr = a"))); assertNull(PyEvaluator.evaluateAsBooleanNoResolve(parseText("a = False\nexpr = a"))); - assertNull(PyEvaluator.evaluateAsBooleanNoResolve(parseText("a = \'a\'\nexpr = a"))); - assertNull(PyEvaluator.evaluateAsBooleanNoResolve(parseText("a = \'\'\nexpr = a"))); + assertNull(PyEvaluator.evaluateAsBooleanNoResolve(parseText("a = 'a'\nexpr = a"))); + assertNull(PyEvaluator.evaluateAsBooleanNoResolve(parseText("a = ''\nexpr = a"))); assertNull(PyEvaluator.evaluateAsBooleanNoResolve(parseText("a = 1\nexpr = a"))); assertNull(PyEvaluator.evaluateAsBooleanNoResolve(parseText("a = 0\nexpr = a"))); diff --git a/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java b/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java index 0772dd3d1a39..b31f6472b767 100644 --- a/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java +++ b/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java @@ -253,7 +253,7 @@ public class XmlDtdTest extends LightPlatformTestCase { public void testEntityDecl4() { XmlNSDescriptor NSDescriptor = createDescriptor( - "