This commit was manufactured by cvs2svn to create tag 'v20040625_1200'.
Sprout from master 2004-06-25 10:48:00 UTC Dani Megert <dmegert> 'Fixed typo'
Cherrypick from master 2004-06-24 15:48:50 UTC Kai Maetzel <kmaetzel> 'updated Javadoc':
org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
Delete:
org.eclipse.search.tests/.classpath
org.eclipse.search.tests/.cvsignore
org.eclipse.search.tests/.project
org.eclipse.search.tests/.template
org.eclipse.search.tests/build.properties
org.eclipse.search.tests/plugin.xml
org.eclipse.search.tests/src/org/eclipse/search/core/tests/AllSearchModelTests.java
org.eclipse.search.tests/src/org/eclipse/search/core/tests/LineConversionTest.java
org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java
org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullQuery.java
org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullSearchResult.java
org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java
org.eclipse.search.tests/src/org/eclipse/search/core/tests/TestSearchResult.java
org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java
org.eclipse.search.tests/src/org/eclipse/search/tests/SearchTestPlugin.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerSetup.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/JUnitSetup.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineBasedFileSearch.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java
org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java
org.eclipse.search.tests/testresources/junit37-noUI-src.zip
org.eclipse.ui.editors.tests/.classpath
org.eclipse.ui.editors.tests/.cvsignore
org.eclipse.ui.editors.tests/.project
org.eclipse.ui.editors.tests/about.html
org.eclipse.ui.editors.tests/build.properties
org.eclipse.ui.editors.tests/plugin.properties
org.eclipse.ui.editors.tests/plugin.xml
org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java
org.eclipse.ui.editors.tests/test.xml
org.eclipse.ui.workbench.texteditor.tests/.classpath
org.eclipse.ui.workbench.texteditor.tests/.cvsignore
org.eclipse.ui.workbench.texteditor.tests/.project
org.eclipse.ui.workbench.texteditor.tests/about.html
org.eclipse.ui.workbench.texteditor.tests/build.properties
org.eclipse.ui.workbench.texteditor.tests/plugin.properties
org.eclipse.ui.workbench.texteditor.tests/plugin.xml
org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
org.eclipse.ui.workbench.texteditor.tests/test.xmldiff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
index 1be2cac..56cbf95 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
@@ -3903,7 +3903,7 @@
/**
* Adheres to the contract of
- * {@link org.eclipse.jface.text.IFindReplaceTargetExtension3#findAndSelect(int, String, boolean, boolean, boolean, boolean)}.
+ * {@link IFindReplaceTargetExtension3#findAndSelect(int, String, boolean, boolean, boolean, boolean)}.
*
* @param startPosition the start position
* @param findString the find string specification
@@ -3945,7 +3945,7 @@
}
/**
- * Adheres to the contract of {@link org.eclipse.jface.text.IFindReplaceTargetExtension3#findAndSelect(int, String, boolean, boolean, boolean, boolean)}.
+ * Adheres to the contract of {@link IFindReplaceTargetExtension3#findAndSelect(int, String, boolean, boolean, boolean, boolean)}.
*
* @param startPosition the start position
* @param findString the find string specification
@@ -4784,7 +4784,7 @@
}
/**
- * Same as {@link #modelRange2WidgetRange(IRegion)} just for a {@link org.eclipse.jface.text.Position}.
+ * Same as {@link #modelRange2WidgetRange(IRegion)} just for a {@link Position}.
*
* @param modelPosition the position describing a range in the viewer's document
* @return a region describing a range in the viewer's widget
diff --git a/org.eclipse.search.tests/.classpath b/org.eclipse.search.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.search.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.search.tests/.cvsignore b/org.eclipse.search.tests/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.search.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/org.eclipse.search.tests/.project b/org.eclipse.search.tests/.project
deleted file mode 100644
index 414e31f..0000000
--- a/org.eclipse.search.tests/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.search.tests</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.jface.text</project>
- <project>org.eclipse.search</project>
- <project>org.eclipse.ui.editors</project>
- <project>org.eclipse.ui.workbench.texteditor</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.search.tests/.template b/org.eclipse.search.tests/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/org.eclipse.search.tests/.template
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form>
- <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>
-</form>
diff --git a/org.eclipse.search.tests/build.properties b/org.eclipse.search.tests/build.properties
deleted file mode 100644
index d8a5bfd..0000000
--- a/org.eclipse.search.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.tests.jar = src/
-output.tests.jar = bin/
-bin.includes = plugin.xml,\
- tests.jar
diff --git a/org.eclipse.search.tests/plugin.xml b/org.eclipse.search.tests/plugin.xml
deleted file mode 100644
index c939996..0000000
--- a/org.eclipse.search.tests/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.search.tests"
- name="Tests Plug-in"
- version="1.0.0"
- provider-name=""
- class="org.eclipse.search.tests.SearchTestPlugin">
-
- <runtime>
- <library name="tests.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.search"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui.editors"/>
- </requires>
-
-
-</plugin>
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/AllSearchModelTests.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/AllSearchModelTests.java
deleted file mode 100644
index 7ad603a..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/AllSearchModelTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Thomas Mäder
- *
- */
-public class AllSearchModelTests extends TestSuite {
-
- /**
- * Returns the suite. This is required to
- * use the JUnit Launcher.
- */
- public static Test suite() {
- return new AllSearchModelTests();
- }
-
- /**
- * Construct the test suite.
- */
- public AllSearchModelTests() {
- addTest(new TestSuite(QueryManagerTest.class));
- addTest(new TestSuite(TestSearchResult.class));
- addTest(new TestSuite(QueryManagerTest.class));
- addTest(new TestSuite(LineConversionTest.class));
- }
-
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LineConversionTest.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LineConversionTest.java
deleted file mode 100644
index aec32ee..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LineConversionTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.search.core.tests;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.search.internal.ui.SearchPlugin;
-import org.eclipse.search2.internal.ui.text.PositionTracker;
-import org.eclipse.ui.ide.IDE;
-
-/**
- */
-public class LineConversionTest extends TestCase {
- private IFile fFile;
-
- private static final String LINE_TWO= "This is the second line\n";
- private static final String LINE_ONE= "This is the first line\n";
- private static final String LINE_THREE= "This is the third line";
-
- protected void setUp() throws Exception {
- IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject("Test");
- project.create(null);
- project.open(null);
- fFile= project.getFile("/test.txt");
- fFile.create(new ByteArrayInputStream(getFileContents().getBytes()), true, null);
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- SearchPlugin.getActivePage().closeAllEditors(false);
- fFile.getProject().delete(true, true, null);
- super.tearDown();
- }
-
- private String getFileContents() {
- return LINE_ONE+LINE_TWO+LINE_THREE;
- }
-
- public void testConvertToCharacter() throws Exception {
- IDE.openEditor(SearchPlugin.getActivePage(), fFile);
- ITextFileBuffer fb= FileBuffers.getTextFileBufferManager().getTextFileBuffer(fFile.getLocation());
- IDocument doc= fb.getDocument();
-
- Position p1= new Position(2, 1);
- Position p2= PositionTracker.convertToCharacterPosition(p1, doc);
- //assertEquals(LINE_THREE, doc.get(p2.getOffset(), p2.getLength()));
- assertEquals(p1, PositionTracker.convertToLinePosition(p2, doc));
-
- p1= new Position(0, 1);
- p2= PositionTracker.convertToCharacterPosition(p1, doc);
- assertEquals(LINE_ONE, doc.get(p2.getOffset(), p2.getLength()));
- assertEquals(p1, PositionTracker.convertToLinePosition(p2, doc));
-
- p1= new Position(1, 1);
- p2= PositionTracker.convertToCharacterPosition(p1, doc);
- assertEquals(LINE_TWO, doc.get(p2.getOffset(), p2.getLength()));
- assertEquals(p1, PositionTracker.convertToLinePosition(p2, doc));
-
- p1= new Position(0, 0);
- p2= PositionTracker.convertToCharacterPosition(p1, doc);
- assertEquals("", doc.get(p2.getOffset(), p2.getLength()));
- assertEquals(p1, PositionTracker.convertToLinePosition(p2, doc));
- }
-
- public void testBogusLines() throws Exception {
- IDE.openEditor(SearchPlugin.getActivePage(), fFile);
- ITextFileBuffer fb= FileBuffers.getTextFileBufferManager().getTextFileBuffer(fFile.getLocation());
- IDocument doc= fb.getDocument();
-
- Position p1= new Position(2, 67);
- try {
- Position p2= PositionTracker.convertToCharacterPosition(p1, doc);
- assertTrue("shouldn't happen", false);
- } catch (BadLocationException e) {
- }
- }
-
- public void atestLineOffsets() throws Exception {
- IDE.openEditor(SearchPlugin.getActivePage(), fFile);
- ITextFileBuffer fb= FileBuffers.getTextFileBufferManager().getTextFileBuffer(fFile.getLocation());
- IDocument doc= fb.getDocument();
-
- int offset= doc.getLineOffset(3);
- int line= doc.getLineOfOffset(offset);
- assertEquals(3, line);
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java
deleted file mode 100644
index 31a8864..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.core.tests;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-/**
- */
-public class LongQuery extends NullQuery {
-
- private boolean fIsRunning= false;
-
- public boolean canRunInBackground() {
- return true;
- }
-
- public IStatus run(IProgressMonitor monitor) {
- fIsRunning= true;
- while (!monitor.isCanceled()) {
- try {
- Thread.sleep(50);
- } catch (InterruptedException e) {
- // should not happen
- }
- }
- fIsRunning= false;
- return new Status(IStatus.OK, "some plugin", 0, "No message", null);
- }
-
- public boolean isRunning() {
- return fIsRunning;
- }
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullQuery.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullQuery.java
deleted file mode 100644
index edd2a35..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullQuery.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.core.tests;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.ISearchResult;
-
-public class NullQuery implements ISearchQuery {
-
- public IStatus run(IProgressMonitor monitor) {
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.ISearchQuery#getName()
- */
- public String getLabel() {
- return "Null Query"; //$NON-NLS-1$
- }
-
- public boolean canRerun() {
- return true;
- }
-
- public boolean canRunInBackground() {
- return true;
- }
-
- public ISearchResult getSearchResult() {
- return new NullSearchResult();
- }
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullSearchResult.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullSearchResult.java
deleted file mode 100644
index 7aa8842..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/NullSearchResult.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.core.tests;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.IEditorMatchAdapter;
-import org.eclipse.search.ui.text.IFileMatchAdapter;
-
-/**
- * @author Thomas Mäder
- *
- */
-public class NullSearchResult extends AbstractTextSearchResult {
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.ISearchResult#getText(org.eclipse.search.ui.ISearchResult)
- */
- public String getLabel() {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.ISearchResult#getTooltip(org.eclipse.search.ui.ISearchResult)
- */
- public String getTooltip() {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.ISearchResult#getImageDescriptor(org.eclipse.search.ui.ISearchResult)
- */
- public ImageDescriptor getImageDescriptor() {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.ISearchResult#getQuery()
- */
- public ISearchQuery getQuery() {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getEditorMatchAdapter()
- */
- public IEditorMatchAdapter getEditorMatchAdapter() {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getFileMatchAdapter()
- */
- public IFileMatchAdapter getFileMatchAdapter() {
- // TODO Auto-generated method stub
- return null;
- }
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java
deleted file mode 100644
index a5b305f..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/QueryManagerTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.search.ui.IQueryListener;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.NewSearchUI;
-
-import org.eclipse.search2.internal.ui.InternalSearchUI;
-
-/**
- * @author Thomas Mäder
- *
- */
-public class QueryManagerTest extends TestCase {
- public void testRemoveQuery() {
- ISearchQuery query= new NullQuery();
- InternalSearchUI.getInstance().addQuery(query);
- InternalSearchUI.getInstance().removeQuery(query);
- ISearchQuery[] all= InternalSearchUI.getInstance().getQueries();
- for (int i= 0; i < all.length; i++) {
- if (query == all[i])
- assertTrue(false);
- }
- }
-
- public void testAddQuery() {
- ISearchQuery query= new NullQuery();
- InternalSearchUI.getInstance().addQuery(query);
- ISearchQuery[] all= NewSearchUI.getQueries();
- for (int i= 0; i < all.length; i++) {
- if (query == all[i])
- return;
- }
- assertTrue(false);
- }
-
- public void testQueryListener() {
- final boolean [] wasAdded= { false };
- final boolean [] wasRemoved= { false };
- IQueryListener l= new IQueryListener() {
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.IQueryListener#queryAdded(org.eclipse.search.ui.ISearchQuery)
- */
- public void queryAdded(ISearchQuery query) {
- wasAdded[0]= true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.IQueryListener#queryRemoved(org.eclipse.search.ui.ISearchQuery)
- */
- public void queryRemoved(ISearchQuery query) {
- wasRemoved[0]= true;
- }
- public void queryStarting(ISearchQuery query) {
- // not interested
- }
- public void queryFinished(ISearchQuery query) {
- // not interested
- }
- } ;
- NewSearchUI.addQueryListener(l);
- ISearchQuery query= new NullQuery();
- InternalSearchUI.getInstance().addQuery(query);
- assertTrue(wasAdded[0]);
- InternalSearchUI.getInstance().removeQuery(query);
- assertTrue(wasRemoved[0]);
- InternalSearchUI.getInstance().removeQueryListener(l);
- wasAdded[0]= false;
- wasRemoved[0]= false;
- InternalSearchUI.getInstance().addQuery(query);
- assertFalse(wasAdded[0]);
- InternalSearchUI.getInstance().removeQuery(query);
- assertFalse(wasRemoved[0]);
- }
-
- public void testRemoveCancels() {
- LongQuery query= new LongQuery();
- NewSearchUI.runQuery(query);
- try {
- // give the other thread some time to finish.
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- // should not happen
- }
- assertTrue(query.isRunning());
- assertTrue(InternalSearchUI.getInstance().isQueryRunning(query));
- InternalSearchUI.getInstance().removeQuery(query);
- try {
- // give the other thread some time to finish.
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- // should not happen
- }
- assertFalse(query.isRunning());
- assertFalse(InternalSearchUI.getInstance().isQueryRunning(query));
- }
-
- public void testRemoveAllCancels() {
- LongQuery query= new LongQuery();
- NewSearchUI.runQuery(query);
- InternalSearchUI.getInstance().removeQuery(query);
- try {
- // give the other thread some time to finish.
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- // should not happen
- }
- assertFalse(query.isRunning());
- }
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/TestSearchResult.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/TestSearchResult.java
deleted file mode 100644
index 2242971..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/TestSearchResult.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.ISearchResultListener;
-import org.eclipse.search.ui.SearchResultEvent;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.search.ui.text.MatchEvent;
-
-
-/**
- * @author Thomas Mäder
- *
- */
-public class TestSearchResult extends TestCase {
-
- public void testAddMatch() {
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 0, 0);
- result.addMatch(match1);
- assertEquals(result.getMatchCount(), 1);
- Match match2= new Match(object, 0, 0);
- result.addMatch(match2);
- assertEquals(result.getMatchCount(), 2);
- result.addMatch(match1);
- assertEquals(result.getMatchCount(), 2);
- }
-
- public void testAddMatchDifferentStart() {
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 2, 0);
- result.addMatch(match1);
- assertEquals(result.getMatchCount(), 1);
- Match match2= new Match(object, 1, 1);
- result.addMatch(match2);
- Match match3= new Match(object, 0, 2);
- result.addMatch(match3);
- Match[] matches= result.getMatches(object);
- assertTrue("matches[0]", matches[0] == match3);
- assertTrue("matches[1]", matches[1] == match2);
- assertTrue("matches[2]", matches[2] == match1);
- }
-
- public void testAddMatchDifferentStartInOrder() {
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 0, 0);
- result.addMatch(match1);
- assertEquals(result.getMatchCount(), 1);
- Match match2= new Match(object, 1, 1);
- result.addMatch(match2);
- Match match3= new Match(object, 2, 2);
- result.addMatch(match3);
- Match[] matches= result.getMatches(object);
- assertTrue("matches[0]", matches[0] == match1);
- assertTrue("matches[1]", matches[1] == match2);
- assertTrue("matches[2]", matches[2] == match3);
- }
-
- public void testAddMatchDifferentLength() {
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 1, 1);
- result.addMatch(match1);
- assertEquals(result.getMatchCount(), 1);
- Match match2= new Match(object, 1, 0);
- result.addMatch(match2);
- Match[] matches= result.getMatches(object);
- assertTrue("matches[0]", matches[0] == match2);
- assertTrue("matches[1]", matches[1] == match1);
- }
-
- public void testAddMatchOrderPreserving() {
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 1, 0);
- result.addMatch(match1);
- assertEquals(result.getMatchCount(), 1);
- Match match2= new Match(object, 1, 0);
- result.addMatch(match2);
- Match[] matches= result.getMatches(object);
- assertTrue("matches[0]", matches[0] == match1);
- assertTrue("matches[1]", matches[1] == match2);
- }
-
-
-
- public void testAddMatches() {
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 0, 0);
- Match match2= new Match(object, 0, 0);
- result.addMatches(new Match[] { match1, match2 });
- assertEquals(result.getMatchCount(), 2);
- result.addMatch(match1);
- assertEquals(result.getMatchCount(), 2);
- }
-
- public void testRemoveMatch() {
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 0, 0);
- result.addMatch(match1);
- Match match2= new Match(object, 0, 0);
- result.addMatch(match2);
- assertEquals(result.getMatchCount(), 2);
-
- result.removeMatch(match1);
- assertEquals(result.getMatchCount(), 1);
- result.removeMatch(match1);
- assertEquals(result.getMatchCount(), 1);
-
- }
-
- public void testRemoveMatches() {
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 0, 0);
- Match match2= new Match(object, 0, 0);
- result.addMatches(new Match[] { match1, match2 });
- assertEquals(result.getMatchCount(), 2);
-
- result.removeMatches(new Match[] { match1, match2 });
- assertEquals(result.getMatchCount(), 0);
-
- }
-
- public void testMatchEvent() {
- final boolean [] wasAdded= { false };
- final boolean [] wasRemoved= { false };
-
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- result.addListener(new ISearchResultListener() {
- public void searchResultChanged(SearchResultEvent e) {
- if (e instanceof MatchEvent) {
- MatchEvent evt= (MatchEvent) e;
- if (evt.getKind() == MatchEvent.ADDED) {
- wasAdded[0]= true;
- } else {
- wasRemoved[0]= true;
- }
- }
- }
- });
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 0, 0);
- result.addMatch(match1);
- assertTrue(wasAdded[0]);
- wasAdded[0]= false;
- result.addMatch(match1);
- assertFalse(wasAdded[0]);
-
- Match match2= new Match(object, 0, 0);
- result.addMatch(match2);
- assertTrue(wasAdded[0]);
- wasAdded[0]= false;
-
- result.removeMatch(match2);
- assertTrue(wasRemoved[0]);
- wasRemoved[0]= false;
-
- result.removeMatch(match2);
- assertFalse(wasRemoved[0]);
- }
-
- public void testBatchedMatchEvent() {
- final boolean [] wasAdded= { false };
- final boolean [] wasRemoved= { false };
-
- ISearchQuery query= new NullQuery();
- AbstractTextSearchResult result= (AbstractTextSearchResult) query.getSearchResult();
-
- result.addListener(new ISearchResultListener() {
- public void searchResultChanged(SearchResultEvent e) {
- if (e instanceof MatchEvent) {
- MatchEvent evt= (MatchEvent) e;
- if (evt.getKind() == MatchEvent.ADDED) {
- wasAdded[0]= true;
- } else {
- wasRemoved[0]= true;
- }
- }
- }
- });
-
- String object= "object"; //$NON-NLS-1$
-
- Match match1= new Match(object, 0, 0);
- result.addMatches(new Match[] { match1 });
- assertTrue(wasAdded[0]);
- wasAdded[0]= false;
- result.addMatches(new Match[] { match1 });
- assertFalse(wasAdded[0]);
-
- Match match2= new Match(object, 0, 0);
- result.addMatches(new Match[] { match2 });
- assertTrue(wasAdded[0]);
- wasAdded[0]= false;
-
- result.removeMatches(new Match[] { match2 });
- assertTrue(wasRemoved[0]);
- wasRemoved[0]= false;
-
- result.removeMatches(new Match[] { match2 });
- assertFalse(wasRemoved[0]);
- }
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java
deleted file mode 100644
index 11932f7..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.search.tests.filesearch.AllFileSearchTests;
-import org.eclipse.search.core.tests.AllSearchModelTests;
-
-public class AllSearchTests extends TestSuite {
-
- public static Test suite() {
- return new AllSearchTests();
- }
-
- public AllSearchTests() {
- addTest(AllFileSearchTests.suite());
- addTest(AllSearchModelTests.suite());
- }
-
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/SearchTestPlugin.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/SearchTestPlugin.java
deleted file mode 100644
index d9aab2f..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/SearchTestPlugin.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.search.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search2.internal.ui.SearchView;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-/**
- * Plugin class for search tests.
- */
-public class SearchTestPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static SearchTestPlugin plugin;
-
- public SearchTestPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static SearchTestPlugin getDefault() {
- return plugin;
- }
-
- public static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {
- ZipFileStructureProvider structureProvider= new ZipFileStructureProvider(srcZipFile);
- try {
- ImportOperation op= new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, new IOverwriteQuery() {
- public String queryOverwrite(String pathString) {
- return ALL;
- }
- });
- op.run(monitor);
- } catch (InterruptedException e) {
- // should not happen
- }
- }
-
- public File getFileInPlugin(IPath path) {
- try {
- URL installURL= new URL(getDescriptor().getInstallURL(), path.toString());
- URL localURL= Platform.asLocalURL(installURL);
- return new File(localURL.getFile());
- } catch (IOException e) {
- return null;
- }
- }
-
- public SearchView getSearchView() {
- return (SearchView) NewSearchUI.activateSearchResultView();
- }
-
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java
deleted file mode 100644
index 8d12404..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.tests.filesearch;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllFileSearchTests extends TestSuite {
-
- public static Test suite() {
- return new AllFileSearchTests();
- }
-
- public AllFileSearchTests() {
- addTest(AnnotationManagerTest.allTests());
- addTest(LineAnnotationManagerTest.allTests());
- addTest(SearchResultPageTest.allTests());
- addTest(ResultUpdaterTest.allTests());
- addTest(SortingTest.allTests());
- }
-
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerSetup.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerSetup.java
deleted file mode 100644
index 8e2871a..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerSetup.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Created on May 6, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.search.tests.filesearch;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.eclipse.search2.internal.ui.text.EditorAnnotationManager;
-
-public class AnnotationManagerSetup extends TestSetup {
- private int fHighlighterType;
-
- public AnnotationManagerSetup(Test test, int hightlighterType) {
- super(test);
- fHighlighterType= hightlighterType;
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- EditorAnnotationManager.debugSetHighlighterType(fHighlighterType);
- }
-
- protected void tearDown() throws Exception {
- EditorAnnotationManager.debugSetHighlighterType(EditorAnnotationManager.HIGHLLIGHTER_ANY);
- super.tearDown();
- }
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java
deleted file mode 100644
index 40e066e..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AnnotationManagerTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.tests.filesearch;
-
-import java.util.HashSet;
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.search.internal.core.text.TextSearchScope;
-import org.eclipse.search.internal.ui.text.FileSearchQuery;
-import org.eclipse.search.internal.ui.text.FileSearchResult;
-import org.eclipse.search.tests.SearchTestPlugin;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.search2.internal.ui.InternalSearchUI;
-import org.eclipse.search2.internal.ui.text.EditorAnnotationManager;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.AnnotationTypeLookup;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class AnnotationManagerTest extends TestCase {
- FileSearchQuery fQuery1;
- FileSearchQuery fQuery2;
-
- LineBasedFileSearch fLineQuery;
-
- private AnnotationTypeLookup fAnnotationTypeLookup= EditorsUI.getAnnotationTypeLookup();
-
- public AnnotationManagerTest(String name) {
- super(name);
- }
-
- public static Test allTests() {
- TestSuite suite= new TestSuite();
-
- suite.addTest(new JUnitSetup(new AnnotationManagerSetup(new TestSuite(AnnotationManagerTest.class), EditorAnnotationManager.HIGHLIGHTER_ANNOTATION)));
- suite.addTest(new JUnitSetup(new AnnotationManagerSetup(new TestSuite(AnnotationManagerTest.class), EditorAnnotationManager.HIGHLIGHTER_MARKER)));
- return suite;
- }
-
- public static Test suite() {
- return allTests();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
-
- TextSearchScope scope= TextSearchScope.newWorkspaceScope();
- scope.addExtension("*.java");
- fQuery1= new FileSearchQuery(scope, "", "Test");
- fQuery2= new FileSearchQuery(scope, "", "TestCase");
-
- fLineQuery= new LineBasedFileSearch(scope, "", "Test");
- }
-
- protected void tearDown() throws Exception {
- InternalSearchUI.getInstance().removeAllQueries();
- fQuery1= null;
- fQuery2= null;
- fLineQuery= null;
- super.tearDown();
- }
-
- public void testAddAnnotation() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- Object[] files= result.getElements();
- for (int i= 0; i < files.length; i++) {
- IFile file= (IFile) files[0];
- ITextEditor editor= (ITextEditor)IDE.openEditor(SearchTestPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(), file, true);
- IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput());
- annotationModel.getAnnotationIterator();
- HashSet positions= new HashSet();
- for (Iterator iter= annotationModel.getAnnotationIterator(); iter.hasNext();) {
- Annotation annotation= (Annotation) iter.next();
- if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) {
- positions.add(annotationModel.getPosition(annotation));
- }
- }
-
- Match[] matches= result.getMatches(file);
- for (int j= 0; j < matches.length; j++) {
- Position position= new Position(matches[j].getOffset(), matches[j].getLength());
- assertTrue("position not found at: "+j, positions.remove(position));
- }
- assertEquals(0, positions.size());
-
- }
- }
-
- public void testBogusAnnotation() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- FileSearchResult result= (FileSearchResult) fQuery1.getSearchResult();
- IFile file= (IFile) result.getElements()[0];
- IDE.openEditor(SearchTestPlugin.getDefault().getWorkbench().getWorkbenchWindows()[0].getPages()[0], file, true);
- result.addMatch(new Match(file, -1, -1));
- }
-
- public void testRemoveQuery() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- Object[] files= result.getElements();
- InternalSearchUI.getInstance().removeQuery(fQuery1);
- for (int i= 0; i < files.length; i++) {
- IFile file= (IFile) files[0];
- ITextEditor editor= (ITextEditor)IDE.openEditor(SearchTestPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(), file, true);
- IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput());
- int annotationCount= 0;
- for (Iterator annotations= annotationModel.getAnnotationIterator(); annotations.hasNext();) {
- Annotation annotation= (Annotation) annotations.next();
- if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) {
- annotationCount++;
- }
- }
- assertEquals(0, annotationCount);
- }
- }
-
-
- public void testReplaceQuery() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- Object[] files= result.getElements();
- NewSearchUI.runQueryInForeground(null, fQuery2);
- for (int i= 0; i < files.length; i++) {
- IFile file= (IFile) files[0];
- ITextEditor editor= (ITextEditor)IDE.openEditor(SearchTestPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(), file, true);
- IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput());
- int annotationCount= 0;
- IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput());
- for (Iterator annotations= annotationModel.getAnnotationIterator(); annotations.hasNext();) {
- Annotation annotation= (Annotation) annotations.next();
- if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) {
- Position p= annotationModel.getPosition(annotation);
- String text= document.get(p.getOffset(), p.getLength());
- assertTrue(text.equalsIgnoreCase(fQuery2.getSearchString()));
- }
- }
- assertEquals(0, annotationCount);
- }
- }
-
- public void testSwitchQuery() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- Object[] files= result.getElements();
- NewSearchUI.runQueryInForeground(null, fQuery2);
- SearchTestPlugin.getDefault().getSearchView().showSearchResult(result);
- for (int i= 0; i < files.length; i++) {
- IFile file= (IFile) files[0];
- ITextEditor editor= (ITextEditor)IDE.openEditor(SearchTestPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(), file, true);
- IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput());
- int annotationCount= 0;
- IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput());
- for (Iterator annotations= annotationModel.getAnnotationIterator(); annotations.hasNext();) {
- Annotation annotation= (Annotation) annotations.next();
- if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) {
- Position p= annotationModel.getPosition(annotation);
- String text= document.get(p.getOffset(), p.getLength());
- assertTrue(text.equalsIgnoreCase(fQuery1.getSearchString()));
- }
- }
- assertEquals(0, annotationCount);
- }
- }
-
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/JUnitSetup.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/JUnitSetup.java
deleted file mode 100644
index 51e01be..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/JUnitSetup.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.tests.filesearch;
-
-import java.util.zip.ZipFile;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.search.tests.SearchTestPlugin;
-
-public class JUnitSetup extends TestSetup {
- public static final String PROJECT_NAME= "JUnitSource";
-
- public static IProject getProject() {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
- }
-
- public JUnitSetup(Test test) {
- super(test);
- }
-
- protected void setUp() throws Exception {
- ZipFile zip= new ZipFile(SearchTestPlugin.getDefault().getFileInPlugin(new Path("testresources/junit37-noUI-src.zip"))); //$NON-NLS-1$
- SearchTestPlugin.importFilesFromZip(zip, new Path(PROJECT_NAME), null); //$NON-NLS-1$
- }
-
- protected void tearDown() throws Exception {
- getProject().delete(true, true, null);
- }
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java
deleted file mode 100644
index 61da737..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineAnnotationManagerTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.tests.filesearch;
-
-import java.util.HashSet;
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.search.internal.core.text.TextSearchScope;
-import org.eclipse.search.tests.SearchTestPlugin;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.search2.internal.ui.InternalSearchUI;
-import org.eclipse.search2.internal.ui.text.EditorAnnotationManager;
-import org.eclipse.search2.internal.ui.text.PositionTracker;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.AnnotationTypeLookup;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class LineAnnotationManagerTest extends TestCase {
- LineBasedFileSearch fLineQuery;
-
- private AnnotationTypeLookup fAnnotationTypeLookup= EditorsUI.getAnnotationTypeLookup();
-
- public LineAnnotationManagerTest(String name) {
- super(name);
- }
-
- public static Test allTests() {
- TestSuite suite= new TestSuite();
-
- suite.addTest(new JUnitSetup(new AnnotationManagerSetup(new TestSuite(LineAnnotationManagerTest.class), EditorAnnotationManager.HIGHLIGHTER_ANNOTATION)));
- return suite;
- }
-
- public static Test suite() {
- return allTests();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
-
- TextSearchScope scope= TextSearchScope.newWorkspaceScope();
- scope.addExtension("*.java");
-
- fLineQuery= new LineBasedFileSearch(scope, "", "Test");
- }
-
- protected void tearDown() throws Exception {
- InternalSearchUI.getInstance().removeAllQueries();
- fLineQuery= null;
- super.tearDown();
- }
-
- public void testLineBasedQuery() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fLineQuery);
- AbstractTextSearchResult result= (AbstractTextSearchResult) fLineQuery.getSearchResult();
- Object[] files= result.getElements();
- for (int i= 0; i < files.length; i++) {
- IFile file= (IFile) files[0];
- ITextEditor editor= (ITextEditor)IDE.openEditor(SearchTestPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(), file, true);
- IAnnotationModel annotationModel= editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput());
- IDocument document= editor.getDocumentProvider().getDocument(editor.getEditorInput());
- annotationModel.getAnnotationIterator();
- HashSet positions= new HashSet();
- for (Iterator iter= annotationModel.getAnnotationIterator(); iter.hasNext();) {
- Annotation annotation= (Annotation) iter.next();
- if (annotation.getType().equals(fAnnotationTypeLookup.getAnnotationType(NewSearchUI.SEARCH_MARKER, IMarker.SEVERITY_INFO))) {
- positions.add(annotationModel.getPosition(annotation));
- }
- }
-
- Match[] matches= result.getMatches(file);
- for (int j= 0; j < matches.length; j++) {
-
- Position position= computeDocumentPositionFromLineMatch(document, matches[j]);
- assertTrue("position not found at: "+j, positions.remove(position));
- }
- assertEquals(0, positions.size());
-
- }
- }
-
- private Position computeDocumentPositionFromLineMatch(IDocument document, Match match) throws BadLocationException {
- Position p= new Position(match.getOffset(), match.getLength());
- return PositionTracker.convertToCharacterPosition(p, document);
- }
-
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineBasedFileSearch.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineBasedFileSearch.java
deleted file mode 100644
index bd36289..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/LineBasedFileSearch.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.search.tests.filesearch;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.search.internal.core.text.TextSearchScope;
-import org.eclipse.search.internal.ui.text.FileMatch;
-import org.eclipse.search.internal.ui.text.FileSearchQuery;
-import org.eclipse.search.ui.text.Match;
-
-/**
- */
-public class LineBasedFileSearch extends FileSearchQuery {
- public LineBasedFileSearch(TextSearchScope scope, String options, String searchString) {
- super(scope, options, searchString);
- }
-
- protected FileMatch createMatch(IFile file, int start, int length, int lineNumber) {
- return new FileMatch(file, lineNumber, 1) {
- /* (non-Javadoc)
- * @see org.eclipse.search.ui.text.Match#getBaseUnit()
- */
- public int getBaseUnit() {
- return Match.UNIT_LINE;
- }
- };
- }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java
deleted file mode 100644
index c735186..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/PositionTrackerTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.tests.filesearch;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.search.internal.core.text.TextSearchScope;
-import org.eclipse.search.internal.ui.SearchPlugin;
-import org.eclipse.search.internal.ui.text.FileSearchQuery;
-import org.eclipse.search.internal.ui.text.FileSearchResult;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.search2.internal.ui.InternalSearchUI;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.ide.IDE;
-
-public class PositionTrackerTest extends TestCase {
- FileSearchQuery fQuery1;
-
- public PositionTrackerTest(String name) {
- super(name);
- }
-
- public static Test allTests() {
- return new JUnitSetup(new TestSuite(PositionTrackerTest.class));
- }
-
- public static Test suite() {
- return allTests();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
-
- TextSearchScope scope= TextSearchScope.newWorkspaceScope();
- scope.addExtension("*.java");
- fQuery1= new FileSearchQuery(scope, "", "Test");
- }
-
- public void testInsertAt0() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- Object[] elements= result.getElements();
- try {
- for (int i = 0; i < elements.length; i++) {
- checkInsertAtZero(result, (IFile) elements[i]);
- }
- } finally {
- SearchPlugin.getActivePage().closeAllEditors(false);
- }
- }
-
- public void testInsertInsideMatch() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- FileSearchResult result= (FileSearchResult) fQuery1.getSearchResult();
- Object[] elements= result.getElements();
- try {
- for (int i = 0; i < elements.length; i++) {
- checkInsertInsideMatch(result, (IFile) elements[i]);
- }
- } finally {
- SearchPlugin.getActivePage().closeAllEditors(false);
- }
- }
-
-
- private void checkInsertInsideMatch(FileSearchResult result, IFile file) throws PartInitException, BadLocationException {
- Match[] matches= result.getMatches(file);
- IDE.openEditor(SearchPlugin.getActivePage(), file);
- ITextFileBuffer fb= FileBuffers.getTextFileBufferManager().getTextFileBuffer(file.getLocation());
- IDocument doc= fb.getDocument();
-
- for (int i = 0; i < matches.length; i++) {
- Position currentPosition= InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(matches[i]);
- assertNotNull(currentPosition);
- doc.replace(currentPosition.offset+1, 0, "Test");
- }
-
- for (int i = 0; i < matches.length; i++) {
- Position currentPosition= InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(matches[i]);
- assertNotNull(currentPosition);
- String text= doc.get(currentPosition.offset, currentPosition.length);
- StringBuffer buf= new StringBuffer();
- buf.append(text.charAt(0));
- buf.append(text.substring(5));
- assertEquals(buf.toString(), ((FileSearchQuery)result.getQuery()).getSearchString());
- }
-}
-
- private void checkInsertAtZero(AbstractTextSearchResult result, IFile file) throws PartInitException, BadLocationException {
- Match[] matches= result.getMatches(file);
- int[] originalStarts= new int[matches.length];
- for (int i = 0; i < originalStarts.length; i++) {
- originalStarts[i]= matches[i].getOffset();
- }
- IDE.openEditor(SearchPlugin.getActivePage(), file);
- ITextFileBuffer fb= FileBuffers.getTextFileBufferManager().getTextFileBuffer(file.getLocation());
- IDocument doc= fb.getDocument();
- doc.replace(0, 0, "Test");
-
- for (int i = 0; i < originalStarts.length; i++) {
- Position currentPosition= InternalSearchUI.getInstance().getPositionTracker().getCurrentPosition(matches[i]);
- assertNotNull(currentPosition);
- assertEquals(originalStarts[i]+"Test".length(), currentPosition.getOffset());
-
- }
- }
-
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java
deleted file mode 100644
index 3741a6d..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/ResultUpdaterTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.tests.filesearch;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.search.internal.core.text.TextSearchScope;
-import org.eclipse.search.internal.ui.text.FileSearchQuery;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-
-public class ResultUpdaterTest extends TestCase {
- FileSearchQuery fQuery1;
- FileSearchQuery fQuery2;
-
- public ResultUpdaterTest(String name) {
- super(name);
- }
-
- public static Test allTests() {
- return new JUnitSetup(new TestSuite(ResultUpdaterTest.class));
- }
-
- public static Test suite() {
- return allTests();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
-
- TextSearchScope scope= TextSearchScope.newWorkspaceScope();
- scope.addExtension("*.java");
- fQuery1= new FileSearchQuery(scope, "", "Test");
- fQuery2= new FileSearchQuery(scope, "", "TestCase");
- }
-
- public void testRemoveFile() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- Object[] elements= result.getElements();
- int fileCount= result.getMatchCount(elements[0]);
- int totalCount= result.getMatchCount();
- ((IFile)elements[0]).delete(true, true, null);
- assertEquals(totalCount-fileCount, result.getMatchCount());
- assertEquals(0, result.getMatchCount(elements[0]));
- }
-
- public void testRemoveProject() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- JUnitSetup.getProject().delete(true, true, null);
- assertEquals(0, result.getMatchCount());
- // must recreate the project.
- ResourcesPlugin.getWorkspace().getRoot().getProject(JUnitSetup.PROJECT_NAME).create(null);
- }
-}
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java
deleted file mode 100644
index c53e205..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SearchResultPageTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Common Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.search.tests.filesearch;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.search.internal.core.text.TextSearchScope;
-import org.eclipse.search.internal.ui.text.FileSearchPage;
-import org.eclipse.search.internal.ui.text.FileSearchQuery;
-import org.eclipse.search.ui.ISearchResultViewPart;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Widget;
-
-public class SearchResultPageTest extends TestCase {
- FileSearchQuery fQuery1;
-
- public SearchResultPageTest(String name) {
- super(name);
- }
-
- public static Test allTests() {
- return new JUnitSetup(new TestSuite(SearchResultPageTest.class));
- }
-
- public static Test suite() {
- return allTests();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- TextSearchScope scope= TextSearchScope.newWorkspaceScope();
- scope.addExtension("*.java");
- fQuery1= new FileSearchQuery(scope, "", "Test");
- }
-
- public void atestBasicDisplay() throws Exception {
- ISearchResultViewPart view= NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- FileSearchPage page= (FileSearchPage) view.getActivePage();
- page.setLayout(AbstractTextSearchViewPage.FLAG_LAYOUT_TREE);
- checkViewerDisplay(page);
- page.setLayout(AbstractTextSearchViewPage.FLAG_LAYOUT_FLAT);
- checkViewerDisplay(page);
- }
-
- private void checkViewerDisplay(FileSearchPage page) {
- StructuredViewer viewer= page.getViewer();
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- // make sure all elements have items.
- if (viewer instanceof AbstractTreeViewer)
- ((AbstractTreeViewer)viewer).expandAll();
- Object[] elements= result.getElements();
- for (int i= 0; i < elements.length; i++) {
- // make sure all elements in the test result are present in the viewer and have the proper count displayed
- checkElementDisplay(viewer, result, elements[i]);
- }
- }
-
- public void atestRemoveTreeMatches() throws Exception {
- ISearchResultViewPart view= NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- FileSearchPage page= (FileSearchPage) view.getActivePage();
- page.setLayout(AbstractTextSearchViewPage.FLAG_LAYOUT_TREE);
- AbstractTreeViewer viewer= (AbstractTreeViewer) page.getViewer();
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- // make sure all elements have items.
- viewer.expandAll();
- Object[] elements= result.getElements();
- //page.setUpdateTracing(true);
- for (int i= 0; i < elements.length; i++) {
- Match[] matches= result.getMatches(elements[i]);
- viewer.reveal(elements[i]);
- for (int j= 0; j < matches.length; j++) {
- checkElementDisplay(viewer, result, elements[i]);
- result.removeMatch(matches[j]);
- consumeEvents(page);
- }
- }
- //page.setUpdateTracing(false);
- }
-
- private void consumeEvents(FileSearchPage page) {
- IJobManager manager= Platform.getJobManager();
- while (manager.find(page).length > 0) {
- Display.getDefault().readAndDispatch();
- }
- }
-
- private void checkElementDisplay(StructuredViewer viewer, AbstractTextSearchResult result, Object element) {
- Widget widget= viewer.testFindItem(element);
- assertTrue(widget instanceof Item);
- Item item= (Item) widget;
- int itemCount= result.getMatchCount(element);
- assertTrue(itemCount > 0);
- if (itemCount > 1)
- assertTrue(item.getText().indexOf(String.valueOf(itemCount)) >= 0);
- }
-
- public void testTableNavigation() {
- ISearchResultViewPart view= NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- FileSearchPage page= (FileSearchPage) view.getActivePage();
- page.setLayout(AbstractTextSearchViewPage.FLAG_LAYOUT_FLAT);
- Table table= ((TableViewer) page.getViewer()).getTable();
-
- // select the first element.
- table.setSelection(0);
-
- // back from first match, goto last
- page.gotoPreviousMatch();
- assertEquals(1, table.getSelectionCount());
- assertEquals(table.getItemCount()-1, table.getSelectionIndex());
-
- // and forward again, to the first match.
- page.gotoNextMatch();
- assertEquals(1, table.getSelectionCount());
- assertEquals(0, table.getSelectionIndex());
-}
-}
\ No newline at end of file
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java
deleted file mode 100644
index bcc35ab..0000000
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/SortingTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.search.tests.filesearch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.search.internal.core.text.TextSearchScope;
-import org.eclipse.search.internal.ui.text.FileSearchQuery;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.Match;
-
-public class SortingTest extends TestCase {
- FileSearchQuery fQuery1;
-
- public SortingTest(String name) {
- super(name);
- }
-
- public static Test allTests() {
- return new JUnitSetup(new TestSuite(SortingTest.class));
- }
-
- public static Test suite() {
- return allTests();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
-
- TextSearchScope scope= TextSearchScope.newWorkspaceScope();
- scope.addExtension("*.java");
- fQuery1= new FileSearchQuery(scope, "", "Test");
- }
-
- public void testSorted() throws Exception {
- NewSearchUI.activateSearchResultView();
- NewSearchUI.runQueryInForeground(null, fQuery1);
- AbstractTextSearchResult result= (AbstractTextSearchResult) fQuery1.getSearchResult();
- int originalMatchCount= result.getMatchCount();
- List allMatches= new ArrayList(originalMatchCount);
-
- // first, collect all matches
- Object[] elements= result.getElements();
- for (int i= 0; i < elements.length; i++) {
- Match[] matches= result.getMatches(elements[i]);
- for (int j= 0; j < matches.length; j++) {
- allMatches.add(matches[j]);
- }
- }
- // now remove them and readd them in reverse order
- result.removeAll();
- assertTrue("removed all matches", result.getMatchCount() == 0);
-
- for (int i= allMatches.size()-1; i >= 0; i--) {
- result.addMatch((Match) allMatches.get(i));
- }
-
- assertEquals("Test that all matches have been added again", result.getMatchCount(), originalMatchCount);
-
- // now check that they're ordered by position.
- for (int i= 0; i < elements.length; i++) {
- Match[] matches= result.getMatches(elements[i]);
- assertTrue("has matches", matches.length > 0);
- for (int j= 1; j < matches.length; j++) {
- assertTrue("order problem", isLessOrEqual(matches[j-1], matches[j]));
- }
- }
- }
-
- private boolean isLessOrEqual(Match match, Match match2) {
- int diff= match2.getOffset() - match.getOffset();
- if (diff > 0)
- return true;
- else if (diff < 0)
- return false;
- else {
- // equal offset, have to look at the length.
- diff= match2.getLength() - match.getLength();
- if (diff >= 0)
- return true;
- return false;
- }
- }
-
-}
diff --git a/org.eclipse.search.tests/testresources/junit37-noUI-src.zip b/org.eclipse.search.tests/testresources/junit37-noUI-src.zip
deleted file mode 100644
index 4f95d30..0000000
--- a/org.eclipse.search.tests/testresources/junit37-noUI-src.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.ui.editors.tests/.classpath b/org.eclipse.ui.editors.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.ui.editors.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ui.editors.tests/.cvsignore b/org.eclipse.ui.editors.tests/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.ui.editors.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/org.eclipse.ui.editors.tests/.project b/org.eclipse.ui.editors.tests/.project
deleted file mode 100644
index 4734217..0000000
--- a/org.eclipse.ui.editors.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ui.editors.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.ui.editors.tests/about.html b/org.eclipse.ui.editors.tests/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.ui.editors.tests/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>20th June, 2002</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, "Program" will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.ui.editors.tests/build.properties b/org.eclipse.ui.editors.tests/build.properties
deleted file mode 100644
index 06c380d..0000000
--- a/org.eclipse.ui.editors.tests/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- test.xml,\
- about.html,\
- *.jar
-
-src.includes = about.html
-
-source.editorstests.jar = src/
diff --git a/org.eclipse.ui.editors.tests/plugin.properties b/org.eclipse.ui.editors.tests/plugin.properties
deleted file mode 100644
index 2f7e7ad..0000000
--- a/org.eclipse.ui.editors.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-Plugin.name= Editors Test Plug-in
-Plugin.providerName= Eclipse.org
diff --git a/org.eclipse.ui.editors.tests/plugin.xml b/org.eclipse.ui.editors.tests/plugin.xml
deleted file mode 100644
index 968a57a..0000000
--- a/org.eclipse.ui.editors.tests/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
- id="org.eclipse.ui.editors.tests"
- name="%Plugin.name"
- version="3.0.0"
- provider-name="%Plugin.providerName"
- class="">
-
- <runtime>
- <library name="editorstests.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.junit"/>
- </requires>
-
-</plugin>
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java
deleted file mode 100644
index 3106ac4..0000000
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ui.editors.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Test Suite for org.eclipse.ui.editors.
- *
- * @since 3.0
- */
-public class EditorsTestSuite extends TestSuite {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test Suite for org.eclipse.ui.editors"); //$NON-NLS-1$
-
- return suite;
- }
-}
diff --git a/org.eclipse.ui.editors.tests/test.xml b/org.eclipse.ui.editors.tests/test.xml
deleted file mode 100644
index 9062414..0000000
--- a/org.eclipse.ui.editors.tests/test.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}\..\.."/>
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.ui.editors.tests"/>
- <property name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="eclipse-editors-folder"
- value="${eclipse-home}/eclipse_editors_folder"/>
- <delete dir="${eclipse-editors-folder}" quiet="true"/>
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${eclipse-editors-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname"
- value="org.eclipse.ui.editors.tests.EditorsTestSuite"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/org.eclipse.ui.workbench.texteditor.tests/.classpath b/org.eclipse.ui.workbench.texteditor.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/org.eclipse.ui.workbench.texteditor.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ui.workbench.texteditor.tests/.cvsignore b/org.eclipse.ui.workbench.texteditor.tests/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.ui.workbench.texteditor.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/org.eclipse.ui.workbench.texteditor.tests/.project b/org.eclipse.ui.workbench.texteditor.tests/.project
deleted file mode 100644
index a389cf5..0000000
--- a/org.eclipse.ui.workbench.texteditor.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ui.workbench.texteditor.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.ui.workbench.texteditor.tests/about.html b/org.eclipse.ui.workbench.texteditor.tests/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.ui.workbench.texteditor.tests/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>20th June, 2002</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, "Program" will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.ui.workbench.texteditor.tests/build.properties b/org.eclipse.ui.workbench.texteditor.tests/build.properties
deleted file mode 100644
index 092a9a7..0000000
--- a/org.eclipse.ui.workbench.texteditor.tests/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- test.xml,\
- about.html,\
- *.jar
-
-src.includes = about.html
-
-source.workbenchtexteditortests.jar = src/
diff --git a/org.eclipse.ui.workbench.texteditor.tests/plugin.properties b/org.eclipse.ui.workbench.texteditor.tests/plugin.properties
deleted file mode 100644
index 7b05c13..0000000
--- a/org.eclipse.ui.workbench.texteditor.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-Plugin.name= Workbench Text Editor Test Plug-in
-Plugin.providerName= Eclipse.org
diff --git a/org.eclipse.ui.workbench.texteditor.tests/plugin.xml b/org.eclipse.ui.workbench.texteditor.tests/plugin.xml
deleted file mode 100644
index 3cabb2e..0000000
--- a/org.eclipse.ui.workbench.texteditor.tests/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
- id="org.eclipse.ui.workbench.texteditor.tests"
- name="%Plugin.name"
- version="3.0.0"
- provider-name="%Plugin.providerName"
- class="">
-
- <runtime>
- <library name="workbenchtexteditortests.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.junit"/>
- </requires>
-
-</plugin>
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
deleted file mode 100644
index 3b18d31..0000000
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ui.workbench.texteditor.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Test Suite for org.eclipse.ui.workbench.texteditor.
- *
- * @since 3.0
- */
-public class WorkbenchTextEditorTestSuite extends TestSuite {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test Suite for org.eclipse.ui.workbench.texteditor"); //$NON-NLS-1$
-
- return suite;
- }
-}
diff --git a/org.eclipse.ui.workbench.texteditor.tests/test.xml b/org.eclipse.ui.workbench.texteditor.tests/test.xml
deleted file mode 100644
index 4d91621..0000000
--- a/org.eclipse.ui.workbench.texteditor.tests/test.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}\..\.."/>
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.ui.workbench.texteditor.tests"/>
- <property name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="eclipse-workbench-texteditor-folder"
- value="${eclipse-home}/eclipse_workbench_texteditor_folder"/>
- <delete dir="${eclipse-workbench-texteditor-folder}" quiet="true"/>
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${eclipse-workbench-texteditor-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname"
- value="org.eclipse.ui.workbench.texteditor.tests.WorkbenchTextEditorTestSuite"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
