From b95a17fcc1077a558d98b97ce302b6e2464db4e4 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Fri, 25 Oct 2013 08:00:58 +0200 Subject: [PATCH] split tests for community and ultimate parts --- .../com/intellij/find/FindManagerTest.java | 137 ++---------------- .../intellij/find/FindManagerTestUtils.java | 73 ++++++++++ 2 files changed, 87 insertions(+), 123 deletions(-) create mode 100644 java/java-tests/testSrc/com/intellij/find/FindManagerTestUtils.java diff --git a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java index 5a77577466f7..a32d806dc445 100644 --- a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java +++ b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java @@ -63,13 +63,7 @@ public class FindManagerTest extends DaemonAnalyzerTestCase { public void testFindString() throws Exception{ FindManager findManager = FindManager.getInstance(myProject); - FindModel findModel = new FindModel(); - findModel.setStringToFind("done"); - findModel.setWholeWordsOnly(false); - findModel.setFromCursor(false); - findModel.setGlobal(true); - findModel.setMultipleFiles(false); - findModel.setProjectScope(true); + FindModel findModel = FindManagerTestUtils.configureFindModel("done"); String text = "public static class MyClass{\n/*done*/\npublic static void main(){}}"; FindResult findResult = findManager.findString(text, 0, findModel); @@ -460,108 +454,34 @@ public class FindManagerTest extends DaemonAnalyzerTestCase { public void testFindInCommentsAndLiterals() throws Exception{ FindManager findManager = FindManager.getInstance(myProject); - FindModel findModel = new FindModel(); - findModel.setStringToFind("done"); - findModel.setWholeWordsOnly(false); - findModel.setFromCursor(false); - findModel.setGlobal(true); - findModel.setMultipleFiles(false); - findModel.setProjectScope(true); + FindModel findModel = FindManagerTestUtils.configureFindModel("done"); String text = "\"done done done\" /* done done done */"; - runFindInCommentsAndLiterals(findManager, findModel, text); + FindManagerTestUtils.runFindInCommentsAndLiterals(findManager, findModel, text); findModel.setRegularExpressions(true); - runFindInCommentsAndLiterals(findManager, findModel, text); - } - - private static void runFindInCommentsAndLiterals(FindManager findManager, FindModel findModel, String text) { - runFindInCommentsAndLiterals(findManager, findModel, text, "java"); - } - - private static void runFindInCommentsAndLiterals(FindManager findManager, - FindModel findModel, - String text, - String ext) { - findModel.setInStringLiteralsOnly(true); - findModel.setInCommentsOnly(false); - runFindForwardAndBackward(findManager, findModel, text, ext); - - findModel.setInStringLiteralsOnly(false); - findModel.setInCommentsOnly(true); - runFindForwardAndBackward(findManager, findModel, text, ext); - } - - private static void runFindForwardAndBackward(FindManager findManager, FindModel findModel, String text) { - runFindForwardAndBackward(findManager, findModel, text, "java"); - } - - private static void runFindForwardAndBackward(FindManager findManager, FindModel findModel, String text, String ext) { - findModel.setForward(true); - LightVirtualFile file = new LightVirtualFile("A."+ext, text); - int previousOffset; - - FindResult findResult = findManager.findString(text, 0, findModel, file); - assertTrue(findResult.isStringFound()); - previousOffset = findResult.getStartOffset(); - - findResult = findManager.findString(text, findResult.getEndOffset(), findModel, file); - assertTrue(findResult.isStringFound()); - assertTrue(findResult.getStartOffset() > previousOffset); - previousOffset = findResult.getStartOffset(); - - findResult = findManager.findString(text, findResult.getEndOffset(), findModel, file); - assertTrue(findResult.isStringFound()); - assertTrue(findResult.getStartOffset() > previousOffset); - - findModel.setForward(false); - - findResult = findManager.findString(text, text.length(), findModel, file); - assertTrue(findResult.isStringFound()); - previousOffset = findResult.getStartOffset(); - - findResult = findManager.findString(text, previousOffset, findModel, file); - assertTrue(findResult.isStringFound()); - assertTrue(previousOffset > findResult.getStartOffset() ); - - previousOffset = findResult.getStartOffset(); - - findResult = findManager.findString(text, previousOffset, findModel, file); - assertTrue(findResult.isStringFound()); - assertTrue(previousOffset > findResult.getStartOffset() ); + FindManagerTestUtils.runFindInCommentsAndLiterals(findManager, findModel, text); } public void testFindInJavaDocs() throws Exception{ FindManager findManager = FindManager.getInstance(myProject); - FindModel findModel = new FindModel(); - findModel.setStringToFind("done"); - findModel.setWholeWordsOnly(false); - findModel.setFromCursor(false); - findModel.setGlobal(true); - findModel.setMultipleFiles(false); - findModel.setProjectScope(true); + FindModel findModel = FindManagerTestUtils.configureFindModel("done"); String text = "/** done done done */"; findModel.setInCommentsOnly(true); - runFindForwardAndBackward(findManager, findModel, text); + FindManagerTestUtils.runFindForwardAndBackward(findManager, findModel, text); findModel.setRegularExpressions(true); - runFindForwardAndBackward(findManager, findModel, text); + FindManagerTestUtils.runFindForwardAndBackward(findManager, findModel, text); } public void testFindInCommentsProperlyWorksWithOffsets() throws Exception{ FindManager findManager = FindManager.getInstance(myProject); - FindModel findModel = new FindModel(); - findModel.setStringToFind("done"); - findModel.setWholeWordsOnly(false); - findModel.setFromCursor(false); - findModel.setGlobal(true); - findModel.setMultipleFiles(false); - findModel.setProjectScope(true); + FindModel findModel = FindManagerTestUtils.configureFindModel("done"); String prefix = "/*"; String text = prefix + "done*/"; @@ -580,59 +500,30 @@ public class FindManagerTest extends DaemonAnalyzerTestCase { public void testFindInUserFileType() throws Exception{ FindManager findManager = FindManager.getInstance(myProject); - FindModel findModel = new FindModel(); - findModel.setStringToFind("done"); - findModel.setWholeWordsOnly(false); - findModel.setFromCursor(false); - findModel.setGlobal(true); - findModel.setMultipleFiles(false); - findModel.setProjectScope(true); + FindModel findModel = FindManagerTestUtils.configureFindModel("done"); String text = "\"done done\"; 'done'; // done\n" + "/* done\n" + "done */"; - runFindInCommentsAndLiterals(findManager, findModel, text, "cs"); - } - - public void testFindInJsp() throws Exception{ - FindManager findManager = FindManager.getInstance(myProject); - - FindModel findModel = new FindModel(); - findModel.setStringToFind("done"); - findModel.setWholeWordsOnly(false); - findModel.setFromCursor(false); - findModel.setGlobal(true); - findModel.setMultipleFiles(false); - findModel.setProjectScope(true); - - String text = "\n<%--done-->\n<% /*done*/ %>"; - - findModel.setInCommentsOnly(true); - runFindForwardAndBackward(findManager, findModel, text, "jsp"); + FindManagerTestUtils.runFindInCommentsAndLiterals(findManager, findModel, text, "cs"); } public void testFindInLiteralToSkipQuotes() throws Exception{ FindManager findManager = FindManager.getInstance(myProject); - FindModel findModel = new FindModel(); - findModel.setStringToFind("^done$"); - findModel.setWholeWordsOnly(false); + FindModel findModel = FindManagerTestUtils.configureFindModel("^done$"); findModel.setRegularExpressions(true); - findModel.setFromCursor(false); - findModel.setGlobal(true); - findModel.setMultipleFiles(false); - findModel.setProjectScope(true); String text = "\"done\"; 'done'; 'done' \"done2\""; findModel.setInStringLiteralsOnly(true); findModel.setInCommentsOnly(false); - runFindForwardAndBackward(findManager, findModel, text, "java"); + FindManagerTestUtils.runFindForwardAndBackward(findManager, findModel, text, "java"); text = "def n = \"\"\"done\"\"\"\n def n = /done/\n def n = \"done\"\n def n = \"done2\""; - runFindForwardAndBackward(findManager, findModel, text, "groovy"); + FindManagerTestUtils.runFindForwardAndBackward(findManager, findModel, text, "groovy"); text = "\"\"; \"done\"; 'done'; 'done' \"done2\""; @@ -640,6 +531,6 @@ public class FindManagerTest extends DaemonAnalyzerTestCase { findModel.setWholeWordsOnly(true); findModel.setRegularExpressions(false); - runFindForwardAndBackward(findManager, findModel, text, "java"); + FindManagerTestUtils.runFindForwardAndBackward(findManager, findModel, text, "java"); } } diff --git a/java/java-tests/testSrc/com/intellij/find/FindManagerTestUtils.java b/java/java-tests/testSrc/com/intellij/find/FindManagerTestUtils.java new file mode 100644 index 000000000000..d5e498f66596 --- /dev/null +++ b/java/java-tests/testSrc/com/intellij/find/FindManagerTestUtils.java @@ -0,0 +1,73 @@ +package com.intellij.find; + +import com.intellij.testFramework.LightVirtualFile; +import junit.framework.Assert; + +public class FindManagerTestUtils { + static void runFindInCommentsAndLiterals(FindManager findManager, FindModel findModel, String text) { + runFindInCommentsAndLiterals(findManager, findModel, text, "java"); + } + + static void runFindInCommentsAndLiterals(FindManager findManager, + FindModel findModel, + String text, + String ext) { + findModel.setInStringLiteralsOnly(true); + findModel.setInCommentsOnly(false); + runFindForwardAndBackward(findManager, findModel, text, ext); + + findModel.setInStringLiteralsOnly(false); + findModel.setInCommentsOnly(true); + runFindForwardAndBackward(findManager, findModel, text, ext); + } + + static void runFindForwardAndBackward(FindManager findManager, FindModel findModel, String text) { + runFindForwardAndBackward(findManager, findModel, text, "java"); + } + + public static void runFindForwardAndBackward(FindManager findManager, FindModel findModel, String text, String ext) { + findModel.setForward(true); + LightVirtualFile file = new LightVirtualFile("A."+ext, text); + int previousOffset; + + FindResult findResult = findManager.findString(text, 0, findModel, file); + Assert.assertTrue(findResult.isStringFound()); + previousOffset = findResult.getStartOffset(); + + findResult = findManager.findString(text, findResult.getEndOffset(), findModel, file); + Assert.assertTrue(findResult.isStringFound()); + Assert.assertTrue(findResult.getStartOffset() > previousOffset); + previousOffset = findResult.getStartOffset(); + + findResult = findManager.findString(text, findResult.getEndOffset(), findModel, file); + Assert.assertTrue(findResult.isStringFound()); + Assert.assertTrue(findResult.getStartOffset() > previousOffset); + + findModel.setForward(false); + + findResult = findManager.findString(text, text.length(), findModel, file); + Assert.assertTrue(findResult.isStringFound()); + previousOffset = findResult.getStartOffset(); + + findResult = findManager.findString(text, previousOffset, findModel, file); + Assert.assertTrue(findResult.isStringFound()); + Assert.assertTrue(previousOffset > findResult.getStartOffset()); + + previousOffset = findResult.getStartOffset(); + + findResult = findManager.findString(text, previousOffset, findModel, file); + Assert.assertTrue(findResult.isStringFound()); + Assert.assertTrue(previousOffset > findResult.getStartOffset()); + } + + public static FindModel configureFindModel(String stringToFind) { + FindModel findModel = new FindModel(); + findModel.setStringToFind(stringToFind); + findModel.setWholeWordsOnly(false); + findModel.setFromCursor(false); + findModel.setGlobal(true); + findModel.setMultipleFiles(false); + findModel.setProjectScope(true); + return findModel; + } +}